Merge branch 'main' into crosslevelconsumption

Author: panayotmarinov

.github/dependabot.yaml

@@ -36,6 +36,8 @@ updates:
       - dependency-name: 'com.github.ekryd.sortpom:sortpom-maven-plugin'
       # used by deprecated code only, not worth updating for now
       - dependency-name: 'org.apache.axis2:*'
+      # newer versions cause issues with our release process
+      - dependency-name: 'org.apache.maven.plugins:maven-javadoc-plugin'
       # Ignore problematic license versions
       - dependency-name: 'com.sap.cloud.security:java-security'
         versions: ['3.6.1', '3.6.2']

.github/workflows/cache-maven-dependencies.yaml

@@ -20,7 +20,7 @@ jobs:
           ref: ${{ env.MAVEN_CACHE_REF }}
 
       - name: "Setup Java"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "sapmachine"
           java-version: 17

.github/workflows/continuous-integration.yaml

@@ -86,7 +86,7 @@ jobs:
           ref: ${{ needs.context.outputs.commit }}
 
       - name: "Setup Java"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "sapmachine"
           java-version: 17
@@ -113,7 +113,7 @@ jobs:
           ref: ${{ needs.context.outputs.commit }}
 
       - name: "Setup java"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "sapmachine"
           java-version: 17
@@ -167,7 +167,7 @@ jobs:
           ref: ${{ needs.context.outputs.commit }}
 
       - name: "Setup java"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "sapmachine"
           java-version: 17
@@ -228,7 +228,7 @@ jobs:
           ref: ${{ needs.context.outputs.commit }}
 
       - name: "Setup java"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "sapmachine"
           java-version: 17
@@ -269,7 +269,7 @@ jobs:
           ref: ${{ needs.context.outputs.commit }}
 
       - name: "Setup java"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "sapmachine"
           java-version: 17
@@ -312,7 +312,7 @@ jobs:
     name: "Test ${{ matrix.task.archetype }} Archetype"
     steps:
       - name: "Setup java"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "sapmachine"
           java-version: 17

.github/workflows/deploy-snapshot.yaml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: "Setup java"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "sapmachine"
           java-version: "17"

.github/workflows/perform-release.yml

@@ -91,7 +91,7 @@ jobs:
       pull-requests: write # needed to merge the release PR
     steps:
       - name: "Setup java"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "sapmachine"
           java-version: ${{ env.JAVA_VERSION }}

.github/workflows/prepare-release.yaml

@@ -125,7 +125,7 @@ jobs:
           ref: ${{ needs.bump-version.outputs.release-branch }}
 
       - name: "Setup java"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "sapmachine"
           java-version: ${{ env.JAVA_VERSION }}
@@ -265,8 +265,8 @@ jobs:
           - [ ] Review **and approve** the [Release Notes PR](${{ needs.create-release-notes-pr.outputs.pr-url }})
           - [ ] Review the [Draft Release](${{ needs.create-release.outputs.release-url }})
           - [ ] Review **and approve** this PR
-          - [ ] Trigger the [Perform Release Workflow](${{ github.event.repository.html_url }}/actions/workflows/perform-release.yml)
-          - [ ] Once the `Perform Release` workflow is through, head over to [Central Sonatype](https://central.sonatype.com/publishing/deployments) and log in with the credentials in the Team Password Safe. There should be a published release.")
+          - [ ] Once all tests of this PR are green, trigger the [Perform Release Workflow](${{ github.event.repository.html_url }}/actions/workflows/perform-release.yml)
+          - [ ] Once the `Perform Release` workflow is through, head over to [Central Sonatype](https://central.sonatype.com/publishing/deployments) and log in with the credentials in the Team Password Safe. There should be a validated release that can be released by clicking the _release_ button.")
           echo "PR_URL=$PR_URL" >> $GITHUB_OUTPUT
         env:
           GH_TOKEN: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}

README.md

@@ -3,7 +3,7 @@
 ![build](https://github.com/SAP/cloud-sdk-java/actions/workflows/continuous-integration.yaml/badge.svg?branch=main)
 [![REUSE status](https://api.reuse.software/badge/github.com/SAP/cloud-sdk-java)](https://api.reuse.software/info/github.com/SAP/cloud-sdk-java)
 [![Fosstars security rating](https://github.com/SAP/cloud-sdk-java/blob/fosstars-report/fosstars_badge.svg)](https://github.com/SAP/cloud-sdk-java/blob/fosstars-report/fosstars_report.md)
-[![Maven Central](https://img.shields.io/badge/maven_central-5.21.0-blue.svg)](https://search.maven.org/search?q=g:com.sap.cloud.sdk%20AND%20a:sdk-core%20AND%20v:5.21.0)
+[![Maven Central](https://img.shields.io/badge/maven_central-5.22.0-blue.svg)](https://search.maven.org/search?q=g:com.sap.cloud.sdk%20AND%20a:sdk-core%20AND%20v:5.22.0)
 
 # SAP Cloud SDK for Java
 

archetypes/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.22.0-SNAPSHOT</version>
+		<version>5.23.0-SNAPSHOT</version>
 	</parent>
 	<groupId>com.sap.cloud.sdk.archetypes</groupId>
 	<artifactId>archetypes-parent</artifactId>

archetypes/spring-boot3/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.archetypes</groupId>
 		<artifactId>archetypes-parent</artifactId>
-		<version>5.22.0-SNAPSHOT</version>
+		<version>5.23.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot3</artifactId>
 	<packaging>maven-archetype</packaging>

archetypes/spring-boot3/src/main/resources/archetype-resources/pom.xml

@@ -15,7 +15,7 @@
         <spring-boot.version>3.3.0</spring-boot.version>
 
         <java.version>17</java.version>
-        <cloud-sdk.version>5.22.0-SNAPSHOT</cloud-sdk.version>
+        <cloud-sdk.version>5.23.0-SNAPSHOT</cloud-sdk.version>
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>