Skip to content

CAP Java 5 und Spring boot 4 migration #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
StefanHenke wants to merge 28 commits into
base: main
Choose a base branch
from
Open

CAP Java 5 und Spring boot 4 migration #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
19cee78
update versions
StefanHenke Jan 28, 2026
a942f5b
make things compile
StefanHenke Jan 28, 2026
df58f05
Merge remote-tracking branch 'origin/main' into spring-boot-4
StefanHenke Jan 28, 2026
2511a98
update versions
StefanHenke Feb 9, 2026
d8031a1
Merge branch 'main' into spring-boot-4
StefanHenke Mar 16, 2026
477ea8e
Update xsuaa.version to 4.0.0-RC1
StefanHenke Mar 18, 2026
0645a0b
Merge branch 'main' into spring-boot-4
StefanHenke Mar 19, 2026
1609195
Update pom.xml
StefanHenke Apr 21, 2026
90e9536
Merge branch 'main' into spring-boot-4
StefanHenke Apr 21, 2026
563f5ee
Fix issue (#668)
StefanHenke May 13, 2026
d9eec8f
Merge remote-tracking branch 'origin/main' into spring-boot-4
StefanHenke May 13, 2026
42be472
Update maven-enforcer-plugin to version 3.6.3 and spotless-maven-plug…
mofterdinger Jun 11, 2026
50eb5ef
Merge branch 'main' into spring-boot-4
mofterdinger Jun 11, 2026
392a613
Update cds.services.version to 5.0.0-SNAPSHOT in pom.xml
mofterdinger Jun 11, 2026
b9ddd94
use Spring Boot 4.1
agoerler Jun 12, 2026
0dcd30f
Rewrite CatalogServiceITest to use RestTestClient AssertJ API
agoerler Jun 16, 2026
13ead7b
Update pom.xml
StefanHenke Jun 17, 2026
50fedd5
Merge branch 'main' into spring-boot-4
mofterdinger Jun 18, 2026
d489b4e
Merge branch 'main' into spring-boot-4
mofterdinger Jun 18, 2026
5167a43
Merge branch 'main' into spring-boot-4
mofterdinger Jun 18, 2026
67d5cbc
Update cds.services.version to 5.0.0
mofterdinger Jun 26, 2026
e4a77cc
Update @sap/cds-mtxs and @sap/cds-compiler versions in package.json a…
mofterdinger Jun 26, 2026
c4655cd
Update Maven version requirement from 3.6.3 to 3.9.14
mofterdinger Jun 26, 2026
e1563d5
Update spotless-maven-plugin version to 3.7.0
mofterdinger Jun 26, 2026
f100a19
Merge branch 'main' into spring-boot-4
mofterdinger Jun 26, 2026
20a6d6a
Update xsuaa.version to 4.0.7
mofterdinger Jun 26, 2026
57f33ad
Merge branch 'spring-boot-4' of github.com:SAP-samples/cloud-cap-samp…
mofterdinger Jun 26, 2026
01e73a4
Update cloud.sdk.version to 5.31.0
mofterdinger Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,15 @@
<artifactId>spring-boot-starter-test</artifactId>
<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>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/src/test/java/my/bookshop/it/FeatureTogglesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

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.test.context.SpringBootTest;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.web.servlet.MockMvc;
Expand Down
2 changes: 1 addition & 1 deletion mtx/sidecar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"dependencies": {
"@cap-js/hana": "^2.8.0",
"@sap/cds": "^9.9.1",
"@sap/cds-mtxs": "^3",
"@sap/cds-mtxs": "^3.9.4",
"@sap/xssec": "^4.13.0",
"express": "^4.22.2"
},
Expand Down
104 changes: 59 additions & 45 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "1.0.0",
"description": "Generated by cds-services-archetype",
"devDependencies": {
"@sap/cds-compiler": "^6.9.3",
"@sap/cds-dk": "9.9.2",
"@sap/cds-mtxs": "^3",
"@sap/cds-compiler": "^6.9.3"
"@sap/cds-mtxs": "^3.9.4"
},
"workspaces": [
"mtx/sidecar"
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.15</version>
<version>4.1.0</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
Expand All @@ -28,9 +28,9 @@

<!-- DEPENDENCIES VERSION -->
<jdk.version>25</jdk.version>
<cds.services.version>4.9.0</cds.services.version>
<cds.services.version>5.0.0</cds.services.version>
<cloud.sdk.version>5.31.0</cloud.sdk.version>
<xsuaa.version>3.7.3</xsuaa.version>
<xsuaa.version>4.0.7</xsuaa.version>
<cf-java-logging-support.version>4.2.0</cf-java-logging-support.version>
<cds-feature-attachments.version>1.5.0</cds-feature-attachments.version>
</properties>
Expand Down Expand Up @@ -156,7 +156,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.3</version>
<version>3.9.14</version>
</requireMavenVersion>
<requireJavaVersion>
<version>${jdk.version}</version>
Expand Down
23 changes: 20 additions & 3 deletions srv/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@
<artifactId>spring-boot-starter-security</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security-oauth2-resource-server</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
Expand All @@ -122,14 +127,26 @@
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<groupId>org.springframework.boot</groupId>

@mofterdinger mofterdinger Jun 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these new dependencies really required ?

<artifactId>spring-boot-starter-security-test</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webclient</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-webtestclient</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions srv/src/main/java/my/bookshop/health/CustomHealthIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package my.bookshop.health;

import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator;
import org.springframework.boot.health.contributor.Health;
import org.springframework.boot.health.contributor.HealthIndicator;
import org.springframework.stereotype.Component;

/** Custom health indicator implementation. */
Expand Down
2 changes: 2 additions & 0 deletions srv/src/test/java/my/bookshop/AdminServiceAddress_default_ITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient;
import org.springframework.test.context.ActiveProfiles;

/**
Expand All @@ -12,6 +13,7 @@
*/
@ActiveProfiles("default")
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@AutoConfigureWebTestClient
class AdminServiceAddress_default_ITest extends AdminServiceAddressITestBase {

@Test
Expand Down
2 changes: 2 additions & 0 deletions srv/src/test/java/my/bookshop/AdminServiceAddress_mocked_ITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient;
import org.springframework.test.context.ActiveProfiles;

/**
Expand All @@ -16,6 +17,7 @@
webEnvironment = WebEnvironment.RANDOM_PORT,
properties =
"cds.remote.services.'[API_BUSINESS_PARTNER]'.destination.name=myself-AdminServiceAddressITest")
@AutoConfigureWebTestClient
class AdminServiceAddress_mocked_ITest extends AdminServiceAddressITestBase {

@Test
Expand Down
Loading