@openui5/sap.ui.support 1.96.2 → 1.98.0

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

@@ -1,31 +1,31 @@
 /*!
  * 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 report from data.
  */
-sap.ui.define(['jquery.sap.global', 'sap/ui/support/supportRules/report/Archiver',
-	'sap/ui/support/supportRules/report/IssueRenderer'], function(jQuery, Archiver, IssueRenderer) {
+sap.ui.define(['sap/ui/thirdparty/jquery', 'sap/base/Log', 'sap/base/security/encodeXML', 'sap/base/util/isEmptyObject', 'sap/base/util/isPlainObject', 'sap/ui/support/supportRules/report/Archiver',
+	'sap/ui/support/supportRules/report/IssueRenderer'], function(jQuery, Log, encodeXML, isEmptyObject, isPlainObject, Archiver, IssueRenderer) {
 	'use strict';
 
 	// Private fields
-	var resourcesBaseUrl = jQuery.sap.getResourcePath('sap/ui/support/supportRules/report/resources');
+	var resourcesBaseUrl = sap.ui.require.toUrl('sap/ui/support/supportRules/report/resources');
 
 	/*
 	 * Functions taken from core.support.plugins.TechInfo.js
 	 */
 	var techInfoRenderer = {
 		line: function (buffer, right, border, label, content) {
-			buffer.push("<tr><td ", right ? "align='right' " : "", "valign='top'>", "<label class='sapUiSupportLabel'>", jQuery.sap.escapeHTML(label || ""), "</label></td><td",
+			buffer.push("<tr><td ", right ? "align='right' " : "", "valign='top'>", "<label class='sapUiSupportLabel'>", encodeXML(label || ""), "</label></td><td",
 					border ? " class='sapUiSupportTechInfoBorder'" : "", ">");
 			var ctnt = content;
 			if (typeof content === "function") {
 				ctnt = content(buffer);
 			}
-			buffer.push(jQuery.sap.escapeHTML(ctnt || ""));
+			buffer.push(encodeXML(ctnt || ""));
 			buffer.push("</td></tr>");
 		},
 		multiline: function (buffer, right, border, label, content){
@@ -37,7 +37,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/support/supportRules/report/Archiver
 					if (v) {
 						if (typeof (v) === "string" || typeof (v) === "string" || typeof (v) === "boolean") {
 							val = v;
-						} else if (Array.isArray(v) || jQuery.isPlainObject(v)) {
+						} else if (Array.isArray(v) || isPlainObject(v)) {
 							val = JSON.stringify(v);
 						}
 					}
@@ -48,7 +48,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/support/supportRules/report/Archiver
 		},
 		subheader: function (buffer, title) {
 			buffer.push("<tr class='sapUiSupportTitle'><td valign='top' colspan='2'>", "<label class='sapUiSupportLabel'>",
-				jQuery.sap.escapeHTML(title || ""), "</label></td></tr>");
+				encodeXML(title || ""), "</label></td></tr>");
 		}
 	};
 
@@ -85,8 +85,8 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/support/supportRules/report/Archiver
 				var sapUI5Version = technicalInfo.sapUi5Version;
 				if (sapUI5Version && sapUI5Version.version) {
 					var oVersionInfo = sapUI5Version.version;
-					var sVersion = jQuery.sap.escapeHTML(oVersionInfo.version || "");
-					buffer.push(sVersion, " (built at ", jQuery.sap.escapeHTML(oVersionInfo.buildTimestamp || ""), ", last change ", jQuery.sap.escapeHTML(oVersionInfo.scmRevision || ""), ")");
+					var sVersion = encodeXML(oVersionInfo.version || "");
+					buffer.push(sVersion, " (built at ", encodeXML(oVersionInfo.buildTimestamp || ""), ", last change ", encodeXML(oVersionInfo.scmRevision || ""), ")");
 				} else {
 					buffer.push("not available");
 				}
@@ -103,14 +103,14 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/support/supportRules/report/Archiver
 			techInfoRenderer.line(html, true, true, "Application", technicalInfo.appurl);
 			techInfoRenderer.multiline(html, true, true, "Configuration (bootstrap)", technicalInfo.bootconfig);
 			techInfoRenderer.multiline(html, true, true, "Configuration (computed)", technicalInfo.config);
-			if (!jQuery.isEmptyObject(technicalInfo.libraries)) {
+			if (!isEmptyObject(technicalInfo.libraries)) {
 				techInfoRenderer.multiline(html, true, true, "Libraries", technicalInfo.libraries);
 			}
 			techInfoRenderer.multiline(html, true, true, "Loaded Libraries", technicalInfo.loadedLibraries);
 			techInfoRenderer.line(html, true, true, "Loaded Modules", function(buffer){
 				jQuery.each(technicalInfo.modules, function(i,v){
 					if (v.indexOf("sap.ui.core.support") < 0) {
-						buffer.push("<span>", jQuery.sap.escapeHTML(v || ""), "</span>");
+						buffer.push("<span>", encodeXML(v || ""), "</span>");
 						if (i < technicalInfo.modules.length - 1) {
 							buffer.push(", ");
 						}
@@ -122,7 +122,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/support/supportRules/report/Archiver
 			html.push("</table></div>");
 			content = html.join('');
 		} catch (ex) {
-			jQuery.sap.log.warning('There was a problem extracting technical info.');
+			Log.warning('There was a problem extracting technical info.');
 		}
 
 		return content;
@@ -131,7 +131,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/support/supportRules/report/Archiver
 	function getComponentPart(value) {
 		var result = '<td>';
 		if (value) {
-			result += jQuery.sap.escapeHTML(value);
+			result += encodeXML(value);
 		}
 		result += '</td>';
 		return result;
@@ -166,7 +166,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/support/supportRules/report/Archiver
 
 			content += '</table>';
 		} catch (ex) {
-			jQuery.sap.log.warning('There was a problem extracting app info.');
+			Log.warning('There was a problem extracting app info.');
 			content = '';
 		}
 
@@ -229,7 +229,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/support/supportRules/report/Archiver
 					break;
 			}
 		} catch (ex) {
-			jQuery.sap.log.warning('There was a problem extracting scope info.');
+			Log.warning('There was a problem extracting scope info.');
 			content = '';
 		}
 
@@ -282,7 +282,7 @@ sap.ui.define(['jquery.sap.global', 'sap/ui/support/supportRules/report/Archiver
 
 			content += '</table>';
 		} catch (ex) {
-			jQuery.sap.log.warning('There was a problem extracting selected rules info.');
+			Log.warning('There was a problem extracting selected rules info.');
 			content = '';
 		}
 

package/src/sap/ui/support/supportRules/report/StringHistoryFormatter.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/resources/index.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/ui/IFrameController.js

@@ -1,17 +1,18 @@
 /*!
  * 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/support/supportRules/CommunicationBus",
 	"sap/ui/support/supportRules/WCBChannels",
-	"sap/ui/support/supportRules/Constants"
+	"sap/ui/support/supportRules/Constants",
+	"sap/ui/thirdparty/URI"
 ],
-function (jQuery, ManagedObject, CommunicationBus, channelNames, constants) {
+function (Log, ManagedObject, CommunicationBus, channelNames, constants, URI) {
 	"use strict";
 
 	var oIFrameController = null;
@@ -23,7 +24,7 @@ function (jQuery, ManagedObject, CommunicationBus, channelNames, constants) {
 	var sFrameUrl;
 
 	function computeFrameOrigin(sUrl) {
-		var frameURI = new window.URI(sUrl);
+		var frameURI = new URI(sUrl);
 		var sOrigin = ( frameURI.protocol() || window.location.protocol.replace(':', '') ) +
 						'://' +
 						( frameURI.host() || window.location.host );
@@ -86,7 +87,7 @@ function (jQuery, ManagedObject, CommunicationBus, channelNames, constants) {
 			if (!oIFrameController) {
 				ManagedObject.apply(this, arguments);
 			} else {
-				jQuery.sap.log.warning("Only one support tool allowed");
+				Log.warning("Only one support tool allowed");
 				return oIFrameController;
 			}
 		}
@@ -108,10 +109,10 @@ function (jQuery, ManagedObject, CommunicationBus, channelNames, constants) {
 	IFrameController.prototype.injectFrame = function (supportModeConfig) {
 		sFrameIdentifier = generateIdentifier();
 
-		sFrameUrl = jQuery.sap.getModulePath("sap.ui.support.supportRules.ui",
-			"/overlay.html?sap-ui-xx-formfactor=compact&sap-ui-xx-support-origin=" +
+		sFrameUrl = sap.ui.require.toUrl("sap/ui/support/supportRules/ui/overlay.html") +
+			"?sap-ui-xx-formfactor=compact&sap-ui-xx-support-origin=" +
 			window.location.protocol + "//" + window.location.host + "&" +
-			"sap-ui-xx-frame-identifier=" + sFrameIdentifier);
+			"sap-ui-xx-frame-identifier=" + sFrameIdentifier;
 
 		sFrameOrigin = computeFrameOrigin(sFrameUrl);
 

package/src/sap/ui/support/supportRules/ui/Overlay.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.
  */
 sap.ui.define(["sap/ui/core/Core",

package/src/sap/ui/support/supportRules/ui/controllers/Analysis.controller.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/ui/controllers/BaseController.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/ui/controllers/Issues.controller.js

@@ -1,11 +1,10 @@
 /*!
  * 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/ui/support/supportRules/ui/controllers/BaseController",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/support/supportRules/CommunicationBus",
@@ -15,8 +14,9 @@ sap.ui.define([
 	"sap/ui/support/supportRules/WCBChannels",
 	"sap/ui/support/supportRules/ui/models/formatter",
 	"sap/ui/support/supportRules/Constants",
-	"sap/m/OverflowToolbarAssociativePopoverControls"
-], function ($, BaseController, JSONModel, CommunicationBus, SharedModel, ElementTree, IssueManager, channelNames, formatter, constants, OverflowToolbarAssociativePopoverControls) {
+	"sap/m/OverflowToolbarAssociativePopoverControls",
+	"sap/base/util/deepExtend"
+], function (BaseController, JSONModel, CommunicationBus, SharedModel, ElementTree, IssueManager, channelNames, formatter, constants, OverflowToolbarAssociativePopoverControls, deepExtend) {
 	"use strict";
 
 	var mIssueSettings = {
@@ -178,11 +178,11 @@ sap.ui.define([
 			var sevFilter = this.model.getProperty("/severityFilter"),
 				sevFilterApplied = issue.severity === sevFilter || sevFilter === constants.FILTER_VALUE_ALL,
 				catFilter = this.model.getProperty("/categoryFilter"),
-				catFilterApplied = $.inArray( catFilter, issue.categories ) > -1 || catFilter === constants.FILTER_VALUE_ALL,
+				catFilterApplied = (issue.categories && issue.categories.indexOf(catFilter) > -1) || catFilter === constants.FILTER_VALUE_ALL,
 				elementFilter = this.model.getProperty("/elementFilter"),
 				elementFilterApplied =  elementFilter ===  issue.context.id || elementFilter === constants.FILTER_VALUE_ALL,
 				audFilter = this.model.getProperty("/audienceFilter"),
-				audienceFilterApplied =  $.inArray( audFilter, issue.audiences ) > -1 || audFilter === constants.FILTER_VALUE_ALL,
+				audienceFilterApplied = (issue.audiences && issue.audiences.indexOf(audFilter) > -1) || audFilter === constants.FILTER_VALUE_ALL,
 				bEnabledFilterButton = sevFilter === constants.FILTER_VALUE_ALL && catFilter === constants.FILTER_VALUE_ALL && audFilter === constants.FILTER_VALUE_ALL && elementFilter === constants.FILTER_VALUE_ALL;
 
 			this.model.setProperty("/bEnabledFilterButton", !bEnabledFilterButton);
@@ -221,7 +221,7 @@ sap.ui.define([
 				selectionCopy;
 			if (this.model.getProperty("/visibleIssuesCount") > 0) {
 				selectedIssues = this.structuredIssuesModel[selection.ruleLibName][selection.ruleId];
-				selectionCopy = jQuery.extend(true, {}, selection); // clone the model so that the TreeTable will not be affected
+				selectionCopy = deepExtend({}, selection); // clone the model so that the TreeTable will not be affected
 				selectionCopy.issues = selectedIssues;
 				selectionCopy.resolutionUrls = selectedIssues[0].resolutionUrls;
 				this.issueTable.setSelectedIndex(0);

package/src/sap/ui/support/supportRules/ui/controllers/Main.controller.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.
  */
 
@@ -96,7 +96,7 @@ sap.ui.define([
 			VersionInfo.load({ library: "sap.ui.core" }).then(function (oCoreLibInfo) {
 				CommunicationBus.publish(channelNames.POST_UI_INFORMATION, {
 					version: oCoreLibInfo,
-					location: new URI(jQuery.sap.getModulePath("sap.ui.support"), window.location.origin + window.location.pathname).toString()
+					location: new URI(sap.ui.require.toUrl("sap/ui/support"), window.location.origin + window.location.pathname).toString()
 				});
 			});
 

package/src/sap/ui/support/supportRules/ui/controllers/PresetsController.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.
  */
 
@@ -14,7 +14,7 @@ sap.ui.define([
 	"sap/ui/support/supportRules/ui/models/Documentation",
 	"sap/ui/support/supportRules/util/Utils",
 	"sap/m/GroupHeaderListItem",
-	"sap/ui/thirdparty/jquery",
+	"sap/base/util/deepExtend",
 	"sap/ui/core/library"
 ], function (
 	BaseController,
@@ -26,7 +26,7 @@ sap.ui.define([
 	Documentation,
 	Utils,
 	GroupHeaderListItem,
-	jQuery,
+	deepExtend,
 	coreLibrary
 ) {
 	"use strict";
@@ -89,7 +89,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.support.supportRules.ui.controllers.BaseController
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @private
 	 * @alias sap.ui.support.supportRules.ui.controllers.PresetsController
 	 */
@@ -658,7 +658,7 @@ sap.ui.define([
 		aSelectedPresets.push(oPresetOptions);
 
 		// keep the original version of the preset
-		aCustomPresets.push(jQuery.extend(true, {}, oPresetOptions));
+		aCustomPresets.push(deepExtend({}, oPresetOptions));
 
 		if (PresetsUtils.isPersistingAllowed()) {
 			PresetsUtils.persistCustomPresets();

package/src/sap/ui/support/supportRules/ui/external/ElementTree.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"],
-	function (jQuery) {
+sap.ui.define(["sap/base/Log", "sap/ui/thirdparty/jquery"],
+	function (Log, jQuery) {
 		"use strict";
 
 		function _isObject(data) {
@@ -212,7 +212,7 @@ sap.ui.define(["jquery.sap.global"],
 			var isDataAnObject = _isObject(data);
 
 			if (isDataAnObject === false) {
-				jQuery.sap.log.warning("The parameter should be an Object");
+				Log.warning("The parameter should be an Object");
 				return;
 			}
 
@@ -257,14 +257,14 @@ sap.ui.define(["jquery.sap.global"],
 			var selectedElement;
 
 			if (typeof elementID !== "string") {
-				jQuery.sap.log.warning("Please use a valid string parameter");
+				Log.warning("Please use a valid string parameter");
 				return;
 			}
 
 			selectedElement = this._ElementTreeContainer.querySelector("[data-id='" + elementID + "']");
 
 			if (selectedElement === null) {
-				jQuery.sap.log.warning("The selected element is not a child of the ElementTree");
+				Log.warning("The selected element is not a child of the ElementTree");
 				return;
 			}
 
@@ -293,7 +293,7 @@ sap.ui.define(["jquery.sap.global"],
 			html += this._createTreeContainer();
 
 			this._ElementTreeContainer.innerHTML = html;
-			// Save reverences for future use
+			// Save references for future use
 			this._setReferences();
 
 			if (this.getData() !== undefined) {

package/src/sap/ui/support/supportRules/ui/external/Highlighter.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/ui/models/CustomJSONListSelection.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.
  */
 sap.ui.define([

package/src/sap/ui/support/supportRules/ui/models/CustomListSelection.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.
  */
 sap.ui.define([
@@ -80,7 +80,7 @@ sap.ui.define([
 
 	function doCallOnHelper(sName, oHelper) {
 		return function() {
-			//jQuery.sap.log.warning("Function called on helper: " + sName);
+			//Log.warning("Function called on helper: " + sName);
 			return TABLESELECTIONADAPTER[sName].apply(oHelper, arguments);
 		};
 	}

package/src/sap/ui/support/supportRules/ui/models/Documentation.js

@@ -1,14 +1,16 @@
 /*!
  * 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/base/util/Version",
+	"sap/ui/thirdparty/jquery",
 	"sap/m/library",
 	"sap/ui/VersionInfo"
-], function (jQuery, mLibrary, VersionInfo) {
+], function (Log, Version, jQuery, mLibrary, VersionInfo) {
 	"use strict";
 
 	var Documentation = {
@@ -21,8 +23,8 @@ sap.ui.define([
 				var sUrl = "",
 					sVersion = "",
 					sFullVersion = oCoreLibInfo.version,
-					iMajorVersion = jQuery.sap.Version(sFullVersion).getMajor(),
-					iMinorVersion = jQuery.sap.Version(sFullVersion).getMinor(),
+					iMajorVersion = Version(sFullVersion).getMajor(),
+					iMinorVersion = Version(sFullVersion).getMinor(),
 					sOrigin = window.location.origin;
 
 				//This check is to make sure that version is even. Example: 1.53 will back down to 1.52
@@ -55,7 +57,7 @@ sap.ui.define([
 			this._pingUrl(sUrl).then(function success() {
 				mLibrary.URLHelper.redirect(sUrl, true);
 			}, function error() {
-				jQuery.sap.log.info("Support Assistant tried to load documentation link in " + sUrl + "but fail");
+				Log.info("Support Assistant tried to load documentation link in " + sUrl + "but fail");
 				sUrl = "https://ui5.sap.com/#/topic/" + sTopicId;
 				mLibrary.URLHelper.redirect(sUrl, true);
 			});

package/src/sap/ui/support/supportRules/ui/models/PresetsUtils.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,9 +10,9 @@ sap.ui.define([
 	"sap/ui/support/supportRules/ui/models/SelectionUtils",
 	"sap/ui/support/supportRules/ui/models/SharedModel",
 	"sap/ui/core/util/File",
-	"sap/ui/thirdparty/jquery",
+	"sap/base/util/extend",
 	"sap/ui/support/library"
-], function (Storage, constants, SelectionUtils, SharedModel, File, jQuery, library) {
+], function (Storage, constants, SelectionUtils, SharedModel, File, extend, library) {
 	"use strict";
 
 	var PresetsUtils = {
@@ -51,7 +51,7 @@ sap.ui.define([
 					if (oSystemPreset.id === oPreset.id) {
 						if (!oPreset.isModified) {
 							var bIsSelected = oPreset.selected;
-							oPreset = jQuery.extend({}, oSystemPreset);
+							oPreset = extend({}, oSystemPreset);
 							oPreset.selected = bIsSelected;
 							if (bIsSelected) {
 								SelectionUtils.setSelectedRules(oPreset.selections);
@@ -66,7 +66,7 @@ sap.ui.define([
 						disableDelete: true,
 						isSystemPreset: true
 					};
-					aPresets.splice(iLastSystemPresetPosition + 1, 0, jQuery.extend(mSystemPresetConfig, oSystemPreset));
+					aPresets.splice(iLastSystemPresetPosition + 1, 0, extend(mSystemPresetConfig, oSystemPreset));
 				}
 
 				iLastSystemPresetPosition++;

package/src/sap/ui/support/supportRules/ui/models/SelectionUtils.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/ui/models/SharedModel.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/ui/models/formatter.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/util/EvalUtils.js

@@ -2,7 +2,7 @@
 
 /*!
  * 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/util/RuleValidator.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.
  */
 
@@ -125,4 +125,4 @@ sap.ui.define([],
 };
 
 return RuleValidator;
-}, false);
+});

package/src/sap/ui/support/supportRules/util/StringAnalyzer.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.
  */
 
@@ -66,4 +66,4 @@ sap.ui.define([],
 	};
 
 	return StringAnalyzer;
-}, false);
+});

package/src/sap/ui/support/supportRules/util/Utils.js

@@ -1,16 +1,16 @@
 /*!
  * 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.
  */
 
 /**
  * Contains functionality that may be used trough the whole Support Assistant
  */
-sap.ui.define([],
-	function() {
+sap.ui.define(["sap/ui/thirdparty/jquery"],
+	function(jQuery) {
 		"use strict";
-		var sInternalPingFilePath = jQuery.sap.getModulePath("sap.ui.support").replace(/(^|\/)resources\//, "$1test-resources/") + "/internal/.ping";
+		var sInternalPingFilePath = sap.ui.require.toUrl("sap/ui/support").replace(/(^|\/)resources\//, "$1test-resources/") + "/internal/.ping";
 
 		var Utils = {
 			bCanLoadInternalRules: null,