@openui5/sap.ui.support 1.96.2 → 1.98.0

package/src/sap/ui/support/supportRules/Main.js

@@ -1,11 +1,11 @@
 /*!
 * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
 */
 
 sap.ui.define([
-	"jquery.sap.global",
+	"sap/base/Log",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Element",
 	"sap/ui/core/Component",
@@ -23,7 +23,7 @@ sap.ui.define([
 	"sap/ui/support/supportRules/RuleSerializer",
 	"sap/ui/support/library"
 ],
-function (jQuery, ManagedObject, Element, Component, Analyzer, CoreFacade,
+function (Log, ManagedObject, Element, Component, Analyzer, CoreFacade,
 		  ExecutionScope, Highlighter, CommunicationBus,
 		  IssueManager, History, DataCollector, channelNames,
 		  constants, RuleSetLoader, RuleSerializer, library) {
@@ -57,7 +57,7 @@ function (jQuery, ManagedObject, Element, Component, Analyzer, CoreFacade,
 				var evt = document.createEvent("CustomEvent");
 				evt.initCustomEvent("supportToolLoaded", true, true, {});
 			} else {
-				jQuery.sap.log.warning("Only one support tool allowed");
+				Log.warning("Only one support tool allowed");
 
 				return oMain;
 			}
@@ -321,7 +321,7 @@ function (jQuery, ManagedObject, Element, Component, Analyzer, CoreFacade,
 			vPresetOrRules = library.SystemPresets[vPresetOrRules];
 
 			if (!vPresetOrRules) {
-				jQuery.sap.log.error("System preset ID is not valid");
+				Log.error("System preset ID is not valid");
 				return;
 			}
 		}
@@ -343,7 +343,7 @@ function (jQuery, ManagedObject, Element, Component, Analyzer, CoreFacade,
 			vRuleDescriptors = vPresetOrRules.selections;
 
 			if (!vPresetOrRules.id || !vPresetOrRules.title) {
-				jQuery.sap.log.error("The preset must have an ID and a title");
+				Log.error("The preset must have an ID and a title");
 				return;
 			}
 
@@ -398,7 +398,7 @@ function (jQuery, ManagedObject, Element, Component, Analyzer, CoreFacade,
 			i;
 
 		if (ExecutionScope.possibleScopes.indexOf(oExecutionScope.type) === -1) {
-			jQuery.sap.log.error("Invalid execution scope type. Type must be one of the following: "
+			Log.error("Invalid execution scope type. Type must be one of the following: "
 				+ ExecutionScope.possibleScopes.join(", "));
 			return false;
 		}
@@ -408,7 +408,7 @@ function (jQuery, ManagedObject, Element, Component, Analyzer, CoreFacade,
 			if (oExecutionScope.parentId) {
 				aSelectors.push(oExecutionScope.parentId);
 			} else if (Array.isArray(oExecutionScope.selectors)) {
-				jQuery.merge(aSelectors, oExecutionScope.selectors);
+				aSelectors = aSelectors.concat(oExecutionScope.selectors);
 			} else if (oExecutionScope.selectors) {
 				aSelectors.push(oExecutionScope.selectors);
 			}
@@ -461,20 +461,20 @@ function (jQuery, ManagedObject, Element, Component, Analyzer, CoreFacade,
 				mRules;
 
 			if (!oRuleDescriptor.libName || !oRuleDescriptor.ruleId) {
-				jQuery.sap.log.error("[" + constants.SUPPORT_ASSISTANT_NAME + "] Invalid Rule Descriptor.");
+				Log.error("[" + constants.SUPPORT_ASSISTANT_NAME + "] Invalid Rule Descriptor.");
 				return;
 			}
 
 			oRuleset = RuleSetLoader.getRuleSet(oRuleDescriptor.libName);
 
 			if (!oRuleset || !oRuleset.ruleset) {
-				jQuery.sap.log.error("[" + constants.SUPPORT_ASSISTANT_NAME + "] Could not find Ruleset for library " + oRuleDescriptor.libName);
+				Log.error("[" + constants.SUPPORT_ASSISTANT_NAME + "] Could not find Ruleset for library " + oRuleDescriptor.libName);
 				return;
 			}
 
 			mRules = oRuleset.ruleset.getRules();
 			if (!mRules || !mRules[oRuleDescriptor.ruleId]) {
-				jQuery.sap.log.error("[" + constants.SUPPORT_ASSISTANT_NAME + "] Could not find Rule with id " +
+				Log.error("[" + constants.SUPPORT_ASSISTANT_NAME + "] Could not find Rule with id " +
 					oRuleDescriptor.ruleId + " for library " + oRuleDescriptor.libName);
 				return;
 			}

package/src/sap/ui/support/supportRules/RuleSerializer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/support/supportRules/RuleSet.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -8,12 +8,13 @@
  * The RuleSet is an interface used to create, update and delete ruleset containing rules.
  */
 sap.ui.define([
-	"jquery.sap.global",
+	"sap/base/Log",
+	"sap/base/util/Version",
 	"sap/ui/support/library",
 	"sap/ui/support/supportRules/Storage",
 	"sap/ui/support/supportRules/Constants"
 ],
-function (jQuery, library, storage, constants) {
+function (Log, Version, library, storage, constants) {
 	"use strict";
 
 	/**
@@ -38,7 +39,7 @@ function (jQuery, library, storage, constants) {
 	 * @name sap.ui.support.RuleSet
 	 * @memberof sap.ui.support
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @param {object} oSettings Name of the initiated
 	 * @returns {void}
 	 */
@@ -46,7 +47,7 @@ function (jQuery, library, storage, constants) {
 		oSettings = oSettings || {};
 
 		if (!oSettings.name) {
-			jQuery.sap.log.error("Please provide a name for the RuleSet.");
+			Log.error("Please provide a name for the RuleSet.");
 		}
 
 		if (mRuleSets[oSettings.name]) {
@@ -117,37 +118,37 @@ function (jQuery, library, storage, constants) {
 	RuleSet.prototype._verifySettingsObject = function (oSettings, bUpdate) {
 
 		if (!oSettings.id) {
-			jQuery.sap.log.error("Support rule needs an id.");
+			Log.error("Support rule needs an id.");
 			return "Support rule needs an unique id.";
 		}
 
 		if (!bUpdate && this._mRules[oSettings.id]) {
-			jQuery.sap.log.error("Support rule with the id " + oSettings.id + " already exists.");
+			Log.error("Support rule with the id " + oSettings.id + " already exists.");
 			return "Support rule with the id " + oSettings.id + " already exists.";
 		}
 
 		if (!oSettings.check) {
-			jQuery.sap.log.error("Support rule with the id " + oSettings.id + " needs a check function.");
+			Log.error("Support rule with the id " + oSettings.id + " needs a check function.");
 			return "Support rule with the id " + oSettings.id + " needs a check function.";
 		}
 
 		if (!oSettings.title) {
-			jQuery.sap.log.error("Support rule with the id " + oSettings.id + " needs a title.");
+			Log.error("Support rule with the id " + oSettings.id + " needs a title.");
 			return "Support rule with the id " + oSettings.id + " needs a title.";
 		}
 
 		if (!oSettings.description) {
-			jQuery.sap.log.error("Support rule with the id " + oSettings.id + " needs a description.");
+			Log.error("Support rule with the id " + oSettings.id + " needs a description.");
 			return "Support rule with the id " + oSettings.id + " needs a description.";
 		}
 
 		if (!oSettings.resolution && (!oSettings.resolutionurls || oSettings.resolutionurls.length === 0)) {
-			jQuery.sap.log.error("Support rule with the id " + oSettings.id + " needs either a resolution or resolutionurls or should have a ticket handler function");
+			Log.error("Support rule with the id " + oSettings.id + " needs either a resolution or resolutionurls or should have a ticket handler function");
 			return "Support rule with the id " + oSettings.id + " needs either a resolution or resolutionurls or should have a ticket handler function";
 		}
 
 		if (!oSettings.audiences || oSettings.audiences.length === 0) {
-			jQuery.sap.log.error("Support rule with the id " + oSettings.id + " should have an audience. Applying audience ['Control']");
+			Log.error("Support rule with the id " + oSettings.id + " should have an audience. Applying audience ['Control']");
 			oSettings.audiences = [library.Audiences.Control];
 		}
 
@@ -162,13 +163,13 @@ function (jQuery, library, storage, constants) {
 			});
 
 			if (bIsWrongAudience) {
-				jQuery.sap.log.error("Audience " + sAudienceName + " does not exist. Please use the audiences from sap.ui.support.Audiences");
+				Log.error("Audience " + sAudienceName + " does not exist. Please use the audiences from sap.ui.support.Audiences");
 				return "Audience " + sAudienceName + " does not exist. Please use the audiences from sap.ui.support.Audiences";
 			}
 		}
 
 		if (!oSettings.categories || oSettings.categories.length === 0) {
-			jQuery.sap.log.error("Support rule with the id " + oSettings.id + " should have a category. Applying category ['Performance']");
+			Log.error("Support rule with the id " + oSettings.id + " should have a category. Applying category ['Performance']");
 			oSettings.categories = ["Performance"];
 		}
 
@@ -183,7 +184,7 @@ function (jQuery, library, storage, constants) {
 			});
 
 			if (bIsWrongCategory) {
-				jQuery.sap.log.error("Category " + sCategoryName + " does not exist. Please use the categories from sap.ui.support.Categories");
+				Log.error("Category " + sCategoryName + " does not exist. Please use the categories from sap.ui.support.Categories");
 				return "Category " + sCategoryName + " does not exist. Please use the categories from sap.ui.support.Categories";
 			}
 		}
@@ -213,7 +214,7 @@ function (jQuery, library, storage, constants) {
 
 		// Do not add a rule that is for higher version of UI5
 		// because APIs might not be in place
-		if (sRuleVersion && jQuery.sap.Version(sCurrentVersion).compareTo(sRuleVersion) < 0) {
+		if (sRuleVersion && Version(sCurrentVersion).compareTo(sRuleVersion) < 0) {
 			return "Rule " + oSettings.id + " should be used with a version >= " + oSettings.minversion;
 		}
 

package/src/sap/ui/support/supportRules/RuleSetLoader.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -10,7 +10,9 @@
  */
 
 sap.ui.define([
-	"jquery.sap.global",
+	"sap/base/Log",
+	"sap/base/util/extend",
+	"sap/base/util/ObjectPath",
 	"sap/ui/VersionInfo",
 	"sap/ui/support/supportRules/RuleSet",
 	"sap/ui/support/supportRules/CommunicationBus",
@@ -18,9 +20,13 @@ sap.ui.define([
 	"sap/ui/support/supportRules/RuleSerializer",
 	"sap/ui/support/supportRules/Constants",
 	"sap/ui/support/supportRules/util/EvalUtils",
-	"sap/ui/support/supportRules/util/Utils"
+	"sap/ui/support/supportRules/util/Utils",
+	"sap/ui/thirdparty/jquery",
+	"sap/ui/thirdparty/URI"
 ], function (
-	jQuery,
+	Log,
+	extend,
+	ObjectPath,
 	VersionInfo,
 	RuleSet,
 	CommunicationBus,
@@ -28,7 +34,9 @@ sap.ui.define([
 	RuleSerializer,
 	constants,
 	EvalUtils,
-	Utils
+	Utils,
+	jQuery,
+	URI
 	) {
 		"use strict";
 
@@ -48,7 +56,7 @@ sap.ui.define([
 		})();
 
 		var sCustomSuffix = "sprt";
-		var sSupportModulePath = jQuery.sap.getModulePath("sap.ui.support");
+		var sSupportModulePath = sap.ui.require.toUrl("sap/ui/support");
 		var sSupportModuleRootPath = sSupportModulePath.replace('/sap/ui/support', '');
 		var sAbsUrl = getAbsoluteUrl(sSupportModuleRootPath);
 
@@ -215,7 +223,7 @@ sap.ui.define([
 		RuleSetLoader._fetchLibraryFiles = function (aLibNames, fnProcessFile, bSupressProgressReporting) {
 			var aAjaxPromises = [],
 				that = this,
-				supportModulePath = jQuery.sap.getModulePath("sap.ui.support"),
+				supportModulePath = sap.ui.require.toUrl("sap/ui/support"),
 				supportModulesRoot = supportModulePath.replace("sap/ui/support", ""),
 				bCanLoadInternalRules = Utils.canLoadInternalRules(),
 				bHasInternalRules = bCanLoadInternalRules && aLibNames.internalRules.length > 0,
@@ -292,26 +300,30 @@ sap.ui.define([
 				return null;
 			}
 
-			var libPath = libraryName.replace(/\./g, "/");
-			var customizableLibName = libraryName;
+			var libResourceName = libraryName.replace(/\./g, "/");
+			var customizableLibResourceName = libResourceName;
 			var loadFromSupportOrigin = this._getLoadFromSupportOrigin();
+			var pathsConfig = {};
 
 			// Prepare modules root string
 			if (loadFromSupportOrigin) {
 				// In order to avoid module name collision
 				// we need to generate an internal library name
-				customizableLibName += '.' + sCustomSuffix;
-				jQuery.sap.registerModulePath(customizableLibName, supportModulesRoot + libraryName.replace(/\./g, "/"));
+				customizableLibResourceName += '/' + sCustomSuffix;
+				pathsConfig[customizableLibResourceName] = supportModulesRoot + libResourceName;
 			}
 
-			var internalLibName = customizableLibName + '.internal';
-			var libraryInternalResourceRoot = supportModulesRoot.replace('resources/', '') + 'test-resources/' + libPath + '/internal';
+			var internalLibResourceName = customizableLibResourceName + '/internal';
+			var libraryInternalResourceRoot = supportModulesRoot.replace('resources/', '') + 'test-resources/' + libResourceName + '/internal';
+			pathsConfig[internalLibResourceName] = libraryInternalResourceRoot;
 
-			jQuery.sap.registerModulePath(internalLibName, libraryInternalResourceRoot);
+			sap.ui.loader.config({
+				paths: pathsConfig
+			});
 
 			return {
-				internalLibName: internalLibName,
-				customizableLibName: customizableLibName
+				internalLibName: internalLibResourceName.replace(/\//g, "."),
+				customizableLibName: customizableLibResourceName.replace(/\//g, ".")
 			};
 		};
 
@@ -348,7 +360,7 @@ sap.ui.define([
 				var sNormalizedLibName,
 					oLibSupportCopy,
 					oLibrary,
-					oLibSupport = jQuery.sap.getObject(sLibName).library.support;
+					oLibSupport = ObjectPath.get(sLibName).library.support;
 
 				if (!oLibSupport) {
 					// This case usually happens when the library flag bExport is set to true.
@@ -356,7 +368,7 @@ sap.ui.define([
 				}
 
 				sNormalizedLibName = sLibName.replace("." + sCustomSuffix, "").replace(".internal", "");
-				oLibSupportCopy = jQuery.extend({}, oLibSupport);
+				oLibSupportCopy = extend({}, oLibSupport);
 				oLibrary = this._mRuleSets[sNormalizedLibName];
 
 				if (!(oLibSupportCopy.ruleset instanceof RuleSet)) {
@@ -364,14 +376,14 @@ sap.ui.define([
 				}
 
 				if (oLibrary) {
-					oLibrary.ruleset._mRules = jQuery.extend(oLibrary.ruleset._mRules, oLibSupportCopy.ruleset._mRules);
+					oLibrary.ruleset._mRules = extend(oLibrary.ruleset._mRules, oLibSupportCopy.ruleset._mRules);
 				} else {
 					oLibrary = oLibSupportCopy;
 				}
 
 				this._mRuleSets[sNormalizedLibName] = oLibrary;
 			} catch (e) {
-				jQuery.sap.log.error("[" + constants.SUPPORT_ASSISTANT_NAME + "] Failed to load RuleSet for " + sLibName + " library", e);
+				Log.error("[" + constants.SUPPORT_ASSISTANT_NAME + "] Failed to load RuleSet for " + sLibName + " library", e);
 			}
 		};
 
@@ -383,8 +395,8 @@ sap.ui.define([
 		 */
 		RuleSetLoader._getLoadFromSupportOrigin = function () {
 			var bLoadFromSupportOrigin = false;
-			var coreUri = new window.URI(jQuery.sap.getModulePath("sap.ui.core"));
-			var supportUri = new window.URI(jQuery.sap.getModulePath("sap.ui.support"));
+			var coreUri = new URI(sap.ui.require.toUrl("sap/ui/core"));
+			var supportUri = new URI(sap.ui.require.toUrl("sap/ui/support"));
 
 			// If loading support tool from different origin,
 			// i.e. protocol or host (host name + port) different
@@ -490,7 +502,7 @@ sap.ui.define([
 			var mRules = {};
 
 			Object.keys(this._mRuleSets).map(function (sLibName) {
-				mRules = jQuery.extend(mRules, this._mRuleSets[sLibName].ruleset.getRules());
+				mRules = extend(mRules, this._mRuleSets[sLibName].ruleset.getRules());
 			}, this);
 
 			return mRules;

package/src/sap/ui/support/supportRules/Storage.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @name sap.ui.support.Storage
 	 * @alias sap.ui.support.Storage
 	 * @author SAP SE.
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/support/supportRules/WCBChannels.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/support/supportRules/WCBConfig.js

@@ -1,14 +1,14 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
-	"sap/ui/thirdparty/jquery",
+	"sap/base/util/UriParameters",
 	"sap/ui/thirdparty/URI"
 ],
-function (jQuery, URI) {
+function (UriParameters, URI) {
 	"use strict";
 
 	var DEFAULT_FRAME_ID = '_unnamed_frame_-_use_message_origin_';
@@ -44,12 +44,12 @@ function (jQuery, URI) {
 	WCBConfig.prototype.getFrameId = function () {
 		// the opener window assigns a tool frame an ID and includes in as a URI parameter upon opening the frame
 		// returns the frame's ID or a default value, when running in an opener window
-		return jQuery.sap.getUriParameters().get(this._sURIFrameId) || DEFAULT_FRAME_ID;
+		return UriParameters.fromQuery(window.location.search).get(this._sURIFrameId) || DEFAULT_FRAME_ID;
 	};
 
 	WCBConfig.prototype.getOriginURIParameter = function () {
 		// the opener window sets its origin as a URI parameter upon opening the frame
-		return jQuery.sap.getUriParameters().get(this._sURIOrigin);
+		return UriParameters.fromQuery(window.location.search).get(this._sURIOrigin);
 	};
 
 	WCBConfig.prototype.getReceivingWindow = function () {

package/src/sap/ui/support/supportRules/WindowCommunicationBus.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -10,8 +10,8 @@
 sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/base/Log",
-	"jquery.sap.script"
-], function (BaseObject, Log, jQuery) {
+	"sap/base/util/isEmptyObject"
+], function (BaseObject, Log, isEmptyObject) {
 	"use strict";
 
 	/**
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @name sap.ui.support.WindowCommunicationBus
 	 * @memberof sap.ui.support
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @private
 	 */
 	var WindowCommunicationBus = BaseObject.extend("sap.ui.support.supportRules.WindowCommunicationBus", {
@@ -150,7 +150,7 @@ sap.ui.define([
 	 * @returns {boolean} true if the message is valid
 	 */
 	WindowCommunicationBus.prototype._validate = function (eMessage) {
-		if (jQuery.isEmptyObject(this._frame)) {
+		if (isEmptyObject(this._frame)) {
 			// there are no channels associated with this bus, or
 			// when loaded in a tool frame, the CommumnicationBus class will always have an empty 'frame' object.
 			// in this case, a message is sent from the opener to the tool frame and no validation is necessary

package/src/sap/ui/support/supportRules/report/AbapHistoryFormatter.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/support/supportRules/report/Archiver.js

@@ -1,14 +1,14 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 /**
  * Creates a zip file
  */
-sap.ui.define(['jquery.sap.global', 'sap/ui/thirdparty/jszip', 'sap/ui/core/util/File'],
-	function (jQuery, JSZip, File) {
+sap.ui.define(['sap/base/Log', 'sap/base/util/isPlainObject', 'sap/ui/thirdparty/jszip', 'sap/ui/core/util/File'],
+	function (Log, isPlainObject, JSZip, File) {
 	"use strict";
 
 	/**
@@ -23,29 +23,29 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/thirdparty/jszip', 'sap/ui/core/util
 	 */
 	Archiver.prototype.add = function(sName, vData, sType) {
 		if (!sName) {
-			jQuery.sap.log.error("Archiver: No name was given.");
+			Log.error("Archiver: No name was given.");
 			return false;
 		}
 		if (!vData) {
-			jQuery.sap.log.error("Archiver: No data was given.");
+			Log.error("Archiver: No data was given.");
 			return false;
 		}
 		if (typeof vData === "string") {
 			this._mData[sName] = vData;
 			return true;
 		} else if (sType) {
-			if ((sType === "json" || sType === "har") && (jQuery.isPlainObject(vData) || Array.isArray(vData))) {
+			if ((sType === "json" || sType === "har") && (isPlainObject(vData) || Array.isArray(vData))) {
 				try {
 					this._mData[sName] = JSON.stringify(vData);
 					return true;
 				} catch (ex) {
-					jQuery.sap.log.error("Archiver: JSON data could not be serialized for " + sName);
+					Log.error("Archiver: JSON data could not be serialized for " + sName);
 				}
 			} else {
-				jQuery.sap.log.error("Archiver: JSON data could not be serialized for " + sType + ". Either the type is unknown or the data has a wrong format.");
+				Log.error("Archiver: JSON data could not be serialized for " + sType + ". Either the type is unknown or the data has a wrong format.");
 			}
 		} else {
-			jQuery.sap.log.error("Archiver: Data could not be serialized for " + sName + ". Data is is not a string or has a an invalid type.");
+			Log.error("Archiver: Data could not be serialized for " + sName + ". Data is is not a string or has a an invalid type.");
 			return false;
 		}
 		return false;

package/src/sap/ui/support/supportRules/report/DataCollector.js

@@ -1,14 +1,14 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 /**
  * Provides methods for information retrieval from the core.
  */
-sap.ui.define(["jquery.sap.global", "sap/ui/core/Component", "sap/ui/core/support/ToolsAPI", "sap/ui/thirdparty/URI"],
-	function (jQuery, Component, ToolsAPI, URI) {
+sap.ui.define(["sap/base/util/LoaderExtensions", 'sap/base/security/encodeXML', "sap/ui/core/Component", "sap/ui/core/support/ToolsAPI", "sap/ui/thirdparty/URI"],
+	function (LoaderExtensions, encodeXML, Component, ToolsAPI, URI) {
 	"use strict";
 
 	/**
@@ -46,9 +46,9 @@ sap.ui.define(["jquery.sap.global", "sap/ui/core/Component", "sap/ui/core/suppor
 		this._oSupportAssistantInfo.versionAsString = "not available";
 
 		if (oVersion) {
-			this._oSupportAssistantInfo.versionAsString = jQuery.sap.escapeHTML(oVersion.version || "");
-			this._oSupportAssistantInfo.versionAsString += " (built at " + jQuery.sap.escapeHTML(oVersion.buildTimestamp || "");
-			this._oSupportAssistantInfo.versionAsString += ", last change " + jQuery.sap.escapeHTML(oVersion.scmRevision || "") + ")";
+			this._oSupportAssistantInfo.versionAsString = encodeXML(oVersion.version || "");
+			this._oSupportAssistantInfo.versionAsString += " (built at " + encodeXML(oVersion.buildTimestamp || "");
+			this._oSupportAssistantInfo.versionAsString += ", last change " + encodeXML(oVersion.scmRevision || "") + ")";
 		}
 	};
 
@@ -114,13 +114,13 @@ sap.ui.define(["jquery.sap.global", "sap/ui/core/Component", "sap/ui/core/suppor
 		};
 
 		//add absolute paths for resources
-		var aModules = jQuery.sap.getAllDeclaredModules();
+		var aModules = LoaderExtensions.getAllRequiredModules();
 		var aResults = [];
 		for (var i = 0; i < aModules.length; i++) {
 			aResults.push({
 				moduleName : aModules[i],
-				relativePath: jQuery.sap.getResourcePath(aModules[i]),
-				absolutePath: URI(jQuery.sap.getResourcePath(aModules[i])).absoluteTo(document.location.origin + document.location.pathname).toString()
+				relativePath: sap.ui.require.toUrl(aModules[i]),
+				absolutePath: URI(sap.ui.require.toUrl(aModules[i])).absoluteTo(document.location.origin + document.location.pathname).toString()
 			});
 		}
 		oTechData.resourcePaths = aResults;

package/src/sap/ui/support/supportRules/report/IssueRenderer.js

@@ -1,21 +1,21 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 /**
  * Renders issues
  */
-sap.ui.define(['jquery.sap.global'], function(jQuery) {
+sap.ui.define(['sap/base/Log', 'sap/base/security/encodeXML'], function(Log, encodeXML) {
 	'use strict';
 
 	function getEscapedString(value) {
 		if (value) {
 			if (Array.isArray(value)) {
-				return jQuery.sap.escapeHTML(value.join(', '));
+				return encodeXML(value.join(', '));
 			} else {
-				return jQuery.sap.escapeHTML(value);
+				return encodeXML(value);
 			}
 		} else {
 			return '';
@@ -98,7 +98,7 @@ sap.ui.define(['jquery.sap.global'], function(jQuery) {
 
 			content += '</table>';
 		} catch (ex) {
-			jQuery.sap.log.warning('There was a problem extracting issues info.');
+			Log.warning('There was a problem extracting issues info.');
 			content = '';
 		}
 
@@ -150,7 +150,7 @@ sap.ui.define(['jquery.sap.global'], function(jQuery) {
 			content += getSeverityFilter('Medium', severities['Medium'], false);
 			content += getSeverityFilter('Low', severities['Low'], false);
 		} catch (ex) {
-			jQuery.sap.log.warning('There was a problem creating severity filters.');
+			Log.warning('There was a problem creating severity filters.');
 			content = '';
 		}