From be75ff4ca5f579830126c6fac69256b1813cce7f Mon Sep 17 00:00:00 2001 From: ChetanT-System Date: Thu, 25 Jul 2024 11:55:00 +0530 Subject: [PATCH 1/3] - Dependabot bump jar version fix and security fix. --- CHANGELOG.md | 5 +++++ DEPENDENCIES | 24 ++++++++++++------------ modules/sde-core/pom.xml | 8 ++++---- pom.xml | 3 ++- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 751e5fe48..2832c94fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Updated changelog and dependency file. - Dependencies jar versions updated. +### Fixed +- Dependabot bump jar version fixed. +- Trivy high security issue fixed for CVE-2024-24750. + + ## [2.4.1] - 2024-05-24 ### Added diff --git a/DEPENDENCIES b/DEPENDENCIES index dfe67c39f..09af70284 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -11,9 +11,9 @@ maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.4 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.15.4, Apache-2.0, approved, #15219 maven/mavencentral/com.fasterxml/classmate/1.6.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.ben-manes.caffeine/caffeine/3.1.8, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.github.docker-java/docker-java-api/3.3.6, Apache-2.0, approved, #10346 -maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.3.6, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #15251 -maven/mavencentral/com.github.docker-java/docker-java-transport/3.3.6, Apache-2.0, approved, #7942 +maven/mavencentral/com.github.docker-java/docker-java-api/3.4.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.4.0, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #15745 +maven/mavencentral/com.github.docker-java/docker-java-transport/3.4.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0, approved, CQ21949 maven/mavencentral/com.google.code.gson/gson/2.10.1, Apache-2.0, approved, #6159 maven/mavencentral/com.google.code.gson/gson/2.11.0, Apache-2.0, approved, #14820 @@ -64,9 +64,9 @@ maven/mavencentral/org.apache.commons/commons-lang3/3.13.0, Apache-2.0, approved maven/mavencentral/org.apache.commons/commons-text/1.12.0, Apache-2.0, approved, #14414 maven/mavencentral/org.apache.logging.log4j/log4j-api/2.21.1, Apache-2.0 AND (Apache-2.0 AND LGPL-2.0-or-later), approved, #11079 maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.21.1, Apache-2.0, approved, #15262 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.20, Apache-2.0 AND (EPL-2.0 OR (GPL-2.0 WITH Classpath-exception-2.0)) AND CDDL-1.0 AND (CDDL-1.1 OR (GPL-2.0-only WITH Classpath-exception-2.0)) AND EPL-2.0, approved, #15195 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.20, Apache-2.0, approved, #6997 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.20, Apache-2.0, approved, #7920 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.25, Apache-2.0 AND (EPL-2.0 OR (GPL-2.0 WITH Classpath-exception-2.0)) AND CDDL-1.0 AND (CDDL-1.1 OR (GPL-2.0-only WITH Classpath-exception-2.0)) AND EPL-2.0, approved, #15195 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.25, Apache-2.0, approved, #6997 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.25, Apache-2.0, approved, #7920 maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined maven/mavencentral/org.aspectj/aspectjweaver/1.9.22, Apache-2.0 AND BSD-3-Clause AND EPL-1.0 AND BSD-3-Clause AND Apache-1.1, approved, #15252 maven/mavencentral/org.assertj/assertj-core/3.24.2, Apache-2.0, approved, #6161 @@ -74,7 +74,7 @@ maven/mavencentral/org.awaitility/awaitility/4.2.1, Apache-2.0, approved, #14178 maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.78.1, MIT AND CC0-1.0, approved, #14433 maven/mavencentral/org.checkerframework/checker-qual/3.37.0, MIT, approved, clearlydefined maven/mavencentral/org.eclipse.angus/angus-activation/2.0.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.angus -maven/mavencentral/org.eclipse.persistence/eclipselink/4.0.3, EPL-2.0 OR BSD-3-Clause, approved, ee4j.eclipselink +maven/mavencentral/org.eclipse.persistence/eclipselink/4.0.4, EPL-2.0 OR BSD-3-Clause, approved, ee4j.eclipselink maven/mavencentral/org.eclipse.tractusx/batch/0.0.1, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx/bpn-discovery/0.0.1, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx/digital-twins/0.0.1, Apache-2.0, approved, automotive.tractusx @@ -171,11 +171,11 @@ maven/mavencentral/org.springframework/spring-test/6.1.6, Apache-2.0, approved, maven/mavencentral/org.springframework/spring-tx/6.1.6, Apache-2.0, approved, #15229 maven/mavencentral/org.springframework/spring-web/6.1.6, Apache-2.0, approved, #15188 maven/mavencentral/org.springframework/spring-webmvc/6.1.6, Apache-2.0, approved, #15182 -maven/mavencentral/org.testcontainers/database-commons/1.19.8, Apache-2.0, approved, #10345 -maven/mavencentral/org.testcontainers/jdbc/1.19.8, Apache-2.0, approved, #10348 -maven/mavencentral/org.testcontainers/junit-jupiter/1.19.8, MIT, approved, #10344 -maven/mavencentral/org.testcontainers/postgresql/1.19.8, MIT, approved, #10350 -maven/mavencentral/org.testcontainers/testcontainers/1.19.8, MIT, approved, #15203 +maven/mavencentral/org.testcontainers/database-commons/1.20.0, MIT, approved, clearlydefined +maven/mavencentral/org.testcontainers/jdbc/1.20.0, MIT, approved, clearlydefined +maven/mavencentral/org.testcontainers/junit-jupiter/1.20.0, MIT, approved, clearlydefined +maven/mavencentral/org.testcontainers/postgresql/1.20.0, MIT, approved, clearlydefined +maven/mavencentral/org.testcontainers/testcontainers/1.20.0, None, restricted, #15747 maven/mavencentral/org.webjars/swagger-ui/5.17.14, Apache-2.0 AND MIT, approved, #15701 maven/mavencentral/org.xmlunit/xmlunit-core/2.9.1, Apache-2.0, approved, #6272 maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232 diff --git a/modules/sde-core/pom.xml b/modules/sde-core/pom.xml index bd9a33951..10273ec8a 100644 --- a/modules/sde-core/pom.xml +++ b/modules/sde-core/pom.xml @@ -44,7 +44,7 @@ org.eclipse.persistence eclipselink - 4.0.3 + 4.0.4 jakarta.persistence @@ -202,19 +202,19 @@ org.testcontainers testcontainers - 1.19.8 + 1.20.0 test org.testcontainers junit-jupiter - 1.19.8 + 1.20.0 test org.testcontainers postgresql - 1.19.8 + 1.20.0 test diff --git a/pom.xml b/pom.xml index 0d1528a26..45a82180a 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ 2023.0.1 1.5.5.Final 1.5.5.Final + 10.1.25 @@ -188,7 +189,7 @@ org.testcontainers testcontainers-bom - 1.19.8 + 1.20.0 pom import From a41afffb2575224b9190cad530b73e8d5fe8937d Mon Sep 17 00:00:00 2001 From: ChetanT-System Date: Thu, 25 Jul 2024 12:00:43 +0530 Subject: [PATCH 2/3] - changelog file updated --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2832c94fe..6608f6fde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Fixed - Dependabot bump jar version fixed. -- Trivy high security issue fixed for CVE-2024-24750. +- Trivy high security issue fixed for CVE-2024-34750. ## [2.4.1] - 2024-05-24 From 8c07bb6b517cafc2d82ef4a847bbf58e954e9e3a Mon Sep 17 00:00:00 2001 From: ChetanT-System Date: Tue, 30 Jul 2024 17:10:51 +0530 Subject: [PATCH 3/3] - Dependency file updated --- DEPENDENCIES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 09af70284..ef1538368 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -175,7 +175,7 @@ maven/mavencentral/org.testcontainers/database-commons/1.20.0, MIT, approved, cl maven/mavencentral/org.testcontainers/jdbc/1.20.0, MIT, approved, clearlydefined maven/mavencentral/org.testcontainers/junit-jupiter/1.20.0, MIT, approved, clearlydefined maven/mavencentral/org.testcontainers/postgresql/1.20.0, MIT, approved, clearlydefined -maven/mavencentral/org.testcontainers/testcontainers/1.20.0, None, restricted, #15747 +maven/mavencentral/org.testcontainers/testcontainers/1.20.0, MIT, approved, #15747 maven/mavencentral/org.webjars/swagger-ui/5.17.14, Apache-2.0 AND MIT, approved, #15701 maven/mavencentral/org.xmlunit/xmlunit-core/2.9.1, Apache-2.0, approved, #6272 maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232