Skip to content

Commit f0ecebd

Browse files
Upgrade all components to cds8 (#345)
This PR fixes test failures of the Bookshop ITests using CAP 3 and cds8. * `authentication.normalize-provider-tenant: true` needs to be set in the `application.yaml` because current itest logic requires the provider tenant to be subscribed. The deployment shell script is setting this value to `false` using a `sed` command which requires this property to be available in the file * `hdi-deploy` in version `5` does not bundle any hana db client, but comes with a post install script that checks that one client has been installed by an external party. As we don´t need db accesses in the ìnstall-dependencies` goal in `pom.xml`, we just set `--ignore-scripts` --------- Co-authored-by: Marc Becker <[email protected]>
1 parent 5db911f commit f0ecebd

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

db/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"name": "deploy",
33
"dependencies": {
4-
"@sap/hdi-deploy": "4.8.2"
4+
"hdb": "^0",
5+
"@sap/hdi-deploy": "^5"
56
},
67
"engines": {
7-
"node": "^18"
8+
"node": "^20"
89
},
910
"scripts": {
10-
"start": "node node_modules/@sap/hdi-deploy/deploy.js",
11+
"start": "node node_modules/@sap/hdi-deploy/deploy.js --use-hdb",
1112
"build": "npm i && npx cds build .. --for hana --production"
1213
}
1314
}

integration-tests/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@
123123
</executions>
124124
<configuration>
125125
<executable>${cds.npm.executable}</executable>
126+
<environmentVariables>
127+
<PATH>${cds.node.directory}${path.separator}${env.PATH}</PATH>
128+
</environmentVariables>
126129
<skip>${skipTests}</skip>
127130
<workingDirectory>${sidecar.dir}</workingDirectory>
128131
<async>true</async>

mtx/sidecar/package.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
{
22
"dependencies": {
3-
"@sap/cds": "^7",
4-
"@sap/cds-mtxs": "^1",
5-
"@sap/xssec": "^3",
6-
"express": "^4",
7-
"hdb": "^0",
8-
"passport": "^0",
9-
"@sap/hdi-deploy": "4.8.2"
3+
"@cap-js/hana": "^1",
4+
"@sap/cds": "^8",
5+
"@sap/cds-mtxs": "^2",
6+
"@sap/xssec": "^4",
7+
"express": "^4"
108
},
119
"devDependencies": {
12-
"sqlite3": "^5"
10+
"@cap-js/sqlite": "^1"
1311
},
1412
"engines": {
15-
"node": "^18"
13+
"node": "^20"
1614
},
1715
"cds": {
1816
"profiles": ["mtx-sidecar", "java"],

srv/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
<goal>npm</goal>
193193
</goals>
194194
<configuration>
195-
<arguments>install @sap/cds-dk@${cds.install-cdsdk.version} @sap/cds-mtxs@^2 --no-save</arguments>
195+
<arguments>install @sap/cds-dk@${cds.install-cdsdk.version} @sap/cds-mtxs@^2 --ignore-scripts --no-save</arguments>
196196
</configuration>
197197
</execution>
198198

srv/src/main/resources/application.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ cds:
99
odata-v4:
1010
endpoint.path: "/api"
1111
security:
12+
authentication.normalize-provider-tenant: true
1213
mock.users:
1314
admin:
1415
password: admin

0 commit comments

Comments
 (0)