From 8e541bc4e55dbcead988f931d415215109ab5a4d Mon Sep 17 00:00:00 2001 From: YukiInu Date: Tue, 10 Jun 2025 13:18:35 +0200 Subject: [PATCH 1/3] updating dependencies --- CHANGELOG.md | 18 +++++++++++ jaxrs-jwtauth/pom.xml | 4 +-- jaxrs-swagger/pom.xml | 2 +- jaxrs/pom.xml | 4 +-- jpa/pom.xml | 2 +- .../dvalin/mongo/config/MongoDBConfig.java | 2 +- .../java/de/taimos/dvalin/mongo/BaseTest.java | 2 +- .../java/de/taimos/dvalin/mongo/LinkTest.java | 2 +- .../dvalin/mongo/config/MongoDBConfig.java | 2 +- .../java/de/taimos/dvalin/mongo/LinkTest.java | 2 +- .../dvalin/mongo/MongoAuditedDAOTest.java | 2 +- .../dvalin/mongo/MongoDataAccessTest.java | 2 +- pom.xml | 30 +++++++++---------- 13 files changed, 46 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dff97578..1fefea64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,22 @@ # current master +* Update dependencies + * AWS 1.12.772 + * Apache CXF 3.5.11 + * Bouncycastle Provider 1.81 + * Guava 33.4.2-jre + * Jetty 9.4.57.v20241219 + * Joda-Time 2.14.0 + * JSON Small and Fast Parser 2.5.2 + * Junit 5.11.4 + * Liquibase 4.32.0 + * Log4J 2.24.3 + * Mongo Java Driver 4.11.5 + * Mongock 5.5.1 + * Nimbus JOSE+JWT 10.3 + * Swagger 2.2.31 + + +# 1.37 * Major bug in interconnect core: DaemonScanner causes IllegalArgumentException due to wrong path of TimeoutException # 1.36 diff --git a/jaxrs-jwtauth/pom.xml b/jaxrs-jwtauth/pom.xml index d62b91eb..302d25b8 100644 --- a/jaxrs-jwtauth/pom.xml +++ b/jaxrs-jwtauth/pom.xml @@ -20,7 +20,7 @@ com.nimbusds nimbus-jose-jwt - 9.41 + 10.3 @@ -33,7 +33,7 @@ net.minidev json-smart - 2.5.1 + 2.5.2 compile diff --git a/jaxrs-swagger/pom.xml b/jaxrs-swagger/pom.xml index 265fd3fd..1f454ca8 100644 --- a/jaxrs-swagger/pom.xml +++ b/jaxrs-swagger/pom.xml @@ -24,7 +24,7 @@ io.swagger.core.v3 swagger-jaxrs2 - 2.2.22 + 2.2.31 diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml index 2f136f09..72850c03 100644 --- a/jaxrs/pom.xml +++ b/jaxrs/pom.xml @@ -25,13 +25,13 @@ org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.81 io.swagger.core.v3 swagger-jaxrs2 - 2.2.22 + 2.2.31 diff --git a/jpa/pom.xml b/jpa/pom.xml index e53aa24c..e57546ea 100644 --- a/jpa/pom.xml +++ b/jpa/pom.xml @@ -34,7 +34,7 @@ org.liquibase liquibase-core - 4.28.0 + 4.32.0 com.mattbertolini diff --git a/mongodb-legacy/src/main/java/de/taimos/dvalin/mongo/config/MongoDBConfig.java b/mongodb-legacy/src/main/java/de/taimos/dvalin/mongo/config/MongoDBConfig.java index 116b0eea..cb627eff 100644 --- a/mongodb-legacy/src/main/java/de/taimos/dvalin/mongo/config/MongoDBConfig.java +++ b/mongodb-legacy/src/main/java/de/taimos/dvalin/mongo/config/MongoDBConfig.java @@ -65,7 +65,7 @@ public RunnerStandaloneBuilder mongockRunner(com.mongodb.client.MongoClient mong driver.setReadPreference(ReadPreference.primary()); driver.disableTransaction(); - RunnerStandaloneBuilder runnerStandaloneBuilder = MongockStandalone.builder().setDriver(driver).setTransactionEnabled(false); + RunnerStandaloneBuilder runnerStandaloneBuilder = MongockStandalone.builder().setDriver(driver).setTransactional(false); if (this.basePackage == null || this.basePackage.isEmpty()){ throw new RuntimeException("LegacyMigration basePackage must be set!"); } diff --git a/mongodb-legacy/src/test/java/de/taimos/dvalin/mongo/BaseTest.java b/mongodb-legacy/src/test/java/de/taimos/dvalin/mongo/BaseTest.java index 6403d19a..0add09a2 100644 --- a/mongodb-legacy/src/test/java/de/taimos/dvalin/mongo/BaseTest.java +++ b/mongodb-legacy/src/test/java/de/taimos/dvalin/mongo/BaseTest.java @@ -68,7 +68,7 @@ public static void init() { MongoSync4Driver driver = MongoSync4Driver.withDefaultLock(ABaseTest.mongo, ABaseTest.dbName); driver.disableTransaction(); MongockStandalone.builder().setDriver(driver).addMigrationScanPackage("de.taimos.dvalin.mongo.changelog") - .setTransactionEnabled(false).setEnabled(true).buildRunner().execute(); + .setTransactional(false).setEnabled(true).buildRunner().execute(); BaseTest.dao.init(); } catch (Exception e) { System.out.println("Initialization failure"); diff --git a/mongodb-legacy/src/test/java/de/taimos/dvalin/mongo/LinkTest.java b/mongodb-legacy/src/test/java/de/taimos/dvalin/mongo/LinkTest.java index 737f44c2..1df99668 100644 --- a/mongodb-legacy/src/test/java/de/taimos/dvalin/mongo/LinkTest.java +++ b/mongodb-legacy/src/test/java/de/taimos/dvalin/mongo/LinkTest.java @@ -61,7 +61,7 @@ public static void init() { MongoSync4Driver driver = MongoSync4Driver.withDefaultLock(ABaseTest.mongo, ABaseTest.dbName); driver.disableTransaction(); - MongockStandalone.builder().setDriver(driver).addMigrationScanPackage("de.taimos.dvalin.mongo.changelog").setTransactionEnabled(false).setEnabled(true).buildRunner().execute(); + MongockStandalone.builder().setDriver(driver).addMigrationScanPackage("de.taimos.dvalin.mongo.changelog").setTransactional(false).setEnabled(true).buildRunner().execute(); LinkTest.dao.init(); LinkTest.ldao.init(); } catch (Exception e) { diff --git a/mongodb/src/main/java/de/taimos/dvalin/mongo/config/MongoDBConfig.java b/mongodb/src/main/java/de/taimos/dvalin/mongo/config/MongoDBConfig.java index 7212a6f2..3db2f578 100644 --- a/mongodb/src/main/java/de/taimos/dvalin/mongo/config/MongoDBConfig.java +++ b/mongodb/src/main/java/de/taimos/dvalin/mongo/config/MongoDBConfig.java @@ -96,7 +96,7 @@ public RunnerStandaloneBuilder mongockRunner(MongoClient mongoClient, MongoDatab RunnerStandaloneBuilder runnerStandaloneBuilder = MongockStandalone.builder() // .setDriver(this.createMongoSyncDriver(mongoClient)) // .setEnabled(this.mongockEnabled) // - .setTransactionEnabled(false) // + .setTransactional(false) // .addMigrationScanPackage(this.basePackage) .setLegacyMigration(this.mongockLegacyMigrationEnabled ? this.getLegacyMigration() : null) // .addDependency(mongoDatabase); diff --git a/mongodb/src/test/java/de/taimos/dvalin/mongo/LinkTest.java b/mongodb/src/test/java/de/taimos/dvalin/mongo/LinkTest.java index 4e071017..e67e6e3a 100644 --- a/mongodb/src/test/java/de/taimos/dvalin/mongo/LinkTest.java +++ b/mongodb/src/test/java/de/taimos/dvalin/mongo/LinkTest.java @@ -64,7 +64,7 @@ public static void init() { MongoSync4Driver driver = MongoSync4Driver.withDefaultLock(ABaseTest.mongo, ABaseTest.dbName); driver.disableTransaction(); - MongockStandalone.builder().setDriver(driver).addMigrationScanPackage("de.taimos.dvalin.mongo.changelog").setTransactionEnabled(false).setEnabled(true).buildRunner().execute(); + MongockStandalone.builder().setDriver(driver).addMigrationScanPackage("de.taimos.dvalin.mongo.changelog").setTransactional(false).setEnabled(true).buildRunner().execute(); LinkTest.dao.init(); LinkTest.ldao.init(); } catch (Exception e) { diff --git a/mongodb/src/test/java/de/taimos/dvalin/mongo/MongoAuditedDAOTest.java b/mongodb/src/test/java/de/taimos/dvalin/mongo/MongoAuditedDAOTest.java index 1710a556..666b29f3 100644 --- a/mongodb/src/test/java/de/taimos/dvalin/mongo/MongoAuditedDAOTest.java +++ b/mongodb/src/test/java/de/taimos/dvalin/mongo/MongoAuditedDAOTest.java @@ -57,7 +57,7 @@ static void init() { MongoSync4Driver driver = MongoSync4Driver.withDefaultLock(ABaseTest.mongo, ABaseTest.dbName); driver.disableTransaction(); MongockStandalone.builder().setDriver(driver).addMigrationScanPackage("de.taimos.dvalin.mongo.changelog") - .setTransactionEnabled(false).setEnabled(true).buildRunner().execute(); + .setTransactional(false).setEnabled(true).buildRunner().execute(); MongoAuditedDAOTest.dao.init(); } catch (Exception e) { Assertions.fail(Arrays.toString(e.getStackTrace())); diff --git a/mongodb/src/test/java/de/taimos/dvalin/mongo/MongoDataAccessTest.java b/mongodb/src/test/java/de/taimos/dvalin/mongo/MongoDataAccessTest.java index 06205480..7dcd6350 100644 --- a/mongodb/src/test/java/de/taimos/dvalin/mongo/MongoDataAccessTest.java +++ b/mongodb/src/test/java/de/taimos/dvalin/mongo/MongoDataAccessTest.java @@ -58,7 +58,7 @@ static void init() { MongoSync4Driver driver = MongoSync4Driver.withDefaultLock(ABaseTest.mongo, ABaseTest.dbName); driver.disableTransaction(); MongockStandalone.builder().setDriver(driver).addMigrationScanPackage("de.taimos.dvalin.mongo.changelog") - .setTransactionEnabled(false).setEnabled(true).buildRunner().execute(); + .setTransactional(false).setEnabled(true).buildRunner().execute(); MongoDataAccessTest.dao.init(); } catch (Exception e) { Assertions.fail(Arrays.toString(e.getStackTrace())); diff --git a/pom.xml b/pom.xml index 54da56a3..1bfe38cd 100644 --- a/pom.xml +++ b/pom.xml @@ -54,25 +54,25 @@ UTF-8 5.3.39 - 2.17.2 - 2.12.7 - 1.7.36 - 2.23.1 - 5.10.3 + 5.16.8 1.12.772 - 5.16.7 - 3.5.9 - 9.4.56.v20240826 - 33.3.0-jre + 2.15.1 + 3.5.11 + 33.4.2-jre 5.6.14.Final 2.2 - 2.3 - 2.15.1 - 4.11.4 - 5.4.4 + 2.17.2 + 9.4.57.v20241219 + 2.14.0 + 5.11.4 + 2.24.3 + 4.11.0 + 4.11.5 + 5.5.1 1.43.0 + 1.7.36 + 2.3 2.0.4 - 4.11.0 scm:git:https://github.com/taimos/dvalin.git @@ -545,7 +545,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.5.3 org.apache.maven.plugins maven-gpg-plugin From e79053ea68b20be09af71b9eb917814d8eb1672c Mon Sep 17 00:00:00 2001 From: YukiInu Date: Tue, 10 Jun 2025 14:45:46 +0200 Subject: [PATCH 2/3] updating changelog --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fefea64..ac498bc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # current master * Update dependencies - * AWS 1.12.772 + * ActiveMQ 5.16.8 * Apache CXF 3.5.11 + * AWS 1.12.772 * Bouncycastle Provider 1.81 * Guava 33.4.2-jre * Jetty 9.4.57.v20241219 @@ -14,7 +15,8 @@ * Mongock 5.5.1 * Nimbus JOSE+JWT 10.3 * Swagger 2.2.31 - +* Fixing DaemonExceptionMapper +* Fixed vulnerabilities: CVE-2024-13009(Jetty), CVE-2025-23184(Apache CXF), CVE-2024-57699 (Json-smart),CVE-2025-27533 (ActiveMQ) # 1.37 * Major bug in interconnect core: DaemonScanner causes IllegalArgumentException due to wrong path of TimeoutException From bb006be96af1ae077e5fbdd9af6d04cfc86942f5 Mon Sep 17 00:00:00 2001 From: YukiInu Date: Mon, 10 Nov 2025 16:11:33 +0100 Subject: [PATCH 3/3] updating dependencies --- CHANGELOG.md | 9 +++++---- jaxrs-swagger/pom.xml | 2 +- jaxrs/pom.xml | 2 +- pom.xml | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac498bc8..1df05365 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,19 +2,20 @@ * Update dependencies * ActiveMQ 5.16.8 * Apache CXF 3.5.11 - * AWS 1.12.772 + * AWS 1.12.793 * Bouncycastle Provider 1.81 * Guava 33.4.2-jre - * Jetty 9.4.57.v20241219 + * Jetty 9.4.58.v20250814 * Joda-Time 2.14.0 * JSON Small and Fast Parser 2.5.2 * Junit 5.11.4 * Liquibase 4.32.0 - * Log4J 2.24.3 + * Log4J 2.25.2 * Mongo Java Driver 4.11.5 * Mongock 5.5.1 * Nimbus JOSE+JWT 10.3 - * Swagger 2.2.31 + * Swagger 2.2.40 + * Velocity Engine 2.4.1 * Fixing DaemonExceptionMapper * Fixed vulnerabilities: CVE-2024-13009(Jetty), CVE-2025-23184(Apache CXF), CVE-2024-57699 (Json-smart),CVE-2025-27533 (ActiveMQ) diff --git a/jaxrs-swagger/pom.xml b/jaxrs-swagger/pom.xml index 1f454ca8..3847d198 100644 --- a/jaxrs-swagger/pom.xml +++ b/jaxrs-swagger/pom.xml @@ -24,7 +24,7 @@ io.swagger.core.v3 swagger-jaxrs2 - 2.2.31 + 2.2.40 diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml index 72850c03..47eca272 100644 --- a/jaxrs/pom.xml +++ b/jaxrs/pom.xml @@ -31,7 +31,7 @@ io.swagger.core.v3 swagger-jaxrs2 - 2.2.31 + 2.2.40 diff --git a/pom.xml b/pom.xml index 1bfe38cd..5a85a1d5 100644 --- a/pom.xml +++ b/pom.xml @@ -55,23 +55,23 @@ UTF-8 5.3.39 5.16.8 - 1.12.772 + 1.12.793 2.15.1 3.5.11 33.4.2-jre 5.6.14.Final 2.2 2.17.2 - 9.4.57.v20241219 + 9.4.58.v20250814 2.14.0 5.11.4 - 2.24.3 + 2.25.2 4.11.0 4.11.5 5.5.1 1.43.0 1.7.36 - 2.3 + 2.4.1 2.0.4