@openui5/sap.ui.core 1.141.1 → 1.142.0

package/src/sap/base/util/restricted/_xor.js

@@ -10,7 +10,7 @@
  * @alias module:sap/base/util/restricted/_xor
  * @author SAP SE
  * @since 1.80
- * @version 1.141.1
+ * @version 1.142.0
  * @private
  * @ui5-restricted
 */

package/src/sap/base/util/restricted/_xorBy.js

@@ -10,7 +10,7 @@
  * @alias module:sap/base/util/restricted/_xorBy
  * @author SAP SE
  * @since 1.80
- * @version 1.141.1
+ * @version 1.142.0
  * @private
  * @ui5-restricted
 */

package/src/sap/base/util/restricted/_xorWith.js

@@ -10,7 +10,7 @@
  * @alias module:sap/base/util/restricted/_xorWith
  * @author SAP SE
  * @since 1.80
- * @version 1.141.1
+ * @version 1.142.0
  * @private
  * @ui5-restricted
 */

package/src/sap/base/util/restricted/_zipObject.js

@@ -10,7 +10,7 @@
  * @alias module:sap/base/util/restricted/_zipObject
  * @author SAP SE
  * @since 1.81
- * @version 1.141.1
+ * @version 1.142.0
  * @private
  * @ui5-restricted
 */

package/src/sap/base/util/restricted/_zipObjectDeep.js

@@ -10,7 +10,7 @@
  * @alias module:sap/base/util/restricted/_zipObjectDeep
  * @author SAP SE
  * @since 1.81
- * @version 1.141.1
+ * @version 1.142.0
  * @private
  * @ui5-restricted
 */

package/src/sap/ui/Device.js

@@ -11,7 +11,7 @@
  * This API is independent from any other part of the UI5 framework. This allows it to be loaded beforehand, if it is needed, to create the UI5 bootstrap
  * dynamically depending on the capabilities of the browser or device.
  *
- * @version 1.141.1
+ * @version 1.142.0
  * @namespace
  * @name sap.ui.Device
  * @public
@@ -33,7 +33,7 @@ if (typeof window.sap.ui !== "object") {
 	// Skip initialization if API is already available
 	// ui5lint-disable no-globals
 	if (typeof window.sap.ui.Device === "object" || typeof window.sap.ui.Device === "function") {
-		var apiVersion = "1.141.1";
+		var apiVersion = "1.142.0";
 		window.sap.ui.Device._checkAPIVersion(apiVersion);
 		return;
 	}
@@ -107,7 +107,7 @@ if (typeof window.sap.ui !== "object") {
 
 	//Only used internal to make clear when Device API is loaded in wrong version
 	Device._checkAPIVersion = function(sVersion) {
-		var v = "1.141.1";
+		var v = "1.142.0";
 		if (v != sVersion) {
 			oLogger.log(WARNING, "Device API version differs: " + v + " <-> " + sVersion);
 		}

package/src/sap/ui/Global.js

@@ -18,7 +18,7 @@
  * sap.ui.lazyRequire("sap.ui.core.Control");
  * sap.ui.lazyRequire("sap.m.Button");
  *
- * @version 1.141.1
+ * @version 1.142.0
  * @author  SAP SE
  * @public
  * @fileoverview
@@ -48,7 +48,7 @@ sap.ui.define([
 	 * The <code>sap.ui</code> namespace is the central OpenAjax compliant entry
 	 * point for UI related JavaScript functionality provided by SAP.
 	 *
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @namespace
 	 * @name sap.ui
 	 * @public
@@ -59,7 +59,7 @@ sap.ui.define([
 		 * The version of the SAP UI Library
 		 * @type string
 		 */
-		version: "1.141.1",
+		version: "1.142.0",
 		// buildinfo.lastchange is deprecated and is therefore defaulted to empty string
 		buildinfo : { lastchange : "", buildtime : "${buildtime}" }
 	};

package/src/sap/ui/base/Event.js

@@ -23,7 +23,7 @@ sap.ui.define(['./Object', "sap/base/assert"],
 	 * @extends sap.ui.base.Object
 	 * @implements sap.ui.base.Poolable
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @alias sap.ui.base.Event
 	 * @public
 	 * @template {Object<string,any>} [ParamsType=object]

package/src/sap/ui/base/EventProvider.js

@@ -17,7 +17,7 @@ sap.ui.define(['./Event', './Object', "sap/base/assert", "sap/base/Log"],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @public
 	 * @alias sap.ui.base.EventProvider
 	 */

package/src/sap/ui/base/Interface.js

@@ -58,7 +58,7 @@ sap.ui.define(['sap/ui/base/Object'], function(BaseObject) {
 	 * </code>
 	 *
 	 * @author Malte Wedel, Daniel Brinkmann
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @param {sap.ui.base.Object} oObject
 	 *   Object for which a facade should be created
 	 * @param {string[]} aMethods

package/src/sap/ui/base/ManagedObject.js

@@ -266,7 +266,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @public
 	 * @alias sap.ui.base.ManagedObject
 	 */

package/src/sap/ui/base/ManagedObjectMetadata.js

@@ -79,7 +79,7 @@ function(
 	 *
 	 *
 	 * @author Frank Weigel
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @since 0.8.6
 	 * @alias sap.ui.base.ManagedObjectMetadata
 	 * @extends sap.ui.base.Metadata

package/src/sap/ui/base/Metadata.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 *
 	 * @class Metadata for a class.
 	 * @author Frank Weigel
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @since 0.8.6
 	 * @public
 	 * @alias sap.ui.base.Metadata

package/src/sap/ui/base/Object.js

@@ -26,7 +26,7 @@ sap.ui.define(['./Metadata', "sap/base/Log"],
 	 * @class Base class for all SAPUI5 Objects.
 	 * @abstract
 	 * @author Malte Wedel
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @public
 	 * @alias sap.ui.base.Object
 	 * @throws {Error} When an instance of the class or its subclasses is created without the <code>new</code> operator.

package/src/sap/ui/base/ObjectPool.js

@@ -59,7 +59,7 @@ sap.ui.define(['./Object'],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @alias sap.ui.base.ObjectPool
 	 * @public
 	 */

package/src/sap/ui/core/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.141.1</version>
+  <version>1.142.0</version>
 
   <documentation>The SAPUI5 Core Runtime.
 
@@ -242,7 +242,7 @@
             <copyright>2010-2014 Michael Bostock</copyright>
             <pattern>sap/ui/thirdparty/d3.js</pattern>
         </lib>
-        <lib name="jszip" displayName="JSZip" npmName="jszip" version="2.2.0" hash="a5402e9bb617f807e6f0af5b7cb9aab1" homepage="http://stuartk.com/jszip/" id="73554900106100005531">
+        <lib name="jszip" displayName="JSZip" npmName="jszip" version="2.2.0" hash="e32a02b830c002f4abc44aeaced160d4" homepage="http://stuartk.com/jszip/" id="73554900106100005531">
             <license url="https://github.com/Stuk/jszip/blob/master/LICENSE.markdown" type="MIT" />
             <copyright>2009-2014 Stuart Knightley, David Duponchel, Franz Buchinger, António Afonso</copyright>
             <pattern>sap/ui/thirdparty/jszip.js</pattern>
@@ -380,8 +380,8 @@
             <copyright>Isaac Z. Schlueter and Contributors</copyright>
             <pattern partial="true" otherContent="SAP" explanation="LRUPersistentCache.js is overall written by SAP, but portions ('Least Recently Used' logic) are taken from the node-lru-cache project (see https://github.com/isaacs/node-lru-cache/blob/v2.7.3/README.md) and modified.">sap/ui/core/cache/LRUPersistentCache.js</pattern>
         </lib>
-        <lib name="ui5-webcomponents" displayName="UI5 Web Components" npmName="@ui5/webcomponents" version="2.11.0" homepage="https://github.com/SAP/ui5-webcomponents" id="73554900106100402961">
-          <license url="https://github.com/SAP/ui5-webcomponents/blob/main/LICENSE" type="Apache-2.0" />
+        <lib name="ui5-webcomponents" displayName="UI5 Web Components" npmName="@ui5/webcomponents" version="2.11.0" homepage="https://github.com/UI5/webcomponents" id="73554900106100402961">
+          <license url="https://github.com/UI5/webcomponents/blob/main/LICENSE" type="Apache-2.0" />
           <copyright>SAP SE (and OpenUI5 contributors)</copyright>
           <pattern>../test/sap/ui/core/qunit/testdata/fastnavigation/webc/integration/**</pattern>
         </lib>

package/src/sap/ui/core/AppCacheBuster.js

@@ -11,7 +11,7 @@
  */
 sap.ui.define([
 	'sap/ui/base/ManagedObject',
-	'sap/ui/thirdparty/URI',
+	'sap/ui/util/_URL',
 	'sap/base/config',
 	'sap/base/Log',
 	'sap/base/i18n/Localization',
@@ -19,7 +19,7 @@ sap.ui.define([
 	'sap/base/util/mixedFetch',
 	'sap/base/strings/escapeRegExp',
 	'sap/ui/core/_IconRegistry'
-], function(ManagedObject, URI, BaseConfig, Log, Localization, extend, mixedFetch, escapeRegExp, _IconRegistry) {
+], function(ManagedObject, _URL, BaseConfig, Log, Localization, extend, mixedFetch, escapeRegExp, _IconRegistry) {
 	"use strict";
 
 	/*
@@ -81,14 +81,14 @@ sap.ui.define([
 	var sLocation = document.baseURI.replace(/\?.*|#.*/g, "");
 
 	// determine the base urls (normalize and then calculate the resources and test-resources urls)
-	var oUri = URI(sap.ui.require.toUrl("") + "/../");
-	var sOrgBaseUrl = oUri.toString();
-	if (oUri.is("relative")) {
-		oUri = oUri.absoluteTo(sLocation);
+	var oUri = new _URL(sap.ui.require.toUrl("") + "/../");
+	var sOrgBaseUrl = oUri.sourceUrl;
+	if (!oUri.isAbsolute()) {
+		oUri = new _URL(oUri.originUrl, sLocation);
 	}
-	var sBaseUrl = oUri.normalize().toString();
-	var sResBaseUrl = URI("resources").absoluteTo(sBaseUrl).toString();
-	//var sTestResBaseUrl = URI("test-resources").absoluteTo(sBaseUrl).toString();
+	var sBaseUrl = oUri.toString();
+	var sResBaseUrl = new _URL("resources", sBaseUrl).toString();
+	//var sTestResBaseUrl = new _URL("test-resources", sBaseUrl).toString();
 
 	// create resources check regex
 	var oFilter = new RegExp("^" + escapeRegExp(sResBaseUrl));
@@ -311,8 +311,8 @@ sap.ui.define([
 							// register the current base URL (if it is a relative URL)
 							// hint: if UI5 is referenced relative on a server it might be possible
 							//       with the mechanism to register another base URL.
-							var oUri = URI(sOrgBaseUrl);
-							oConfig = oUri.is("relative") ? [oUri.toString()] : [];
+							var oUri = new _URL(sOrgBaseUrl);
+							oConfig = !oUri.isAbsolute() ? [oUri.sourceUrl] : [];
 						} else if (sValue === "false") {
 							bActive = false;
 						}
@@ -569,14 +569,16 @@ sap.ui.define([
 				// local resources are registered with "./" => we remove the leading "./"!
 				// (code location for this: sap/ui/Global.js:sap.ui.localResources)
 				// we by default normalize all relative URLs for a common base
-				var oUri = URI(sUrl || "./");
-				if (oUri.is("relative")) { //(sUrl.match(/^\.\/|\..\//g)) {
-					oUri = oUri.absoluteTo(sLocation);
+				try {
+					// Use native URL constructor with sLocation as base
+					// This automatically handles relative URLs and normalization
+					// (protocol, hostname, port, path normalization)
+					var url = new URL(sUrl || "./", sLocation);
+					return url.toString();
+				} catch (e) {
+					// Fallback for invalid URLs - return original or handle gracefully
+					return sUrl || "./";
 				}
-				//return oUri.normalize().toString();
-				// prevent to normalize the search and hash to avoid "+" in the search string
-				// because for search strings the space will be normalized as "+"
-				return oUri.normalizeProtocol().normalizeHostname().normalizePort().normalizePath().toString();
 
 			},
 
@@ -642,4 +644,4 @@ sap.ui.define([
 
 	return AppCacheBuster;
 
-}, /* bExport= */ true);
+}, /* bExport= */ true);

package/src/sap/ui/core/BusyIndicator.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * Provides methods to show or hide a waiting animation covering the whole
 	 * page and blocking user interaction.
 	 * @namespace
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @public
 	 * @alias sap.ui.core.BusyIndicator
 	 */

package/src/sap/ui/core/BusyIndicatorUtils.js

@@ -26,7 +26,7 @@ sap.ui.define([
 
 	/**
 	 * Returns the HTML content for the busy indicator
-	 * styling + animation: LocalBusyIndicator.less
+	 * styling + animation: BusyIndicator.less
 	 *
 	 * @param {string} sSize either "Large", "Medium" or "Section". Other sizes will be mapped to "Medium"
 	 * @returns {Element} the element for the busy indicator

package/src/sap/ui/core/Component.js

@@ -20,9 +20,9 @@ sap.ui.define([
 	'sap/ui/base/OwnStatics',
 	'sap/ui/core/Lib',
 	'sap/ui/core/ResizeHandler',
-	'sap/ui/thirdparty/URI',
 	'sap/ui/performance/trace/Interaction',
 	'sap/ui/util/_enforceNoReturnValue',
+	'sap/ui/util/_URL',
 	'sap/base/assert',
 	'sap/base/Log',
 	'sap/base/util/Deferred',
@@ -32,7 +32,6 @@ sap.ui.define([
 	'sap/base/strings/camelize',
 	'sap/ui/core/_UrlResolver',
 	'sap/ui/VersionInfo',
-	'sap/ui/core/mvc/ViewType',
 	'sap/ui/core/ComponentRegistry',
 	'sap/ui/core/util/_LocalizationHelper'
 ], function(
@@ -50,9 +49,9 @@ sap.ui.define([
 	OwnStatics,
 	Library,
 	ResizeHandler,
-	URI,
 	Interaction,
 	_enforceNoReturnValue,
+	_URL,
 	assert,
 	Log,
 	Deferred,
@@ -62,14 +61,11 @@ sap.ui.define([
 	camelize,
 	_UrlResolver,
 	VersionInfo,
-	ViewType,
 	ComponentRegistry,
 	_LocalizationHelper
 ) {
 	"use strict";
 
-	/* global Promise */
-
 	const { runWithOwner, getCurrentOwnerId } = OwnStatics.get(ManagedObject);
 
 	var ServiceStartupOptions = {
@@ -82,17 +78,17 @@ sap.ui.define([
 		return {name: sName, type: BaseConfig.Type.String, external: true};
 	}
 	/**
-	 * Utility function which adds SAP-specific parameters to a URI instance
+	 * Utility function which adds SAP-specific parameters to a URL instance
 	 *
-	 * @param {URI} oUri URI.js instance
+	 * @param {URL} oUri Native URL instance
 	 * @private
 	 */
 	function addSapParams(oUri) {
 		['sap-client', 'sap-server'].forEach(function(sName) {
-			if (!oUri.hasSearch(sName)) {
+			if (!oUri.searchParams.has(sName)) {
 				var sValue = BaseConfig.get(getConfigParam(camelize(sName)));
 				if (sValue) {
-					oUri.addSearch(sName, sValue);
+					oUri.searchParams.set(sName, sValue);
 				}
 			}
 		});
@@ -292,7 +288,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @alias sap.ui.core.Component
 	 * @since 1.9.2
 	 */
@@ -1598,15 +1594,21 @@ sap.ui.define([
 	 */
 	//onConfigChange : null, // function(sConfigKey)
 
+	/**
+	 * @param {module:sap/ui/util/_URL} oUri URL to apply the token to
+	 * @param {object} oLogInfo Additional data used to create meaningful log entries
+	 * @param {Object<string,string>} mMetadataUrlParams
+	 * @private
+	 */
 	function _applyCacheToken(oUri, oLogInfo, mMetadataUrlParams) {
 		var sSource = mMetadataUrlParams ? "Model" : "DataSource";
 		var sManifestPath = mMetadataUrlParams ? "[\"sap.ui5\"][\"models\"]" : "[\"sap.app\"][\"dataSources\"]";
-		var sLanguage = mMetadataUrlParams && mMetadataUrlParams["sap-language"] || oUri.search(true)["sap-language"];
-		var sClient = mMetadataUrlParams && mMetadataUrlParams["sap-client"] || oUri.search(true)["sap-client"];
+		var sLanguage = mMetadataUrlParams && mMetadataUrlParams["sap-language"] || oUri.searchParams.get("sap-language");
+		var sClient = mMetadataUrlParams && mMetadataUrlParams["sap-client"] || oUri.searchParams.get("sap-client");
 
 		// 1. "sap-language" must be part of the annotation URI
 		if (!sLanguage) {
-			Log.warning("Component Manifest: Ignoring provided \"sap-context-token=" + oLogInfo.cacheToken + "\" for " + sSource + " \"" + oLogInfo.dataSource + "\" (" + oUri.toString() + "). " +
+			Log.warning("Component Manifest: Ignoring provided \"sap-context-token=" + oLogInfo.cacheToken + "\" for " + sSource + " \"" + oLogInfo.dataSource + "\" (" + oUri.sourceUrl + "). " +
 				"Missing \"sap-language\" URI parameter",
 				sManifestPath + "[\"" + oLogInfo.dataSource + "\"]", oLogInfo.componentName);
 			return;
@@ -1614,7 +1616,7 @@ sap.ui.define([
 
 		// 2. "sap-client" must be set as URI param
 		if (!sClient) {
-			Log.warning("Component Manifest: Ignoring provided \"sap-context-token=" + oLogInfo.cacheToken + "\" for " + sSource + " \"" + oLogInfo.dataSource + "\" (" + oUri.toString() + "). " +
+			Log.warning("Component Manifest: Ignoring provided \"sap-context-token=" + oLogInfo.cacheToken + "\" for " + sSource + " \"" + oLogInfo.dataSource + "\" (" + oUri.sourceUrl + "). " +
 				"Missing \"sap-client\" URI parameter",
 				sManifestPath + "[\"" + oLogInfo.dataSource + "\"]", oLogInfo.componentName);
 			return;
@@ -1623,29 +1625,29 @@ sap.ui.define([
 		// 3. "sap-client" must equal to the value of Configuration "sap-client"
 		var sClientFromConfig = BaseConfig.get(getConfigParam("sapClient"));
 		if (sClient !== sClientFromConfig) {
-			Log.warning("Component Manifest: Ignoring provided \"sap-context-token=" + oLogInfo.cacheToken + "\" for " + sSource + " \"" + oLogInfo.dataSource + "\" (" + oUri.toString() + "). " +
+			Log.warning("Component Manifest: Ignoring provided \"sap-context-token=" + oLogInfo.cacheToken + "\" for " + sSource + " \"" + oLogInfo.dataSource + "\" (" + oUri.sourceUrl + "). " +
 				"URI parameter \"sap-client=" + sClient + "\" must be identical with configuration \"sap-client=" + sClientFromConfig + "\"",
 				sManifestPath + "[\"" + oLogInfo.dataSource + "\"]", oLogInfo.componentName);
 			return;
 		}
 
 		// 4. uri has cache-token that does not match the given one - override it
-		if (oUri.hasQuery("sap-context-token") && !oUri.hasQuery("sap-context-token", oLogInfo.cacheToken) ||
+		if (oUri.searchParams.has("sap-context-token") && oUri.searchParams.get("sap-context-token") !== oLogInfo.cacheToken ||
 			mMetadataUrlParams && mMetadataUrlParams["sap-context-token"] && mMetadataUrlParams["sap-context-token"] !== oLogInfo.cacheToken) {
-			Log.warning("Component Manifest: Overriding existing \"sap-context-token=" + (oUri.query(true)["sap-context-token"] || mMetadataUrlParams["sap-context-token"]) + "\" with provided value \"" + oLogInfo.cacheToken + "\" for " + sSource + " \"" + oLogInfo.dataSource + "\" (" + oUri.toString() + ").",
+			Log.warning("Component Manifest: Overriding existing \"sap-context-token=" + (oUri.searchParams.get("sap-context-token") || mMetadataUrlParams["sap-context-token"]) + "\" with provided value \"" + oLogInfo.cacheToken + "\" for " + sSource + " \"" + oLogInfo.dataSource + "\" (" + oUri.sourceUrl + ").",
 			sManifestPath + "[\"" + oLogInfo.dataSource + "\"]", oLogInfo.componentName);
 		}
 
 		if (mMetadataUrlParams) {
 			//if serviceUrl contains a valid cache token move it to metadataURLParams so it will be only added for the metadata request
-			if (oUri.hasQuery("sap-context-token")) {
-				Log.warning("Component Manifest: Move existing \"sap-context-token=" + oUri.query(true)["sap-context-token"] + "\" to metadataUrlParams for " + sSource + " \"" + oLogInfo.dataSource + "\" (" + oUri.toString() + ").",
+			if (oUri.searchParams.has("sap-context-token")) {
+				Log.warning("Component Manifest: Move existing \"sap-context-token=" + oUri.searchParams.get("sap-context-token") + "\" to metadataUrlParams for " + sSource + " \"" + oLogInfo.dataSource + "\" (" + oUri.sourceUrl + ").",
 				sManifestPath + "[\"" + oLogInfo.dataSource + "\"]", oLogInfo.componentName);
 			}
-			oUri.removeQuery("sap-context-token");
+			oUri.searchParams.delete("sap-context-token");
 			mMetadataUrlParams["sap-context-token"] = oLogInfo.cacheToken;
 		} else {
-			oUri.setQuery("sap-context-token", oLogInfo.cacheToken);
+			oUri.searchParams.set("sap-context-token", oLogInfo.cacheToken);
 		}
 
 	}
@@ -1707,11 +1709,11 @@ sap.ui.define([
 						switch (oDataSource.type) {
 							case 'OData':
 								sODataVersion = oDataSource.settings && oDataSource.settings.odataVersion;
-								if (sODataVersion === "4.0") {
-									oModelConfig.type = 'sap.ui.model.odata.v4.ODataModel';
-								} else if (!sODataVersion || sODataVersion === "2.0") {
+								if (!sODataVersion || sODataVersion === "2.0") {
 									// 2.0 is the default in case no version is provided
 									oModelConfig.type = 'sap.ui.model.odata.v2.ODataModel';
+								} else if (sODataVersion.startsWith("4.")) {
+									oModelConfig.type = 'sap.ui.model.odata.v4.ODataModel';
 								} else {
 									future.errorThrows(`${sLogComponentName}: Component Manifest: Provided OData version "${sODataVersion}" in dataSource "${oModelConfig.dataSource}" for model "${sModelName}" is unknown. ["sap.app"]["dataSources"]["${oModelConfig.dataSource}"].`,
 										{ suffix: 'Falling back to default model type "sap.ui.model.odata.v2.ODataModel".' });
@@ -1901,16 +1903,16 @@ sap.ui.define([
 									continue;
 								}
 
-								var oAnnotationUri = new URI(oAnnotation.uri);
+								var oAnnotationUri = new _URL(oAnnotation.uri);
 
 								if (bIsV2Model || bIsV4Model) {
 									var sValueFromConfig = Localization.getSAPLogonLanguage();
-									if (!oAnnotationUri.hasQuery("sap-language") && sValueFromConfig) {
-										oAnnotationUri.setQuery("sap-language", sValueFromConfig);
+									if (!oAnnotationUri.searchParams.has("sap-language") && sValueFromConfig) {
+										oAnnotationUri.searchParams.set("sap-language", sValueFromConfig);
 									}
 									sValueFromConfig = BaseConfig.get(getConfigParam("sapClient"));
-									if (!oAnnotationUri.hasQuery("sap-client") && sValueFromConfig) {
-										oAnnotationUri.setQuery("sap-client", sValueFromConfig);
+									if (!oAnnotationUri.searchParams.has("sap-client") && sValueFromConfig) {
+										oAnnotationUri.searchParams.set("sap-client", sValueFromConfig);
 									}
 
 									var sCacheTokenForAnnotation = mCacheTokens.dataSources && mCacheTokens.dataSources[oAnnotation.uri];
@@ -1925,7 +1927,7 @@ sap.ui.define([
 
 								// resolve relative to component, ui5:// URLs are already resolved upfront
 								var oAnnotationSourceManifest = mConfig.origin.dataSources[aAnnotations[i]] || oManifest;
-								var sAnnotationUri = oAnnotationSourceManifest.resolveUri(oAnnotationUri.toString());
+								var sAnnotationUri = oAnnotationSourceManifest.resolveUri(oAnnotationUri.sourceUrl);
 
 								// add uri to annotationURI array in settings (this parameter applies for ODataModel v1 & v2)
 								oModelConfig.settings.annotationURI = oModelConfig.settings.annotationURI || [];
@@ -1968,11 +1970,11 @@ sap.ui.define([
 			if (oModelConfig.uri) {
 
 				// parse model URI to be able to modify it
-				var oUri = new URI(oModelConfig.uri);
+				var oUri = new _URL(oModelConfig.uri);
 
 				// resolve URI relative to component which defined it
 				var oUriSourceManifest = (bIsDataSourceUri ? mConfig.origin.dataSources[oModelConfig.dataSource] : mConfig.origin.models[sModelName]) || oManifest;
-				oUri = new URI(oUriSourceManifest.resolveUri(oModelConfig.uri));
+				oUri = new _URL(oUriSourceManifest.resolveUri(oModelConfig.uri));
 
 				// inherit sap-specific parameters from document (only if "sap.app/dataSources" reference is defined)
 				if (oModelConfig.dataSource) {
@@ -1986,7 +1988,7 @@ sap.ui.define([
 						// Do not add it if it is already set in the "metadataUrlParams" or is part of the model URI
 						mMetadataUrlParams = oModelConfig.settings && oModelConfig.settings.metadataUrlParams;
 						var bNeedsLanguage = (!mMetadataUrlParams || typeof mMetadataUrlParams['sap-language'] === 'undefined')
-							&& !oUri.hasQuery('sap-language')
+							&& !oUri.searchParams.has('sap-language')
 							&& Localization.getSAPLogonLanguage();
 
 						if (bNeedsLanguage || sCacheToken) {
@@ -2011,7 +2013,7 @@ sap.ui.define([
 					}
 				}
 
-				oModelConfig.uri = oUri.toString();
+				oModelConfig.uri = oUri.sourceUrl;
 			}
 
 			// set model specific "uri" property names which should be used to map "uri" to model specific constructor

package/src/sap/ui/core/ComponentContainer.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * See also {@link module:sap/ui/core/ComponentSupport}.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.ComponentContainer

package/src/sap/ui/core/ComponentMetadata.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @public
 	 * @class
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @since 1.9.2
 	 * @alias sap.ui.core.ComponentMetadata
 	 * @extends sap.ui.base.ManagedObjectMetadata

package/src/sap/ui/core/ComponentSupport.js

@@ -111,7 +111,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @public
 	 * @since 1.58.0
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @namespace
 	 * @alias module:sap/ui/core/ComponentSupport
 	 */

package/src/sap/ui/core/Configuration.js

@@ -41,7 +41,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var oVersion = new Version("1.141.1");
+	var oVersion = new Version("1.142.0");
 	var oFormatSettings;
 
 	// Lazy dependency to core

package/src/sap/ui/core/Control.js

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @alias sap.ui.core.Control
 	 */
 	var Control = Element.extend("sap.ui.core.Control", /** @lends sap.ui.core.Control.prototype */ {

package/src/sap/ui/core/Core.js

@@ -118,7 +118,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted sap.ui.core, sap.ui.test
 	 */
-	const sVersion = "1.141.1";
+	const sVersion = "1.142.0";
 
 	/**
 	 * The buildinfo.
@@ -443,7 +443,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @final
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @alias sap.ui.core.Core
 	 * @public
 	 * @hideconstructor

package/src/sap/ui/core/CustomData.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * in the documentation.
 	 *
 	 * @extends sap.ui.core.Element
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.CustomData

package/src/sap/ui/core/DeclarativeSupport.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @class Static class for enabling declarative UI support.
 	 *
 	 * @author Peter Muessig, Tino Butz
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @since 1.7.0
 	 * @public
 	 * @alias sap.ui.core.DeclarativeSupport