diff --git a/.github/workflows/internalArticatory.yml b/.github/workflows/internalArticatory.yml
index d1c7146a..ca431565 100644
--- a/.github/workflows/internalArticatory.yml
+++ b/.github/workflows/internalArticatory.yml
@@ -2,7 +2,7 @@ name: Internal Artifactory snapshot deploy
env:
JAVA_VERSION: '21'
- MAVEN_VERSION: '3.6.3'
+ MAVEN_VERSION: '3.9.16'
ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
on:
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index 324e6595..299d83c8 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -2,7 +2,7 @@ name: Main build and snapshot deploy
env:
JAVA_VERSION: '21'
- MAVEN_VERSION: '3.6.3'
+ MAVEN_VERSION: '3.9.16'
on:
push:
diff --git a/app/multi-tenant/central-space/cloud-cap-samples-java/app/package.json b/app/multi-tenant/central-space/cloud-cap-samples-java/app/package.json
index 1c66f05b..f99d83a0 100644
--- a/app/multi-tenant/central-space/cloud-cap-samples-java/app/package.json
+++ b/app/multi-tenant/central-space/cloud-cap-samples-java/app/package.json
@@ -3,6 +3,12 @@
"dependencies": {
"@sap/approuter": "23.0.0"
},
+ "overrides": {
+ "fast-uri": "3.1.8",
+ "decode-uri-component": "0.5.0",
+ "ws": "7.5.13",
+ "moment": "2.31.0"
+ },
"scripts": {
"start": "node node_modules/@sap/approuter/approuter.js"
}
diff --git a/app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar/package.json b/app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar/package.json
index 55d89b3a..98bb7c04 100644
--- a/app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar/package.json
+++ b/app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar/package.json
@@ -21,5 +21,10 @@
"scripts": {
"start": "cds-serve",
"build": "cds build ../.. --for mtx-sidecar --production && cd gen && npm install"
+ },
+ "overrides": {
+ "commander": "2.20.3",
+ "semver": "^7.8.5",
+ "debug": "^4.4.3"
}
}
\ No newline at end of file
diff --git a/app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml b/app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml
index 6fdfffba..85d8f4a5 100644
--- a/app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml
+++ b/app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml
@@ -6,7 +6,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.2.6
+ 3.5.16
@@ -23,10 +23,26 @@
21
- 4.3.0
- 5.12.0
+ 4.9.4
+ 5.34.0
3.5.0
3.8.3
+
+
+ 2.22.2
+ 1.65.0
+ 1.6.3
+ 5.4.3
+ 4.2.18.Final
+ 9.48
+ 3.8.7
+ 5.5.0
+ 33.7.1-jre
+ 2.29.7
+ 2.4.240
+ 1.17.1
+ 5.6.4
+ 10.1.59
^9
@@ -37,6 +53,89 @@
+
+
+ com.fasterxml.jackson
+ jackson-bom
+ ${jackson-bom.version}
+ pom
+ import
+
+
+ io.opentelemetry
+ opentelemetry-bom
+ ${opentelemetry.version}
+ pom
+ import
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback.version}
+
+
+ org.apache.httpcomponents.core5
+ httpcore5
+ ${httpcore5.version}
+
+
+ org.apache.httpcomponents.core5
+ httpcore5-h2
+ ${httpcore5.version}
+
+
+ org.apache.httpcomponents.client5
+ httpclient5
+ ${httpclient5.version}
+
+
+ com.squareup.okhttp3
+ okhttp
+ ${okhttp.version}
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+ com.nimbusds
+ nimbus-jose-jwt
+ ${nimbus-jose-jwt.version}
+
+
+ io.projectreactor
+ reactor-core
+ ${reactor-core.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-core
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-el
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-websocket
+ ${tomcat.version}
+
+
+ io.micrometer
+ micrometer-bom
+ ${micrometer.version}
+ pom
+ import
+
+
com.sap.cds
@@ -72,6 +171,13 @@
4.0.0
+
+
+ com.sap.cloud.db.jdbc
+ ngdbc
+ ${ngdbc.version}
+
+
diff --git a/app/multi-tenant/central-space/cloud-cap-samples-java/srv/pom.xml b/app/multi-tenant/central-space/cloud-cap-samples-java/srv/pom.xml
index e170c32a..77a4717a 100644
--- a/app/multi-tenant/central-space/cloud-cap-samples-java/srv/pom.xml
+++ b/app/multi-tenant/central-space/cloud-cap-samples-java/srv/pom.xml
@@ -26,6 +26,21 @@
com.sap.cds
cds-adapter-odata-v4
runtime
+
+
+
+ io.opentelemetry
+ opentelemetry-api
+
+
+ io.opentelemetry
+ opentelemetry-context
+
+
+ io.opentelemetry
+ opentelemetry-common
+
+
org.apache.commons
@@ -35,12 +50,28 @@
com.sap.cds
cds-feature-mt
- 4.3.0
+ 4.9.4
com.sap.cds
sdm
1.10.1-SNAPSHOT
+
+
+
+ org.apache.httpcomponents.core5
+ httpcore5
+
+
+ org.apache.httpcomponents.core5
+ httpcore5-h2
+
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+
+
com.sap.cds
@@ -141,6 +172,14 @@
org.springframework.boot
spring-boot-starter-actuator
+
+
+
+ org.hdrhistogram
+ HdrHistogram
+
+
diff --git a/app/multi-tenant/personal-space/cloud-cap-samples-java/app/package.json b/app/multi-tenant/personal-space/cloud-cap-samples-java/app/package.json
index 1c66f05b..f99d83a0 100644
--- a/app/multi-tenant/personal-space/cloud-cap-samples-java/app/package.json
+++ b/app/multi-tenant/personal-space/cloud-cap-samples-java/app/package.json
@@ -3,6 +3,12 @@
"dependencies": {
"@sap/approuter": "23.0.0"
},
+ "overrides": {
+ "fast-uri": "3.1.8",
+ "decode-uri-component": "0.5.0",
+ "ws": "7.5.13",
+ "moment": "2.31.0"
+ },
"scripts": {
"start": "node node_modules/@sap/approuter/approuter.js"
}
diff --git a/app/multi-tenant/personal-space/cloud-cap-samples-java/mtx/sidecar/package.json b/app/multi-tenant/personal-space/cloud-cap-samples-java/mtx/sidecar/package.json
index bc443138..bfbf1eb7 100644
--- a/app/multi-tenant/personal-space/cloud-cap-samples-java/mtx/sidecar/package.json
+++ b/app/multi-tenant/personal-space/cloud-cap-samples-java/mtx/sidecar/package.json
@@ -21,5 +21,10 @@
"scripts": {
"start": "cds-serve",
"build": "cds build ../.. --for mtx-sidecar --production && cd gen && npm install"
+ },
+ "overrides": {
+ "commander": "2.20.3",
+ "semver": "^7.8.5",
+ "debug": "^4.4.3"
}
}
diff --git a/app/multi-tenant/personal-space/cloud-cap-samples-java/pom.xml b/app/multi-tenant/personal-space/cloud-cap-samples-java/pom.xml
index 6fdfffba..f006a7af 100644
--- a/app/multi-tenant/personal-space/cloud-cap-samples-java/pom.xml
+++ b/app/multi-tenant/personal-space/cloud-cap-samples-java/pom.xml
@@ -6,7 +6,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.2.6
+ 3.5.16
@@ -23,10 +23,26 @@
21
- 4.3.0
- 5.12.0
+ 4.9.4
+ 5.34.0
3.5.0
3.8.3
+
+
+ 2.22.2
+ 1.65.0
+ 1.6.3
+ 5.4.3
+ 4.2.18.Final
+ 9.48
+ 3.8.7
+ 5.5.0
+ 33.7.1-jre
+ 2.29.7
+ 2.4.240
+ 1.17.1
+ 5.6.4
+ 10.1.59
^9
@@ -37,6 +53,89 @@
+
+
+ com.fasterxml.jackson
+ jackson-bom
+ ${jackson-bom.version}
+ pom
+ import
+
+
+ io.opentelemetry
+ opentelemetry-bom
+ ${opentelemetry.version}
+ pom
+ import
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback.version}
+
+
+ org.apache.httpcomponents.core5
+ httpcore5
+ ${httpcore5.version}
+
+
+ org.apache.httpcomponents.core5
+ httpcore5-h2
+ ${httpcore5.version}
+
+
+ org.apache.httpcomponents.client5
+ httpclient5
+ ${httpclient5.version}
+
+
+ com.squareup.okhttp3
+ okhttp
+ ${okhttp.version}
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+ com.nimbusds
+ nimbus-jose-jwt
+ ${nimbus-jose-jwt.version}
+
+
+ io.projectreactor
+ reactor-core
+ ${reactor-core.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-core
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-el
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-websocket
+ ${tomcat.version}
+
+
+ io.micrometer
+ micrometer-bom
+ ${micrometer.version}
+ pom
+ import
+
+
com.sap.cds
@@ -72,6 +171,13 @@
4.0.0
+
+
+ com.sap.cloud.db.jdbc
+ ngdbc
+ ${ngdbc.version}
+
+
diff --git a/app/multi-tenant/personal-space/cloud-cap-samples-java/srv/pom.xml b/app/multi-tenant/personal-space/cloud-cap-samples-java/srv/pom.xml
index 8ff37509..07db3358 100644
--- a/app/multi-tenant/personal-space/cloud-cap-samples-java/srv/pom.xml
+++ b/app/multi-tenant/personal-space/cloud-cap-samples-java/srv/pom.xml
@@ -26,6 +26,21 @@
com.sap.cds
cds-adapter-odata-v4
runtime
+
+
+
+ io.opentelemetry
+ opentelemetry-api
+
+
+ io.opentelemetry
+ opentelemetry-context
+
+
+ io.opentelemetry
+ opentelemetry-common
+
+
org.apache.commons
@@ -35,12 +50,28 @@
com.sap.cds
cds-feature-mt
- 4.3.0
+ 4.9.4
com.sap.cds
sdm
1.0.0-RC1
+
+
+
+ org.apache.httpcomponents.core5
+ httpcore5
+
+
+ org.apache.httpcomponents.core5
+ httpcore5-h2
+
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+
+
com.sap.cds
@@ -141,6 +172,14 @@
org.springframework.boot
spring-boot-starter-actuator
+
+
+
+ org.hdrhistogram
+ HdrHistogram
+
+
diff --git a/app/single-tenant/central-space/demoapp/app/package.json b/app/single-tenant/central-space/demoapp/app/package.json
index 1c66f05b..f99d83a0 100644
--- a/app/single-tenant/central-space/demoapp/app/package.json
+++ b/app/single-tenant/central-space/demoapp/app/package.json
@@ -3,6 +3,12 @@
"dependencies": {
"@sap/approuter": "23.0.0"
},
+ "overrides": {
+ "fast-uri": "3.1.8",
+ "decode-uri-component": "0.5.0",
+ "ws": "7.5.13",
+ "moment": "2.31.0"
+ },
"scripts": {
"start": "node node_modules/@sap/approuter/approuter.js"
}
diff --git a/app/single-tenant/central-space/demoapp/pom.xml b/app/single-tenant/central-space/demoapp/pom.xml
index 7a6b443a..c69cf1e9 100644
--- a/app/single-tenant/central-space/demoapp/pom.xml
+++ b/app/single-tenant/central-space/demoapp/pom.xml
@@ -17,10 +17,18 @@
21
- 4.3.0
- 3.3.1
+ 5.0.2
+ 4.1.1
^9
+
+ 1.6.3
+ 2.22.2
+ 3.2.2
+ 5.5.0
+ 33.7.1-jre
+ 11.0.26
+
https://nodejs.org/dist/
UTF-8
@@ -31,6 +39,69 @@
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback.version}
+
+
+ com.squareup.okhttp3
+ okhttp
+ ${okhttp.version}
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ ${jackson-databind.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson-databind.version}
+
+
+
+ tools.jackson.core
+ jackson-core
+ ${jackson3.version}
+
+
+ tools.jackson.core
+ jackson-databind
+ ${jackson3.version}
+
+
+ tools.jackson.core
+ jackson-annotations
+ ${jackson3.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-core
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-el
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-websocket
+ ${tomcat.version}
+
+
com.sap.cds
diff --git a/app/single-tenant/central-space/demoapp/srv/pom.xml b/app/single-tenant/central-space/demoapp/srv/pom.xml
index 2a91cb15..4afc1da5 100644
--- a/app/single-tenant/central-space/demoapp/srv/pom.xml
+++ b/app/single-tenant/central-space/demoapp/srv/pom.xml
@@ -19,6 +19,22 @@
com.sap.cds
sdm
1.10.1-SNAPSHOT
+
+
+
+ org.apache.httpcomponents.core5
+ httpcore5
+
+
+ org.apache.httpcomponents.core5
+ httpcore5-h2
+
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+
+
@@ -33,6 +49,21 @@
com.sap.cds
cds-adapter-odata-v4
runtime
+
+
+
+ io.opentelemetry
+ opentelemetry-api
+
+
+ io.opentelemetry
+ opentelemetry-context
+
+
+ io.opentelemetry
+ opentelemetry-common
+
+
@@ -109,10 +140,11 @@
cds.install-cdsdk
- install-cdsdk
+ npm
${cdsdk-global}
+ install @sap/cds-dk@${cds.install-cdsdk.version} --no-save
diff --git a/app/single-tenant/personal-space/demoapp/app/package.json b/app/single-tenant/personal-space/demoapp/app/package.json
index 1c66f05b..f99d83a0 100644
--- a/app/single-tenant/personal-space/demoapp/app/package.json
+++ b/app/single-tenant/personal-space/demoapp/app/package.json
@@ -3,6 +3,12 @@
"dependencies": {
"@sap/approuter": "23.0.0"
},
+ "overrides": {
+ "fast-uri": "3.1.8",
+ "decode-uri-component": "0.5.0",
+ "ws": "7.5.13",
+ "moment": "2.31.0"
+ },
"scripts": {
"start": "node node_modules/@sap/approuter/approuter.js"
}
diff --git a/app/single-tenant/personal-space/demoapp/pom.xml b/app/single-tenant/personal-space/demoapp/pom.xml
index 7a6b443a..f25cd77d 100644
--- a/app/single-tenant/personal-space/demoapp/pom.xml
+++ b/app/single-tenant/personal-space/demoapp/pom.xml
@@ -17,10 +17,19 @@
21
- 4.3.0
- 3.3.1
+ 5.0.2
+ 4.1.1
^9
+
+ 1.6.3
+ 2.22.2
+ 3.2.2
+ 5.5.0
+ 33.7.1-jre
+ 1.17.1
+ 11.0.26
+
https://nodejs.org/dist/
UTF-8
@@ -31,6 +40,76 @@
+
+
+ io.micrometer
+ micrometer-bom
+ ${micrometer.version}
+ pom
+ import
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback.version}
+
+
+ com.squareup.okhttp3
+ okhttp
+ ${okhttp.version}
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ ${jackson-databind.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson-databind.version}
+
+
+
+ tools.jackson.core
+ jackson-core
+ ${jackson3.version}
+
+
+ tools.jackson.core
+ jackson-databind
+ ${jackson3.version}
+
+
+ tools.jackson.core
+ jackson-annotations
+ ${jackson3.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-core
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-el
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-websocket
+ ${tomcat.version}
+
+
com.sap.cds
diff --git a/app/single-tenant/personal-space/demoapp/srv/pom.xml b/app/single-tenant/personal-space/demoapp/srv/pom.xml
index 1a18bebd..afb0976c 100644
--- a/app/single-tenant/personal-space/demoapp/srv/pom.xml
+++ b/app/single-tenant/personal-space/demoapp/srv/pom.xml
@@ -19,6 +19,22 @@
com.sap.cds
sdm
1.0.0-RC1
+
+
+
+ org.apache.httpcomponents.core5
+ httpcore5
+
+
+ org.apache.httpcomponents.core5
+ httpcore5-h2
+
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+
+
@@ -33,6 +49,21 @@
com.sap.cds
cds-adapter-odata-v4
runtime
+
+
+
+ io.opentelemetry
+ opentelemetry-api
+
+
+ io.opentelemetry
+ opentelemetry-context
+
+
+ io.opentelemetry
+ opentelemetry-common
+
+
@@ -109,10 +140,11 @@
cds.install-cdsdk
- install-cdsdk
+ npm
${cdsdk-global}
+ install @sap/cds-dk@${cds.install-cdsdk.version} --no-save
diff --git a/pom.xml b/pom.xml
index c188cfe7..eaed4de9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,11 @@
5.15.2
3.27.7
5.15.2
+
+
+ 4.1.121.Final
+ 1.85
+ 9.48
com.sap.cds
@@ -56,6 +61,31 @@
+
+
+ io.netty
+ netty-bom
+ ${netty.version}
+ pom
+ import
+
+
+ org.bouncycastle
+ bcprov-jdk18on
+ ${bouncycastle.version}
+
+
+ org.bouncycastle
+ bcpkix-jdk18on
+ ${bouncycastle.version}
+
+
+ com.nimbusds
+ nimbus-jose-jwt
+ ${nimbus-jose-jwt.version}
+
+
com.sap.cds
cds-services-bom