Merge remote-tracking branch 'origin/main' into openapi/allowlist-apis-and-models

Author: a-d

.github/workflows/perform-release.yml

@@ -21,11 +21,10 @@ jobs:
   prerequisites:
     name: "Prerequisites"
     outputs:
-      release-version: ${{ steps.determine-branch-names.outputs.RELEASE_VERSION }}
-      release-tag: ${{ steps.determine-branch-names.outputs.RELEASE_TAG }}
       code-branch: ${{ steps.determine-branch-names.outputs.CODE_BRANCH_NAME }}
       docs-branch: ${{ steps.determine-branch-names.outputs.DOCS_BRANCH_NAME }}
       release-notes-branch: ${{ steps.determine-branch-names.outputs.RELEASE_NOTES_BRANCH_NAME }}
+      release-tag: ${{ steps.determine-branch-names.outputs.RELEASE_TAG }}
       release-commit: ${{ steps.determine-branch-names.outputs.RELEASE_COMMIT }}
     permissions:
       pull-requests: read
@@ -35,29 +34,17 @@ jobs:
       - name: "Determine Branch Names"
         id: determine-branch-names
         run: |
-          if [[ "${{ github.event_name }}" == "pull_request_review" ]]; then
-            echo "[DEBUG] Taking branch name from pull request event"
-            BRANCH_NAME=${{ github.event.pull_request.head.ref }}
-          elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            echo "[DEBUG] Taking branch name from workflow dispatch event"
-            BRANCH_NAME=$(gh pr view ${{ github.event.inputs.release_pr_number }} --repo "${{ github.repository }}" --json headRefName | jq -r '.headRefName')
-          else
-            echo "Cannot determine branch name from event '${{ github.event_name }}'"
-            exit 1
-          fi
-          
-          RELEASE_VERSION=$(echo "$BRANCH_NAME" | cut -d '-' -f2) 
-          DOCS_BRANCH=java/release-docs-$RELEASE_VERSION
-          RELEASE_NOTES_BRANCH=java/release-notes-$RELEASE_VERSION
+          CODE_BRANCH_NAME=$(gh pr view ${{github.event.inputs.release_pr_number}} --repo ${{github.repository}} --json headRefName --jq '.headRefName')
+          RELEASE_VERSION=$(echo $CODE_BRANCH_NAME | cut -d '-' -f2)
+          RELEASE_TAG=rel/$RELEASE_VERSION
+          RELEASE_COMMIT=$(gh release view $RELEASE_TAG --repo ${{github.repository}} --json targetCommitish --jq '.targetCommitish')
           
+          echo "CODE_BRANCH_NAME=$CODE_BRANCH_NAME" >> $GITHUB_OUTPUT
           echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT
-          echo "RELEASE_TAG=rel/$RELEASE_VERSION" >> $GITHUB_OUTPUT
-          echo "CODE_BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
-          echo "DOCS_BRANCH_NAME=$DOCS_BRANCH" >> $GITHUB_OUTPUT
-          echo "RELEASE_NOTES_BRANCH_NAME=$RELEASE_NOTES_BRANCH" >> $GITHUB_OUTPUT
-          echo "RELEASE_COMMIT=$(gh release view "$RELEASE_TAG" --repo "${{ github.repository }}" --json targetCommitish | jq -r '.targetCommitish')" >> $GITHUB_OUTPUT
+          echo "RELEASE_TAG=$RELEASE_TAG" >> $GITHUB_OUTPUT
+          echo "RELEASE_COMMIT=$RELEASE_COMMIT" >> $GITHUB_OUTPUT
           
-          echo "[DEBUG] Current GITHUB_OUTPUT: '$(cat $GITHUB_OUTPUT)'"
+          echo -e "[DEBUG] Current GITHUB_OUTPUT:\n$(cat $GITHUB_OUTPUT)"
         env:
           GH_TOKEN: ${{ github.token }}
 

README.md

@@ -7,7 +7,7 @@ SPDX-PackageComment = "The code in this project may include calls to APIs (\"API
 [[annotations]]
 path = "**"
 precedence = "aggregate"
-SPDX-FileCopyrightText = "2024 SAP SE or an SAP affiliate company and cloud-sdk-java"
+SPDX-FileCopyrightText = "2025 SAP SE or an SAP affiliate company and cloud-sdk-java"
 SPDX-License-Identifier = "Apache-2.0"
 
 [[annotations]]

REUSE.toml

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

archetypes/pom.xml

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

archetypes/spring-boot3/pom.xml

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

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.15.0-SNAPSHOT</version>
+		<version>5.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>caching</artifactId>
 	<name>Business Technology Platform - Caching</name>

cloudplatform/caching/pom.xml

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
- */
-
 package com.sap.cloud.sdk.cloudplatform.cache;
 
 import java.util.ArrayList;

cloudplatform/caching/src/main/java/com/sap/cloud/sdk/cloudplatform/cache/CacheKey.java

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
- */
-
 package com.sap.cloud.sdk.cloudplatform.cache;
 
 import java.util.ArrayList;

cloudplatform/caching/src/main/java/com/sap/cloud/sdk/cloudplatform/cache/CacheManager.java

@@ -1,7 +1,3 @@
-/*
- * Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
- */
-
 package com.sap.cloud.sdk.cloudplatform.cache;
 
 import javax.annotation.Nonnull;