Merge branch 'main' into dependabot/github_actions/actions/download-artifact-5

Author: sjvans

.github/workflows/codeql.yml

@@ -55,7 +55,7 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/main-build-and-deploy-oss.yml

@@ -15,7 +15,7 @@ jobs:
   #  timeout-minutes: 15
   #  steps:
   #    - name: Checkout
-  #      uses: actions/checkout@v4
+  #      uses: actions/checkout@v5
   #    - name: Scan With Black Duck
   #      uses: ./.github/actions/scan-with-blackduck
   #      with:
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           token: ${{ secrets.GH_TOKEN }}
       - name: Update version

.github/workflows/main-build.yml

@@ -17,7 +17,7 @@ jobs:
         java-version: [ 17, 21 ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Build
         uses: ./.github/actions/build
@@ -40,7 +40,7 @@ jobs:
   #   timeout-minutes: 15
   #   steps:
   #     - name: Checkout
-  #       uses: actions/checkout@v4
+  #       uses: actions/checkout@v5
   #     - name: Scan
   #      uses: ./.github/actions/scan-with-blackduck
   #      with:
@@ -54,10 +54,10 @@ jobs:
     needs: [build] # [build, scan]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Java ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: sapmachine

.github/workflows/pull-request-build.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Build
         uses: ./.github/actions/build

README.md

@@ -101,9 +101,10 @@ Please see [Validation of VMR Provisioning](https://help.sap.com/docs/sap-integr
 
 Additional configuration options for the messaging service are:
 
-Property | Type | Description |
- | --- | --- | --- |
+ Property                                                            | Type      | Description                                                                                                                                           |
+ |---------------------------------------------------------------------|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `cds.messaging.services.<key>.connection.properties.skipManagement` | `boolean` | If set to `true`, the plugin will not create a queue or subscription. This is useful if you want to manage these resources manually, default: `false` |
+| `cds.messaging.services.<key>.connection.properties.subaccountId`   | `String`  | If set to a subaccount ID, the plugin will call the validation service with that given value, default: `null`                                         |
 
 
 ## Support, Feedback, Contributing

cds-feature-advanced-event-mesh/src/main/java/com/sap/cds/feature/messaging/aem/client/AemValidationClient.java

@@ -1,10 +1,12 @@
 package com.sap.cds.feature.messaging.aem.client;
 
+import com.google.common.base.Strings;
 import com.sap.cloud.environment.servicebinding.api.ServiceBinding;
 import com.sap.cloud.sdk.cloudplatform.connectivity.ServiceBindingDestinationOptions;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 public class AemValidationClient extends RestClient {
@@ -13,9 +15,15 @@ public AemValidationClient(ServiceBinding binding) {
     super(ServiceBindingDestinationOptions.forService(binding).build());
   }
 
-  public void validate(String managementUri) throws IOException, URISyntaxException {
+  public void validate(String managementUri, String subaccountId) throws IOException, URISyntaxException {
     URI uri = new URI(managementUri);
-    String payload = this.mapper.writeValueAsString(Map.of("hostName", uri.getHost()));
+    Map<String, String> payloadMap = new HashMap<>(Map.of("hostName", uri.getHost()));
+
+    if (!Strings.isNullOrEmpty(subaccountId)) {
+      payloadMap.put("subaccountId", subaccountId);
+    }
+
+    String payload = this.mapper.writeValueAsString(payloadMap);
 
     // The response is not used, only the status code is relevant. If there is a status code not
     // equal to 200,

cds-feature-advanced-event-mesh/src/main/java/com/sap/cds/feature/messaging/aem/service/AemMessagingService.java

@@ -38,6 +38,7 @@ public class AemMessagingService extends AbstractMessagingService {
   private volatile BrokerConnection connection;
   private volatile Boolean aemBrokerValidated = false;
   private volatile Boolean skipManagement = false;
+  private volatile String subaccountId = null;
 
   @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
   protected AemMessagingService(
@@ -57,6 +58,9 @@ protected AemMessagingService(
     String skipManagementProperty = properties.get("skipManagement");
     String skip_ManagementProperty = properties.get("skip-management");
     this.skipManagement = Boolean.parseBoolean(skipManagementProperty) || Boolean.parseBoolean(skip_ManagementProperty);
+    String subaccountId = properties.getOrDefault("subaccountId", null);
+    String subaccount_Id = properties.getOrDefault("subaccount-id", null);
+    this.subaccountId = subaccountId != null ? subaccountId : subaccount_Id;
   }
 
   @VisibleForTesting
@@ -163,7 +167,7 @@ private void validate(String endpoint) {
       AemValidationClient validationClient = new AemValidationClient(this.validationBinding);
 
       try {
-        validationClient.validate(endpoint);
+        validationClient.validate(endpoint, this.subaccountId);
         this.aemBrokerValidated = true;
       } catch (IOException | URISyntaxException e) {
         throw new ServiceException("Failed to validate the AEM endpoint.", e);

pom.xml

@@ -28,9 +28,9 @@
     <maven.compiler.release>${java.version}</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <cds.services.version>4.1.1</cds.services.version>
+    <cds.services.version>4.3.1</cds.services.version>
     <cds.install-cdsdk.version>8.7.3</cds.install-cdsdk.version>
-    <qpid.version>2.7.0</qpid.version>    <!-- https://central.sonatype.com/artifact/org.apache.qpid/qpid-jms-client/versions -->
+    <qpid.version>2.9.0</qpid.version>    <!-- https://central.sonatype.com/artifact/org.apache.qpid/qpid-jms-client/versions -->
     <com.google.code.findbugs.jsr305.version>3.0.2</com.google.code.findbugs.jsr305.version>
   </properties>
 
@@ -60,15 +60,15 @@
       <dependency>
         <groupId>com.sap.cloud.sdk</groupId>
         <artifactId>sdk-bom</artifactId>
-        <version>5.20.0</version>
+        <version>5.22.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
 
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-bom</artifactId>
-        <version>5.18.0</version>
+        <version>5.20.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.27.3</version>
+      <version>3.27.6</version>
       <scope>test</scope>
     </dependency>
 
@@ -212,11 +212,11 @@
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.11.2</version>
+          <version>3.12.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.5.2</version>
+          <version>3.5.4</version>
         </plugin>
         <plugin>
           <artifactId>maven-pmd-plugin</artifactId>
@@ -229,7 +229,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>flatten-maven-plugin</artifactId>
-          <version>1.7.1</version>
+          <version>1.7.3</version>
         </plugin>
         <plugin>
           <groupId>org.jacoco</groupId>
@@ -239,12 +239,12 @@
         <plugin>
           <groupId>org.pitest</groupId>
           <artifactId>pitest-maven</artifactId>
-          <version>1.20.0</version>
+          <version>1.20.3</version>
         </plugin>
         <plugin>
           <groupId>com.github.spotbugs</groupId>
           <artifactId>spotbugs-maven-plugin</artifactId>
-          <version>4.9.3.2</version>
+          <version>4.9.6.0</version>
         </plugin>
       </plugins>
     </pluginManagement>