chore: upgrade major version for cap and spring-boot

.github/actions/scan-with-sonar/action.yml

@@ -80,7 +80,7 @@ runs:
         -Dsonar.projectKey=com.sap.cds.cds-ai
         -Dsonar.projectVersion=${{ steps.get-revision.outputs.REVISION }}
         -Dsonar.qualitygate.wait=true
-        -Dsonar.java.source=17
+        -Dsonar.java.source=21
         -Dsonar.exclusions=**/samples/**,**/integration-tests/**
         -Dsonar.coverage.jacoco.xmlReportPaths=${{ github.workspace }}/cds-feature-ai-core/target/site/jacoco/jacoco.xml,${{ github.workspace }}/cds-feature-recommendations/target/site/jacoco/jacoco.xml,${{ github.workspace }}/integration-tests/spring/target/site/jacoco/jacoco.xml,${{ github.workspace }}/coverage-report/target/site/jacoco-aggregate/jacoco.xml
         -Dsonar.coverage.exclusions=**/src/test/**,**/src/gen/**

.github/workflows/pipeline.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [17, 21]
+        java-version: [21, 25]
     steps:
       - name: Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [17, 21]
+        java-version: [21, 25]
     steps:
       - name: Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
@@ -74,7 +74,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [17, 21]
+        java-version: [21, 25]
     steps:
       - name: Checkout
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
@@ -119,7 +119,7 @@ jobs:
         continue-on-error: true
         uses: ./.github/actions/scan-with-sonar
         with:
-          java-version: '17'
+          java-version: '21'
           maven-version: ${{ env.MAVEN_VERSION }}
           sonarq-token: ${{ secrets.SONARQ_TOKEN }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -144,7 +144,7 @@ jobs:
       - name: CodeQL Analysis
         uses: cap-java/.github/actions/scan-with-codeql@296573b55e906f5c77a1855bcfe4285cbbc5cac4 # main
         with:
-          java-version: '17'
+          java-version: '21'
           maven-version: ${{ env.MAVEN_VERSION }}
           language: ${{ matrix.language }}
           queries: security-extended

integration-tests/mtx-local/srv/pom.xml

@@ -63,6 +63,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webmvc-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-test</artifactId>

integration-tests/mtx-local/srv/src/test/java/com/sap/cds/feature/aicore/itest/mt/MtxLifecycleTest.java

@@ -6,7 +6,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sap.cds.feature.aicore.generated.cds4j.aicore.AICore_;
 import com.sap.cds.feature.aicore.api.ResourceGroupContext;
 import com.sap.cds.feature.aicore.itest.mt.utils.SubscriptionEndpointClient;
@@ -16,7 +15,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
@@ -30,14 +29,13 @@ class MtxLifecycleTest {
   private static final String TENANT = "tenant-3";
 
   @Autowired MockMvc client;
-  @Autowired ObjectMapper objectMapper;
   @Autowired CdsRuntime runtime;
 
   SubscriptionEndpointClient subscriptionEndpointClient;
 
   @BeforeEach
   void setup() {
-    subscriptionEndpointClient = new SubscriptionEndpointClient(objectMapper, client);
+    subscriptionEndpointClient = new SubscriptionEndpointClient(client);
   }
 
   @AfterEach

integration-tests/mtx-local/srv/src/test/java/com/sap/cds/feature/aicore/itest/mt/SubscribeUnsubscribeTest.java

@@ -8,7 +8,6 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sap.cds.feature.aicore.generated.cds4j.aicore.AICore_;
 import com.sap.cds.feature.aicore.api.ResourceGroupContext;
 import com.sap.cds.feature.aicore.itest.mt.utils.SubscriptionEndpointClient;
@@ -18,7 +17,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
@@ -31,14 +30,13 @@ class SubscribeUnsubscribeTest {
   private static final String PRODUCTS_URL = "/odata/v4/MtTestService/Products";
 
   @Autowired MockMvc client;
-  @Autowired ObjectMapper objectMapper;
   @Autowired CdsRuntime runtime;
 
   SubscriptionEndpointClient subscriptionEndpointClient;
 
   @BeforeEach
   void setup() {
-    subscriptionEndpointClient = new SubscriptionEndpointClient(objectMapper, client);
+    subscriptionEndpointClient = new SubscriptionEndpointClient(client);
   }
 
   @Test

integration-tests/mtx-local/srv/src/test/java/com/sap/cds/feature/aicore/itest/mt/TenantIsolationTest.java

@@ -5,7 +5,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sap.cds.feature.aicore.generated.cds4j.aicore.AICore_;
 import com.sap.cds.feature.aicore.api.ResourceGroupContext;
 import com.sap.cds.feature.aicore.core.AICoreConfig;
@@ -17,7 +16,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
@@ -28,14 +27,13 @@
 class TenantIsolationTest {
 
   @Autowired MockMvc client;
-  @Autowired ObjectMapper objectMapper;
   @Autowired CdsRuntime runtime;
 
   SubscriptionEndpointClient subscriptionEndpointClient;
 
   @BeforeEach
   void setup() {
-    subscriptionEndpointClient = new SubscriptionEndpointClient(objectMapper, client);
+    subscriptionEndpointClient = new SubscriptionEndpointClient(client);
   }
 
   @Test

integration-tests/mtx-local/srv/src/test/java/com/sap/cds/feature/aicore/itest/mt/utils/SubscriptionEndpointClient.java

@@ -18,13 +18,12 @@ public class SubscriptionEndpointClient {
 
   private static final String MT_SUBSCRIPTIONS_TENANTS = "/mt/v1.0/subscriptions/tenants/";
 
-  private final ObjectMapper objectMapper;
+  private final ObjectMapper objectMapper = new ObjectMapper();
   private final MockMvc client;
   private final String credentials =
       "Basic " + Base64.getEncoder().encodeToString("privileged:".getBytes(StandardCharsets.UTF_8));
 
-  public SubscriptionEndpointClient(ObjectMapper objectMapper, MockMvc client) {
-    this.objectMapper = objectMapper;
+  public SubscriptionEndpointClient(MockMvc client) {
     this.client = client;
   }
 

integration-tests/spring/pom.xml

@@ -61,6 +61,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webmvc-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-test</artifactId>

integration-tests/spring/src/test/java/com/sap/cds/feature/aicore/itest/BaseIntegrationTest.java

@@ -22,7 +22,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MockMvc;
 

pom.xml

@@ -59,20 +59,20 @@
 
   <properties>
     <!-- OUR VERSION -->
-    <revision>0.0.1-alpha</revision>
+    <revision>0.0.2-alpha</revision>
 
     <!-- SONAR -->
     <sonar.coverage.exclusions>**/Mock*.java</sonar.coverage.exclusions>
 
     <!-- DEPENDENCIES VERSION -->
-    <java.version>17</java.version>
+    <java.version>21</java.version>
     <!-- https://central.sonatype.com/artifact/com.sap.cds/cds-services-bom/versions -->
-    <cds.services.version>4.9.0</cds.services.version>
+    <cds.services.version>5.0.0</cds.services.version>
 
     <!-- https://central.sonatype.com/artifact/com.sap.ai.sdk/sdk-core/versions -->
     <ai-sdk.version>1.19.0</ai-sdk.version>
     <!-- https://central.sonatype.com/artifact/org.springframework.boot/spring-boot-dependencies/versions -->
-    <spring.boot.version>3.4.5</spring.boot.version>
+    <spring.boot.version>4.1.0</spring.boot.version>
     <!-- https://central.sonatype.com/artifact/org.jacoco/jacoco-maven-plugin/versions -->
     <jacoco.version>0.8.15</jacoco.version>
     <!-- https://central.sonatype.com/artifact/org.junit/junit-bom/versions -->

samples/bookshop/pom.xml

@@ -18,9 +18,9 @@
     <revision>1.0.0-SNAPSHOT</revision>
 
     <!-- DEPENDENCIES VERSION -->
-    <java.version>17</java.version>
-    <cds.services.version>4.9.0</cds.services.version>
-    <spring.boot.version>3.5.6</spring.boot.version>
+    <java.version>21</java.version>
+    <cds.services.version>5.0.0</cds.services.version>
+    <spring.boot.version>4.1.0</spring.boot.version>
     <cds-starter-ai.version>0.0.1-alpha</cds-starter-ai.version>
     <cds-feature-sap-document-ai.version>0.0.1-alpha</cds-feature-sap-document-ai.version>
     <cds-feature-attachments.version>1.5.0</cds-feature-attachments.version>

samples/bookshop/srv/pom.xml

@@ -33,6 +33,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webmvc-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.sap.cds</groupId>
       <artifactId>cds-adapter-odata-v4</artifactId>

samples/bookshop/srv/src/test/java/customer/bookshop/ApplicationTest.java

@@ -4,7 +4,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;