Compare commits

..
Author SHA1 Message Date
Sathish Kumar b3fa4568a6 [PRODSEC-8956] fix for CVE Vulnerability SRCCLR-SID-22742 in commons-codec-1.11 2024-08-26 14:03:47 +05:30
purusothaman-mm c53fb72935 [PRODSEC-9150] fix for snappy vulnerability (#677) 2024-07-24 10:46:15 +05:30
Domenico Sibilio 906a608ffa ACS-8405 Migrate to Docker Compose v2 (#676) 2024-07-18 09:50:19 +02:00
purusothaman-mm 459e3f1424 Fix/prodsec 8957 spring context vulnerability (#674)
* [PRODSEC-8957] fix for spring-context

* [PRODSEC-8957] fix for spring-context

* [PRODSEC-8957] fix for spring-context

* [PRODSEC-8957] fix for spring-context
2024-06-17 11:16:44 +05:30
purusothaman-mm a879ad83c9 [PRODSEC-9063] fix for maven-shared-utils (#672) 2024-06-13 15:40:20 +05:30
purusothaman-mm 928f99336e [PRODSEC-8961] fix for commons-net vulnerability (#671) 2024-06-12 18:15:21 +05:30
9 changed files with 52 additions and 47 deletions
@@ -83,37 +83,37 @@ EXIT /B %ERRORLEVEL%
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume docker volume create ${rootArtifactId}-ass-volume
docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
EXIT /B 0 EXIT /B 0
:start_share :start_share
docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
EXIT /B 0 EXIT /B 0
:start_acs :start_acs
docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-acs docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-acs
EXIT /B 0 EXIT /B 0
:down :down
if exist "%COMPOSE_FILE_PATH%" ( if exist "%COMPOSE_FILE_PATH%" (
docker-compose -f "%COMPOSE_FILE_PATH%" down docker compose -f "%COMPOSE_FILE_PATH%" down
) )
EXIT /B 0 EXIT /B 0
:build :build
call %MVN_EXEC% clean package call %MVN_EXEC% clean package
EXIT /B 0 EXIT /B 0
:build_share :build_share
docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
call %MVN_EXEC% clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker call %MVN_EXEC% clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker
EXIT /B 0 EXIT /B 0
:build_acs :build_acs
docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs
docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs
call %MVN_EXEC% clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker call %MVN_EXEC% clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker
EXIT /B 0 EXIT /B 0
:tail :tail
docker-compose -f "%COMPOSE_FILE_PATH%" logs -f docker compose -f "%COMPOSE_FILE_PATH%" logs -f
EXIT /B 0 EXIT /B 0
:tail_all :tail_all
docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all" docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
EXIT /B 0 EXIT /B 0
:prepare-test :prepare-test
call %MVN_EXEC% verify -DskipTests=true -pl ${rootArtifactId}-platform,${rootArtifactId}-integration-tests,${rootArtifactId}-platform-docker call %MVN_EXEC% verify -DskipTests=true -pl ${rootArtifactId}-platform,${rootArtifactId}-integration-tests,${rootArtifactId}-platform-docker
@@ -13,20 +13,20 @@ start() {
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume docker volume create ${rootArtifactId}-ass-volume
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
} }
start_share() { start_share() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
} }
start_acs() { start_acs() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-acs docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-acs
} }
down() { down() {
if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
fi fi
} }
@@ -41,23 +41,23 @@ build() {
} }
build_share() { build_share() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker
} }
build_acs() { build_acs() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-acs docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-acs
yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-acs yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-acs
${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker
} }
tail() { tail() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
} }
tail_all() { tail_all() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all" docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
} }
prepare_test() { prepare_test() {
@@ -71,21 +71,21 @@ EXIT /B %ERRORLEVEL%
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume docker volume create ${rootArtifactId}-ass-volume
docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
EXIT /B 0 EXIT /B 0
:down :down
if exist "%COMPOSE_FILE_PATH%" ( if exist "%COMPOSE_FILE_PATH%" (
docker-compose -f "%COMPOSE_FILE_PATH%" down docker compose -f "%COMPOSE_FILE_PATH%" down
) )
EXIT /B 0 EXIT /B 0
:build :build
call %MVN_EXEC% clean package call %MVN_EXEC% clean package
EXIT /B 0 EXIT /B 0
:tail :tail
docker-compose -f "%COMPOSE_FILE_PATH%" logs -f docker compose -f "%COMPOSE_FILE_PATH%" logs -f
EXIT /B 0 EXIT /B 0
:tail_all :tail_all
docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all" docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
EXIT /B 0 EXIT /B 0
:prepare_test :prepare_test
call %MVN_EXEC% verify -DskipTests=true call %MVN_EXEC% verify -DskipTests=true
@@ -13,12 +13,12 @@ start() {
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume docker volume create ${rootArtifactId}-ass-volume
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
} }
down() { down() {
if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
fi fi
} }
@@ -33,11 +33,11 @@ build() {
} }
tail() { tail() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
} }
tail_all() { tail_all() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all" docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
} }
prepare_test() { prepare_test() {
@@ -55,29 +55,29 @@ EXIT /B %ERRORLEVEL%
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume docker volume create ${rootArtifactId}-ass-volume
docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
EXIT /B 0 EXIT /B 0
:start_share :start_share
docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
EXIT /B 0 EXIT /B 0
:down :down
if exist "%COMPOSE_FILE_PATH%" ( if exist "%COMPOSE_FILE_PATH%" (
docker-compose -f "%COMPOSE_FILE_PATH%" down docker compose -f "%COMPOSE_FILE_PATH%" down
) )
EXIT /B 0 EXIT /B 0
:build :build
call %MVN_EXEC% clean package call %MVN_EXEC% clean package
EXIT /B 0 EXIT /B 0
:build_share :build_share
docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
call %MVN_EXEC% clean package call %MVN_EXEC% clean package
EXIT /B 0 EXIT /B 0
:tail :tail
docker-compose -f "%COMPOSE_FILE_PATH%" logs -f docker compose -f "%COMPOSE_FILE_PATH%" logs -f
EXIT /B 0 EXIT /B 0
:tail_all :tail_all
docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all" docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
EXIT /B 0 EXIT /B 0
:purge :purge
docker volume rm -f ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-acs-volume
@@ -13,16 +13,16 @@ start() {
docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-acs-volume
docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-db-volume
docker volume create ${rootArtifactId}-ass-volume docker volume create ${rootArtifactId}-ass-volume
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
} }
start_share() { start_share() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
} }
down() { down() {
if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
fi fi
} }
@@ -37,17 +37,17 @@ build() {
} }
build_share() { build_share() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
${symbol_dollar}MVN_EXEC clean package ${symbol_dollar}MVN_EXEC clean package
} }
tail() { tail() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
} }
tail_all() { tail_all() {
docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all" docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
} }
case "${symbol_dollar}1" in case "${symbol_dollar}1" in
+2 -2
View File
@@ -82,8 +82,8 @@ install it separately after you've installed Docker.
4. Verify the installation of Docker Compose. 4. Verify the installation of Docker Compose.
``` ```
$ docker-compose -v $ docker compose version
docker-compose version 1.22.0, build f46880f Docker Compose version v2.28.1-desktop.1
``` ```
## Generate your project from the archetypes ## Generate your project from the archetypes
+1 -1
View File
@@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>3.2.17.RELEASE</version> <version>5.3.37</version>
</dependency> </dependency>
<!-- Access to JUnit runner classes --> <!-- Access to JUnit runner classes -->
+7 -2
View File
@@ -92,7 +92,7 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId> <artifactId>plexus-archiver</artifactId>
<version>4.9.2</version> <version>4.10.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
@@ -112,7 +112,12 @@
<dependency> <dependency>
<groupId>commons-net</groupId> <groupId>commons-net</groupId>
<artifactId>commons-net</artifactId> <artifactId>commons-net</artifactId>
<version>3.6</version> <version>3.10.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.17.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>