Merge remote-tracking branch 'origin/main' into oneof

# Conflicts:
#	datamodel/openapi/openapi-api-sample/src/test/java/com/sap/cloud/sdk/datamodel/openapi/sample/api/OneOfDeserializationTest.java
#	datamodel/openapi/openapi-generator/src/main/resources/openapi-generator/mustache-templates/oneof_interface.mustache

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 }}
 

cloudplatform/connectivity-ztis/pom.xml

@@ -42,12 +42,12 @@
 			<dependency>
 				<groupId>com.google.protobuf</groupId>
 				<artifactId>protobuf-java</artifactId>
-				<version>3.25.5</version>
+				<version>3.25.6</version>
 			</dependency>
 			<dependency>
 				<groupId>io.grpc</groupId>
 				<artifactId>grpc-bom</artifactId>
-				<version>1.69.0</version>
+				<version>1.70.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

datamodel/odata-v4/odata-v4-core/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/core/BatchRequestBuilder.java

@@ -34,6 +34,8 @@
  * operations in one HTTP request.
  */
 public class BatchRequestBuilder extends AbstractRequestBuilder<BatchRequestBuilder, BatchResponse>
+    implements
+    ModificationRequestBuilder<BatchResponse>
 {
     private final ODataRequestBatch delegate;
 
@@ -125,12 +127,7 @@ public BatchRequestBuilder addChangeset( @Nonnull final ModificationRequestBuild
         return this;
     }
 
-    /**
-     * Deactivates the CSRF token retrieval for this OData request. This is useful if the server does not support or
-     * require CSRF tokens as part of the request.
-     *
-     * @return The same builder
-     */
+    @Override
     @Nonnull
     public BatchRequestBuilder withoutCsrfToken()
     {

datamodel/openapi/openapi-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/model/AllOf.java

@@ -6,7 +6,6 @@
  * SodaStore API
  * API for managing soda products and orders in SodaStore.
  *
- * The version of the OpenAPI document: 1.0.0
  *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

datamodel/openapi/openapi-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/model/AnyOf.java

@@ -6,7 +6,6 @@
  * SodaStore API
  * API for managing soda products and orders in SodaStore.
  *
- * The version of the OpenAPI document: 1.0.0
  *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).