Skip to content

Commit cf489ee

Browse files
yutaojyutaoj
authored
support java23 and upgrade cyclonedx-npm and cyclonedx-maven-plugin version (#1151)
Co-authored-by: Jiang, Yu-tao <>
1 parent f77b45a commit cf489ee

File tree

4 files changed

+90
-49
lines changed

4 files changed

+90
-49
lines changed

‎.circleci/config.yml‎

Lines changed: 86 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
name: install cyclonedx-npm
140140
command: |
141141
CYCLONEDX_NPM_PACKAGE=@cyclonedx/cyclonedx-npm
142-
CYCLONEDX_NPM_VERSION=1.11.0
142+
CYCLONEDX_NPM_VERSION=1.19.3
143143
CYCLONEDX_NPM_BINARY=cyclonedx-npm
144144
echo "npx ${CYCLONEDX_NPM_PACKAGE}@${CYCLONEDX_NPM_VERSION} -h"
145145
npx ${CYCLONEDX_NPM_PACKAGE}@${CYCLONEDX_NPM_VERSION} -h
@@ -418,21 +418,21 @@ jobs:
418418
git fetch
419419
git rebase
420420
- run:
421-
name: build Java 17.0.12 & Node 14.21.1 image
421+
name: build Java 17.0.13 & Node 14.21.1 image
422422
command: |
423423
MBT_VERSION=$(cat ./VERSION)
424-
sh $PWD/scripts/build_image 17.0.12 14.21.1 ${MBT_VERSION}
424+
sh $PWD/scripts/build_image 17.0.13 14.21.1 ${MBT_VERSION}
425425
- run:
426-
name: publish Java 17.0.12 & Node 14.21.1 image
426+
name: publish Java 17.0.13 & Node 14.21.1 image
427427
command: |
428428
MBT_VERSION=$(cat ./VERSION)
429429
echo "Image release: ${MBT_VERSION}"
430430
#Push to Docker Hub
431431
echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin
432-
sh $PWD/scripts/publish_image 17.0.12 14.21.1 ${MBT_VERSION} "devxci"
432+
sh $PWD/scripts/publish_image 17.0.13 14.21.1 ${MBT_VERSION} "devxci"
433433
#Push to GitHub Container Registry
434434
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
435-
sh $PWD/scripts/publish_image 17.0.12 14.21.1 ${MBT_VERSION} "ghcr.io/sap"
435+
sh $PWD/scripts/publish_image 17.0.13 14.21.1 ${MBT_VERSION} "ghcr.io/sap"
436436
437437
publish-to-dockerhub-java17-node16:
438438
docker:
@@ -450,21 +450,21 @@ jobs:
450450
git fetch
451451
git rebase
452452
- run:
453-
name: build Java 17.0.12 & Node 16.18.1 image
453+
name: build Java 17.0.13 & Node 16.18.1 image
454454
command: |
455455
MBT_VERSION=$(cat ./VERSION)
456-
sh $PWD/scripts/build_image 17.0.12 16.18.1 ${MBT_VERSION}
456+
sh $PWD/scripts/build_image 17.0.13 16.18.1 ${MBT_VERSION}
457457
- run:
458-
name: publish Java 17.0.12 & Node 16.18.1 image
458+
name: publish Java 17.0.13 & Node 16.18.1 image
459459
command: |
460460
MBT_VERSION=$(cat ./VERSION)
461461
echo "Image release: ${MBT_VERSION}"
462462
#Push to Docker Hub
463463
echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin
464-
sh $PWD/scripts/publish_image 17.0.12 16.18.1 ${MBT_VERSION} "devxci"
464+
sh $PWD/scripts/publish_image 17.0.13 16.18.1 ${MBT_VERSION} "devxci"
465465
#Push to GitHub Container Registry
466466
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
467-
sh $PWD/scripts/publish_image 17.0.12 16.18.1 ${MBT_VERSION} "ghcr.io/sap"
467+
sh $PWD/scripts/publish_image 17.0.13 16.18.1 ${MBT_VERSION} "ghcr.io/sap"
468468
469469
publish-to-dockerhub-java17-node18:
470470
docker:
@@ -482,21 +482,21 @@ jobs:
482482
git fetch
483483
git rebase
484484
- run:
485-
name: build Java 17.0.12 & Node 18.20.4 image
485+
name: build Java 17.0.13 & Node 18.20.4 image
486486
command: |
487487
MBT_VERSION=$(cat ./VERSION)
488-
sh $PWD/scripts/build_image 17.0.12 18.20.4 ${MBT_VERSION}
488+
sh $PWD/scripts/build_image 17.0.13 18.20.4 ${MBT_VERSION}
489489
- run:
490-
name: publish Java 17.0.12 & Node 18.20.4 image
490+
name: publish Java 17.0.13 & Node 18.20.4 image
491491
command: |
492492
MBT_VERSION=$(cat ./VERSION)
493493
echo "Image release: ${MBT_VERSION}"
494494
#Push to Docker Hub
495495
echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin
496-
sh $PWD/scripts/publish_image 17.0.12 18.20.4 ${MBT_VERSION} "devxci"
496+
sh $PWD/scripts/publish_image 17.0.13 18.20.4 ${MBT_VERSION} "devxci"
497497
#Push to GitHub Container Registry
498498
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
499-
sh $PWD/scripts/publish_image 17.0.12 18.20.4 ${MBT_VERSION} "ghcr.io/sap"
499+
sh $PWD/scripts/publish_image 17.0.13 18.20.4 ${MBT_VERSION} "ghcr.io/sap"
500500
501501
publish-to-dockerhub-java17-node20:
502502
docker:
@@ -514,21 +514,53 @@ jobs:
514514
git fetch
515515
git rebase
516516
- run:
517-
name: build Java 17.0.12 & Node 20.15.1 image
517+
name: build Java 17.0.13 & Node 20.15.1 image
518518
command: |
519519
MBT_VERSION=$(cat ./VERSION)
520-
sh $PWD/scripts/build_image 17.0.12 20.15.1 ${MBT_VERSION}
520+
sh $PWD/scripts/build_image 17.0.13 20.15.1 ${MBT_VERSION}
521521
- run:
522-
name: publish Java 17.0.12 & Node 20.15.1 image
522+
name: publish Java 17.0.13 & Node 20.15.1 image
523523
command: |
524524
MBT_VERSION=$(cat ./VERSION)
525525
echo "Image release: ${MBT_VERSION}"
526526
#Push to Docker Hub
527527
echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin
528-
sh $PWD/scripts/publish_image 17.0.12 20.15.1 ${MBT_VERSION} "devxci"
528+
sh $PWD/scripts/publish_image 17.0.13 20.15.1 ${MBT_VERSION} "devxci"
529529
#Push to GitHub Container Registry
530530
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
531-
sh $PWD/scripts/publish_image 17.0.12 20.15.1 ${MBT_VERSION} "ghcr.io/sap"
531+
sh $PWD/scripts/publish_image 17.0.13 20.15.1 ${MBT_VERSION} "ghcr.io/sap"
532+
533+
publish-to-dockerhub-java17-node22:
534+
docker:
535+
- image: cimg/go:1.21
536+
working_directory: ~/go/src/github.com/SAP/cloud-mta-build-tool
537+
steps:
538+
- checkout
539+
- setup_remote_docker:
540+
version: 20.10.24
541+
- run:
542+
name: build image pre-setup
543+
command: |
544+
#Make sure HEAD points to master
545+
git checkout master
546+
git fetch
547+
git rebase
548+
- run:
549+
name: build Java 17.0.13 & Node 22.5.1 image
550+
command: |
551+
MBT_VERSION=$(cat ./VERSION)
552+
sh $PWD/scripts/build_image 17.0.13 22.5.1 ${MBT_VERSION}
553+
- run:
554+
name: publish Java 17.0.13 & Node 22.5.1 image
555+
command: |
556+
MBT_VERSION=$(cat ./VERSION)
557+
echo "Image release: ${MBT_VERSION}"
558+
#Push to Docker Hub
559+
echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin
560+
sh $PWD/scripts/publish_image 17.0.13 22.5.1 ${MBT_VERSION} "devxci"
561+
#Push to GitHub Container Registry
562+
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
563+
sh $PWD/scripts/publish_image 17.0.13 22.5.1 ${MBT_VERSION} "ghcr.io/sap"
532564
533565
publish-to-dockerhub-java19-node14:
534566
docker:
@@ -751,7 +783,7 @@ jobs:
751783
#Push to GitHub Container Registry
752784
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
753785
sh $PWD/scripts/publish_image 21.0.4 22.5.1 ${MBT_VERSION} "ghcr.io/sap"
754-
publish-to-dockerhub-java22-node18:
786+
publish-to-dockerhub-java23-node18:
755787
docker:
756788
- image: cimg/go:1.21
757789
working_directory: ~/go/src/github.com/SAP/cloud-mta-build-tool
@@ -767,23 +799,23 @@ jobs:
767799
git fetch
768800
git rebase
769801
- run:
770-
name: build Java 22.0.2 & Node 18.20.4 image
802+
name: build Java 23.0.1 & Node 18.20.4 image
771803
command: |
772804
MBT_VERSION=$(cat ./VERSION)
773-
sh $PWD/scripts/build_image 22.0.2 18.20.4 ${MBT_VERSION}
805+
sh $PWD/scripts/build_image 23.0.1 18.20.4 ${MBT_VERSION}
774806
- run:
775-
name: publish Java 22.0.2 & Node 18.20.4 image
807+
name: publish Java 23.0.1 & Node 18.20.4 image
776808
command: |
777809
MBT_VERSION=$(cat ./VERSION)
778810
echo "Image release: ${MBT_VERSION}"
779811
#Push to Docker Hub
780812
echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin
781-
sh $PWD/scripts/publish_image 22.0.2 18.20.4 ${MBT_VERSION} "devxci"
813+
sh $PWD/scripts/publish_image 23.0.1 18.20.4 ${MBT_VERSION} "devxci"
782814
#Push to GitHub Container Registry
783815
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
784-
sh $PWD/scripts/publish_image 22.0.2 18.20.4 ${MBT_VERSION} "ghcr.io/sap"
816+
sh $PWD/scripts/publish_image 23.0.1 18.20.4 ${MBT_VERSION} "ghcr.io/sap"
785817
786-
publish-to-dockerhub-java22-node20:
818+
publish-to-dockerhub-java23-node20:
787819
docker:
788820
- image: cimg/go:1.21
789821
working_directory: ~/go/src/github.com/SAP/cloud-mta-build-tool
@@ -799,23 +831,23 @@ jobs:
799831
git fetch
800832
git rebase
801833
- run:
802-
name: build Java 22.0.2 & Node 20.15.1 image
834+
name: build Java 23.0.1 & Node 20.15.1 image
803835
command: |
804836
MBT_VERSION=$(cat ./VERSION)
805-
sh $PWD/scripts/build_image 22.0.2 20.15.1 ${MBT_VERSION}
837+
sh $PWD/scripts/build_image 23.0.1 20.15.1 ${MBT_VERSION}
806838
- run:
807-
name: publish Java 22.0.2 & Node 20.15.1 image
839+
name: publish Java 23.0.1 & Node 20.15.1 image
808840
command: |
809841
MBT_VERSION=$(cat ./VERSION)
810842
echo "Image release: ${MBT_VERSION}"
811843
#Push to Docker Hub
812844
echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin
813-
sh $PWD/scripts/publish_image 22.0.2 20.15.1 ${MBT_VERSION} "devxci"
845+
sh $PWD/scripts/publish_image 23.0.1 20.15.1 ${MBT_VERSION} "devxci"
814846
#Push to GitHub Container Registry
815847
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
816-
sh $PWD/scripts/publish_image 22.0.2 20.15.1 ${MBT_VERSION} "ghcr.io/sap"
848+
sh $PWD/scripts/publish_image 23.0.1 20.15.1 ${MBT_VERSION} "ghcr.io/sap"
817849
818-
publish-to-dockerhub-java22-node22:
850+
publish-to-dockerhub-java23-node22:
819851
docker:
820852
- image: cimg/go:1.21
821853
working_directory: ~/go/src/github.com/SAP/cloud-mta-build-tool
@@ -831,21 +863,21 @@ jobs:
831863
git fetch
832864
git rebase
833865
- run:
834-
name: build Java 22.0.2 & Node 22.5.1 image
866+
name: build Java 23.0.1 & Node 22.5.1 image
835867
command: |
836868
MBT_VERSION=$(cat ./VERSION)
837-
sh $PWD/scripts/build_image 22.0.2 22.5.1 ${MBT_VERSION}
869+
sh $PWD/scripts/build_image 23.0.1 22.5.1 ${MBT_VERSION}
838870
- run:
839-
name: publish Java 22.0.2 & Node 22.5.1 image
871+
name: publish Java 23.0.1 & Node 22.5.1 image
840872
command: |
841873
MBT_VERSION=$(cat ./VERSION)
842874
echo "Image release: ${MBT_VERSION}"
843875
#Push to Docker Hub
844876
echo "$DOCKER_HUB_TOKEN" | docker login --username $DOCKER_HUB_USER --password-stdin
845-
sh $PWD/scripts/publish_image 22.0.2 22.5.1 ${MBT_VERSION} "devxci"
877+
sh $PWD/scripts/publish_image 23.0.1 22.5.1 ${MBT_VERSION} "devxci"
846878
#Push to GitHub Container Registry
847879
echo "$CLOUD_MTA_BOT_GITHUB_TOKEN" | docker login "ghcr.io" --username $CLOUD_MTA_BOT_USER --password-stdin
848-
sh $PWD/scripts/publish_image 22.0.2 22.5.1 ${MBT_VERSION} "ghcr.io/sap"
880+
sh $PWD/scripts/publish_image 23.0.1 22.5.1 ${MBT_VERSION} "ghcr.io/sap"
849881
remove-github-release-tag:
850882
docker:
851883
- image: cimg/go:1.21
@@ -1117,6 +1149,14 @@ workflows:
11171149
only: /release/
11181150
branches:
11191151
ignore: /.*/
1152+
- publish-to-dockerhub-java17-node22:
1153+
requires:
1154+
- publish-to-npm
1155+
filters:
1156+
tags:
1157+
only: /release/
1158+
branches:
1159+
ignore: /.*/
11201160
- publish-to-dockerhub-java19-node14:
11211161
requires:
11221162
- publish-to-npm
@@ -1173,23 +1213,23 @@ workflows:
11731213
only: /release/
11741214
branches:
11751215
ignore: /.*/
1176-
- publish-to-dockerhub-java22-node18:
1216+
- publish-to-dockerhub-java23-node18:
11771217
requires:
11781218
- publish-to-npm
11791219
filters:
11801220
tags:
11811221
only: /release/
11821222
branches:
11831223
ignore: /.*/
1184-
- publish-to-dockerhub-java22-node20:
1224+
- publish-to-dockerhub-java23-node20:
11851225
requires:
11861226
- publish-to-npm
11871227
filters:
11881228
tags:
11891229
only: /release/
11901230
branches:
11911231
ignore: /.*/
1192-
- publish-to-dockerhub-java22-node22:
1232+
- publish-to-dockerhub-java23-node22:
11931233
requires:
11941234
- publish-to-npm
11951235
filters:
@@ -1207,16 +1247,17 @@ workflows:
12071247
- publish-to-dockerhub-java17-node16
12081248
- publish-to-dockerhub-java17-node18
12091249
- publish-to-dockerhub-java17-node20
1250+
- publish-to-dockerhub-java17-node22
12101251
- publish-to-dockerhub-java19-node14
12111252
- publish-to-dockerhub-java19-node16
12121253
- publish-to-dockerhub-java19-node18
12131254
- publish-to-dockerhub-java21-node16
12141255
- publish-to-dockerhub-java21-node18
12151256
- publish-to-dockerhub-java21-node20
12161257
- publish-to-dockerhub-java21-node22
1217-
- publish-to-dockerhub-java22-node18
1218-
- publish-to-dockerhub-java22-node20
1219-
- publish-to-dockerhub-java22-node22
1258+
- publish-to-dockerhub-java23-node18
1259+
- publish-to-dockerhub-java23-node20
1260+
- publish-to-dockerhub-java23-node22
12201261
filters:
12211262
tags:
12221263
only: /release/

‎Dockerfile_mbtci_template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ARG CYCLONEDX_CLI_BINARY=cyclonedx
1515
ARG CYCLONEDX_GOMOD_VERSION=1.4.0
1616
ARG CYCLONEDX_GOMOD_BINARY=cyclonedx-gomod
1717
ARG CYCLONEDX_NPM_PACKAGE=@cyclonedx/cyclonedx-npm
18-
ARG CYCLONEDX_NPM_VERSION=1.11.0
18+
ARG CYCLONEDX_NPM_VERSION=1.19.3
1919
ARG CYCLONEDX_NPM_BINARY=cyclonedx-npm
2020

2121
# Environment variables

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ CYCLONEDX_GOMOD_VERSION = v1.4.0
2626

2727
# cyclonedx_npm
2828
CYCLONEDX_NPM_PACKAGE = @cyclonedx/cyclonedx-npm
29-
CYCLONEDX_NPM_VERSION = 1.11.0
29+
CYCLONEDX_NPM_VERSION = 1.19.3
3030
CYCLONEDX_NPM_BINARY = cyclonedx-npm
3131

3232
ifeq ($(OS),Windows_NT)

‎internal/commands/commands.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const (
2121
optionsSuffix = "-opts"
2222
goModuleType = "go"
2323
cyclonedx_npm = "@cyclonedx/cyclonedx-npm"
24-
cyclonedx_npm_version = "1.11.0"
24+
cyclonedx_npm_version = "1.19.3"
2525
cyclonedx_npm_schema_version = "1.4"
2626
)
2727

@@ -353,7 +353,7 @@ func GetModuleSBomGenCommands(loc *dir.Loc, module *mta.Module,
353353
cmd = "cyclonedx-gomod mod -output-version 1.4 -licenses -output " + sbomFileName + sbomFileSuffix
354354
cmds = append(cmds, cmd)
355355
case "maven", "fetcher", "maven_deprecated":
356-
cmd = "mvn org.cyclonedx:cyclonedx-maven-plugin:2.7.5:makeAggregateBom " +
356+
cmd = "mvn org.cyclonedx:cyclonedx-maven-plugin:2.9.0:makeAggregateBom " +
357357
"-DschemaVersion=1.4 -DincludeBomSerialNumber=true -DincludeCompileScope=true " +
358358
"-DincludeRuntimeScope=true -DincludeSystemScope=true -DincludeTestScope=false -DincludeLicenseText=false " +
359359
"-DoutputFormat=" + sbomFileType + " -DoutputName=" + sbomFileName + ".bom"

0 commit comments

Comments
 (0)