Skip to content

Commit a07e2de

Browse files
akgarg06akgarg06
committed
Merge branch 'develop' into RBSDMS-blackduck-security-fix-feature
2 parents 95ffba3 + 673769f commit a07e2de

16 files changed

Lines changed: 75 additions & 200 deletions

File tree

‎.github/workflows/blackduck.yml‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,40 +42,14 @@ jobs:
4242
mvn clean install -f app/single-tenant/central-space/demoapp/pom.xml -DskipTests
4343
mvn clean install -f app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml -DskipTests
4444
45-
- name: Setup npm registries and install SAP packages
46-
env:
47-
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
48-
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
49-
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
45+
- name: Install npm dependencies
5046
run: |
51-
set +x
52-
echo "::add-mask::$NPM_AUTH_TOKEN"
53-
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
54-
echo "::add-mask::$SAP_CDS_DK_TARBALL"
55-
56-
MTXS="$SAP_CDS_MTXS_TARBALL"
57-
DK="$SAP_CDS_DK_TARBALL"
58-
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
59-
6047
for dir in \
6148
"app/multi-tenant/central-space/cloud-cap-samples-java" \
6249
"app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar" \
6350
"app/multi-tenant/personal-space/cloud-cap-samples-java" \
6451
"app/multi-tenant/personal-space/cloud-cap-samples-java/mtx/sidecar"; do
65-
66-
printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
67-
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
68-
69-
tmp=$(mktemp)
70-
jq --arg mtxs "$MTXS" --arg dk "$DK" '
71-
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
72-
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
73-
| .overrides["@sap/cds-mtxs"] = $mtxs
74-
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
75-
76-
npm install --prefix "$dir"
77-
78-
git checkout "$dir/package.json"
52+
npm install --prefix "$dir" --legacy-peer-deps
7953
done
8054
8155
# - name: Download Synopsys Detect Script

‎.github/workflows/cfdeploy.yml‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -76,36 +76,6 @@ jobs:
7676
fi
7777
fi
7878
79-
- name: Setup npm registry and pin SAP tarballs 📦
80-
env:
81-
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
82-
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
83-
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
84-
run: |
85-
set +x
86-
echo "::add-mask::$NPM_AUTH_TOKEN"
87-
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
88-
echo "::add-mask::$SAP_CDS_DK_TARBALL"
89-
90-
MTXS="$SAP_CDS_MTXS_TARBALL"
91-
DK="$SAP_CDS_DK_TARBALL"
92-
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
93-
94-
for dir in \
95-
"app/single-tenant/personal-space/demoapp" \
96-
"app/single-tenant/personal-space/demoapp/db" \
97-
"app/single-tenant/personal-space/demoapp/app"; do
98-
99-
printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
100-
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
101-
102-
tmp=$(mktemp)
103-
jq --arg mtxs "$MTXS" --arg dk "$DK" '
104-
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
105-
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
106-
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
107-
done
108-
10979
- name: Prepare and Deploy to Cloud Foundry ☁️
11080
run: |
11181
set +x
@@ -244,36 +214,6 @@ jobs:
244214
env:
245215
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
246216

247-
- name: Setup npm registry and pin SAP tarballs 📦
248-
env:
249-
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
250-
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
251-
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
252-
run: |
253-
set +x
254-
echo "::add-mask::$NPM_AUTH_TOKEN"
255-
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
256-
echo "::add-mask::$SAP_CDS_DK_TARBALL"
257-
258-
MTXS="$SAP_CDS_MTXS_TARBALL"
259-
DK="$SAP_CDS_DK_TARBALL"
260-
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
261-
262-
for dir in \
263-
"app/single-tenant/central-space/demoapp" \
264-
"app/single-tenant/central-space/demoapp/db" \
265-
"app/single-tenant/central-space/demoapp/app"; do
266-
267-
printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
268-
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
269-
270-
tmp=$(mktemp)
271-
jq --arg mtxs "$MTXS" --arg dk "$DK" '
272-
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
273-
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
274-
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
275-
done
276-
277217
- name: Prepare and Deploy to Cloud Foundry ☁️
278218
run: |
279219
set +x

‎.github/workflows/multiTenancyDeployLocal.yml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -52,35 +52,6 @@ jobs:
5252
with:
5353
node-version: '20' # Ensure to use at least version 18
5454

55-
- name: Setup npm registry and pin SAP tarballs 📦
56-
env:
57-
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
58-
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
59-
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
60-
run: |
61-
set +x
62-
echo "::add-mask::$NPM_AUTH_TOKEN"
63-
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
64-
echo "::add-mask::$SAP_CDS_DK_TARBALL"
65-
66-
MTXS="$SAP_CDS_MTXS_TARBALL"
67-
DK="$SAP_CDS_DK_TARBALL"
68-
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
69-
70-
for dir in \
71-
"app/multi-tenant/personal-space/cloud-cap-samples-java" \
72-
"app/multi-tenant/personal-space/cloud-cap-samples-java/mtx/sidecar"; do
73-
74-
printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
75-
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
76-
77-
tmp=$(mktemp)
78-
jq --arg mtxs "$MTXS" --arg dk "$DK" '
79-
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
80-
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
81-
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
82-
done
83-
8455
- name: Install MBT ⚙️
8556
run: |
8657
echo "🔧 Installing MBT..."

‎.github/workflows/multiTenant_deploy_and_Integration_test.yml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,35 +43,6 @@ jobs:
4343
with:
4444
node-version: '20' # Ensure to use at least version 18
4545

46-
- name: Setup npm registry and pin SAP tarballs 📦
47-
env:
48-
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
49-
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
50-
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
51-
run: |
52-
set +x
53-
echo "::add-mask::$NPM_AUTH_TOKEN"
54-
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
55-
echo "::add-mask::$SAP_CDS_DK_TARBALL"
56-
57-
MTXS="$SAP_CDS_MTXS_TARBALL"
58-
DK="$SAP_CDS_DK_TARBALL"
59-
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
60-
61-
for dir in \
62-
"app/multi-tenant/central-space/cloud-cap-samples-java" \
63-
"app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar"; do
64-
65-
printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
66-
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
67-
68-
tmp=$(mktemp)
69-
jq --arg mtxs "$MTXS" --arg dk "$DK" '
70-
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
71-
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
72-
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
73-
done
74-
7546
- name: Install MBT ⚙️
7647
run: |
7748
echo "🔧 Installing MBT..."

‎.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,35 +43,6 @@ jobs:
4343
with:
4444
node-version: '20' # Ensure to use at least version 18
4545

46-
- name: Setup npm registry and pin SAP tarballs 📦
47-
env:
48-
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
49-
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
50-
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
51-
run: |
52-
set +x
53-
echo "::add-mask::$NPM_AUTH_TOKEN"
54-
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
55-
echo "::add-mask::$SAP_CDS_DK_TARBALL"
56-
57-
MTXS="$SAP_CDS_MTXS_TARBALL"
58-
DK="$SAP_CDS_DK_TARBALL"
59-
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')
60-
61-
for dir in \
62-
"app/multi-tenant/central-space/cloud-cap-samples-java" \
63-
"app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar"; do
64-
65-
printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
66-
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"
67-
68-
tmp=$(mktemp)
69-
jq --arg mtxs "$MTXS" --arg dk "$DK" '
70-
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
71-
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
72-
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
73-
done
74-
7546
- name: Install MBT ⚙️
7647
run: |
7748
echo "🔧 Installing MBT..."

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](http://semver.org/).
55
The format is based on [Keep a Changelog](http://keepachangelog.com/).
66

7+
## Version 1.10.3
8+
9+
### Fixed
10+
- Fix attachment upload and path resolution for deeply nested entity compositions where attachments belong to entities that are not direct children of the root entity. `buildEntityPath` and `buildActualPath` in `AttachmentsHandlerUtils` now use the full attachment path for uniqueness and recursively traverse compositions via `findPathToEntity` to build the correct actual path.
11+
712
## Version 1.10.2
813

914
### Fixed

‎app/multi-tenant/central-space/cloud-cap-samples-java/app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "approuter",
33
"dependencies": {
4-
"@sap/approuter": "16.8.2"
4+
"@sap/approuter": "23.0.0"
55
},
66
"scripts": {
77
"start": "node node_modules/@sap/approuter/approuter.js"

‎app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
<cloud.sdk.version>5.12.0</cloud.sdk.version>
2828
<xsuaa.version>3.5.0</xsuaa.version>
2929
<cf-java-logging-support.version>3.8.3</cf-java-logging-support.version>
30-
<cds.install-cdsdk.version>9.8.0</cds.install-cdsdk.version>
31-
30+
3231
<!-- SECURITY OVERRIDES (Black Duck) -->
3332
<netty.version>4.2.17.Final</netty.version>
3433
<bouncycastle.version>1.85</bouncycastle.version>
@@ -42,6 +41,7 @@
4241
<httpcore5.version>5.4.3</httpcore5.version>
4342
<kotlin.version>2.4.20</kotlin.version>
4443
<ngdbc.version>2.29.7</ngdbc.version>
44+
<cds.install-cdsdk.version>^9</cds.install-cdsdk.version>
4545
</properties>
4646

4747
<modules>

‎app/multi-tenant/personal-space/cloud-cap-samples-java/app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "approuter",
33
"dependencies": {
4-
"@sap/approuter": "16.8.2"
4+
"@sap/approuter": "23.0.0"
55
},
66
"scripts": {
77
"start": "node node_modules/@sap/approuter/approuter.js"

‎app/multi-tenant/personal-space/cloud-cap-samples-java/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<cloud.sdk.version>5.12.0</cloud.sdk.version>
2828
<xsuaa.version>3.5.0</xsuaa.version>
2929
<cf-java-logging-support.version>3.8.3</cf-java-logging-support.version>
30-
<cds.install-cdsdk.version>9.3.1</cds.install-cdsdk.version>
3130

3231
<!-- SECURITY OVERRIDES (Black Duck) -->
3332
<netty.version>4.2.17.Final</netty.version>
@@ -42,6 +41,7 @@
4241
<httpcore5.version>5.4.3</httpcore5.version>
4342
<kotlin.version>2.4.20</kotlin.version>
4443
<ngdbc.version>2.29.7</ngdbc.version>
44+
<cds.install-cdsdk.version>^9</cds.install-cdsdk.version>
4545
</properties>
4646

4747
<modules>

0 commit comments

Comments
 (0)