Merge branch 'main' into hierarchyAnnotaion

Author: agoerler

.github/workflows/maven.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v5
       with:
-        java-version: 21
+        java-version: 25
         distribution: 'sapmachine'
     - name: Build with Maven
       run: mvn -ntp -B clean install

app/fiori.html

@@ -14,8 +14,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.139.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.139.0/resources/sap-ui-core.js"
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.147.1/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.147.1/resources/sap-ui-core.js"
 			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-theme="sap_horizon"

app/package-lock.json

@@ -22,7 +22,7 @@ modules:
       SPRING_PROFILES_ACTIVE: cloud,sandbox
       CDS_MULTITENANCY_APPUI_TENANTSEPARATOR: "-"
       JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
-      JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 21.+ }'
+      JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 25.+ }'
     build-parameters:
       builder: custom
       commands:

mta-multi-tenant.yaml

@@ -21,7 +21,7 @@ modules:
     properties:
         SPRING_PROFILES_ACTIVE: cloud,sandbox
         JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
-        JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 21.+ }'
+        JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 25.+ }'
     build-parameters:
       builder: custom
       commands:

mta-single-tenant.yaml

@@ -27,10 +27,10 @@
     <revision>1.0.0-SNAPSHOT</revision>
 
     <!-- DEPENDENCIES VERSION -->
-    <jdk.version>21</jdk.version>
+    <jdk.version>25</jdk.version>
     <cds.services.version>4.9.0</cds.services.version>
-    <cloud.sdk.version>5.28.0</cloud.sdk.version>
-    <xsuaa.version>3.6.9</xsuaa.version>
+    <cloud.sdk.version>5.29.0</cloud.sdk.version>
+    <xsuaa.version>3.7.1</xsuaa.version>
     <cf-java-logging-support.version>4.2.0</cf-java-logging-support.version>
     <cds-feature-attachments.version>1.5.0</cds-feature-attachments.version>
   </properties>