From 27bff232c6e22e93f7de1cd24e7195f8a5a92969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Tue, 15 Oct 2024 12:28:02 +0200 Subject: [PATCH 01/23] build: consolidate Jackson dependency to 2.14.1 fixes duplicates: * jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 * com.fasterxml.jackson.core:jackson-databind:2.14.1 * com.fasterxml.jackson.core:jackson-annotations:2.14.1 * com.fasterxml.jackson.core:jackson-core:2.14.1 --- carapace-server/pom.xml | 3 --- pom.xml | 9 ++++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index dfd7ced41..cafa7d27f 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -227,17 +227,14 @@ com.fasterxml.jackson.core jackson-databind - ${libs.jackson} com.fasterxml.jackson.core jackson-core - ${libs.jackson} com.fasterxml.jackson.core jackson-annotations - ${libs.jackson} javax.xml.bind diff --git a/pom.xml b/pom.xml index 4e98bdd9e..df0d7ae2d 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 9.4.44.v20210927 2.35 - 2.13.1 + 2.14.1 2.3.1 3.0.2 1.2.0 @@ -160,6 +160,13 @@ pom import + + com.fasterxml.jackson + jackson-bom + ${libs.jackson} + import + pom + org.hamcrest hamcrest From 43b5f1a07fa4c89c58a3ac20fe98ade18f295756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 12:58:52 +0200 Subject: [PATCH 02/23] build: remove unwanted dependencies to annotations removes dependencies to: * org.checkerframework:checker-qual * com.google.errorprone:error_prone_annotations * com.google.code.findbugs:jsr305 --- carapace-server/pom.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index cafa7d27f..901c4671d 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -71,6 +71,16 @@ com.github.ben-manes.caffeine caffeine ${libs.caffeine} + + + org.checkerframework + checker-qual + + + com.google.errorprone + error_prone_annotations + + org.antlr @@ -156,6 +166,14 @@ org.bouncycastle * + + org.checkerframework + checker-qual + + + com.google.errorprone + error_prone_annotations + @@ -266,6 +284,20 @@ com.google.guava guava ${libs.guava} + + + org.checkerframework + checker-qual + + + com.google.errorprone + error_prone_annotations + + + com.google.code.findbugs + jsr305 + + org.projectlombok From 2bdb075f479f61881d9f98abecc700269d9643e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 13:22:36 +0200 Subject: [PATCH 03/23] build: consolidate SLF4J dependency to 1.7.35 we had to upgrade ZooKeeper to 3.7.1+ to drop log4j dependency --- carapace-server/pom.xml | 9 --------- pom.xml | 12 ++++++++++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index 901c4671d..89cf0cac5 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -94,14 +94,6 @@ zookeeper ${libs.zookkeeper} - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - commons-cli commons-cli @@ -272,7 +264,6 @@ org.slf4j slf4j-api - ${libs.slf4j} org.slf4j diff --git a/pom.xml b/pom.xml index df0d7ae2d..8213cefc7 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ 3.0.5 4.3.1 - 3.7.0 + 3.7.2 5.2.0 0.14.1 4.14.4 @@ -117,7 +117,7 @@ 2.3.1 3.0.2 1.2.0 - 1.7.33 + 1.7.35 31.1-jre 1.18.32 4.5.3 @@ -153,6 +153,7 @@ + io.projectreactor reactor-bom @@ -167,6 +168,13 @@ import pom + + + org.slf4j + slf4j-api + ${libs.slf4j} + + org.hamcrest hamcrest From 2d140be04958cb9d47de8ab9afbcab9397019a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 13:32:18 +0200 Subject: [PATCH 04/23] build: consolidate ZooKeeper dependency to 3.8.4 * org.apache.zookeeper:zookeeper * commons-io:commons-io * org.apache.zookeeper:zookeeper-jute --- carapace-server/pom.xml | 29 ++++------------------------- pom.xml | 17 ++++++++++++++++- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index 89cf0cac5..947f4bc33 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -88,26 +88,6 @@ ${libs.antlr} compile - - - org.apache.zookeeper - zookeeper - ${libs.zookkeeper} - - - commons-cli - commons-cli - - - org.apache.yetus - * - - - io.netty - * - - - org.apache.curator curator-recipes @@ -178,11 +158,6 @@ commons-pool2 ${libs.commons-pool2} - - commons-io - commons-io - ${libs.commons-io} - commons-net commons-net @@ -384,6 +359,10 @@ and the old-fashioned JUnit (in particular a version which is strictly not 4.12 and 4.13) messes up with Intellij IDEA test run of whole project. --> + + ch.qos.logback + * + org.junit.jupiter * diff --git a/pom.xml b/pom.xml index 8213cefc7..eb4f6725f 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ 3.0.5 4.3.1 - 3.7.2 + 3.8.4 5.2.0 0.14.1 4.14.4 @@ -174,6 +174,21 @@ slf4j-api ${libs.slf4j} + + commons-io + commons-io + ${libs.commons-io} + + + org.apache.zookeeper + zookeeper + ${libs.zookkeeper} + + + org.apache.zookeeper + zookeeper-jute + ${libs.zookkeeper} + org.hamcrest From dc889046fda40f17805a0f6aae22afc0720aa820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Tue, 15 Oct 2024 12:27:16 +0200 Subject: [PATCH 05/23] build: consolidate Jetty dependency to 9.4.56.v20240826 --- carapace-server/pom.xml | 4 ---- pom.xml | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index 947f4bc33..7409894b8 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -166,22 +166,18 @@ org.eclipse.jetty jetty-server - ${libs.jetty} org.eclipse.jetty jetty-webapp - ${libs.jetty} org.eclipse.jetty jetty-servlet - ${libs.jetty} org.eclipse.jetty jetty-util - ${libs.jetty} org.glassfish.jersey.core diff --git a/pom.xml b/pom.xml index eb4f6725f..63aeb5a15 100644 --- a/pom.xml +++ b/pom.xml @@ -161,6 +161,13 @@ pom import + + org.eclipse.jetty + jetty-bom + ${libs.jetty} + pom + import + com.fasterxml.jackson jackson-bom From 59930fe551cd86d1bac04b30ab145b59270770c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Tue, 15 Oct 2024 14:13:18 +0200 Subject: [PATCH 06/23] build: consolidate Netty dependency through BOM --- carapace-server/pom.xml | 18 ------------------ pom.xml | 9 ++++++++- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index 7409894b8..27abea6a5 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -26,7 +26,6 @@ io.netty netty-tcnative-boringssl-static - ${libs.netty.ssl} org.shredzone.acme4j @@ -60,12 +59,6 @@ software.amazon.awssdk route53 ${libs.awssdk} - - - io.netty - * - - com.github.ben-manes.caffeine @@ -112,13 +105,6 @@ org.apache.bookkeeper.stats prometheus-metrics-provider ${libs.prometheus.metrics} - jar - - - io.netty - * - - io.micrometer @@ -130,10 +116,6 @@ herddb-jdbc ${libs.herddb} - - io.netty - * - org.bouncycastle * diff --git a/pom.xml b/pom.xml index 63aeb5a15..522a6c07d 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 2.4 2022.0.7 - 2.0.61.Final + 4.1.92.Final 2.12 1.70 2.17.113 @@ -161,6 +161,13 @@ pom import + + io.netty + netty-bom + ${libs.netty} + import + pom + org.eclipse.jetty jetty-bom From 86ac0e124f97e8f2d1334b3e78868af7ea6b6bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Tue, 15 Oct 2024 14:34:44 +0200 Subject: [PATCH 07/23] build: consolidate BouncyCastle dependency --- carapace-server/pom.xml | 17 +---------------- carapace-ui/pom.xml | 1 - pom.xml | 10 ++++++++++ 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index 27abea6a5..61b019901 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -31,29 +31,15 @@ org.shredzone.acme4j acme4j-client ${libs.acme4j} - - - org.bouncycastle - * - - org.shredzone.acme4j acme4j-utils ${libs.acme4j} - - - org.bouncycastle - * - - org.bouncycastle bcpkix-jdk15on - ${libs.bouncycastle} - jar software.amazon.awssdk @@ -118,7 +104,7 @@ org.bouncycastle - * + bc-fips org.checkerframework @@ -287,7 +273,6 @@ pl.pragmatists JUnitParams ${libs.junitparams} - jar test diff --git a/carapace-ui/pom.xml b/carapace-ui/pom.xml index cf637e3ef..0b58512b6 100644 --- a/carapace-ui/pom.xml +++ b/carapace-ui/pom.xml @@ -69,7 +69,6 @@ javax javaee-endorsed-api 7.0 - jar diff --git a/pom.xml b/pom.xml index 522a6c07d..955ac78d2 100644 --- a/pom.xml +++ b/pom.xml @@ -203,6 +203,16 @@ zookeeper-jute ${libs.zookkeeper} + + org.bouncycastle + bcpkix-jdk15on + ${libs.bouncycastle} + + + org.bouncycastle + bcprov-jdk15on + ${libs.bouncycastle} + org.hamcrest From 6d14b31d2b2458467f8554fed753f600329444f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Tue, 15 Oct 2024 12:50:06 +0200 Subject: [PATCH 08/23] build: add maven-enforcer-plugin --- pom.xml | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 955ac78d2..e49dccb90 100644 --- a/pom.xml +++ b/pom.xml @@ -158,8 +158,8 @@ io.projectreactor reactor-bom ${libs.projectreactor} - pom import + pom io.netty @@ -172,8 +172,8 @@ org.eclipse.jetty jetty-bom ${libs.jetty} - pom import + pom com.fasterxml.jackson @@ -337,6 +337,41 @@ true + + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 + + + enforce-dependency-convergence + + enforce + + + + + + + ${project.groupId} + + + + + + com.google.errorprone + com.google.code.findbugs + org.bouncycastle:* + org.checkerframework + + + org.bouncycastle:*-jdk15on + + + + + + + From 752e56bf56ad5cc4524fde0fb3c3d5b8264e3a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 16:04:29 +0200 Subject: [PATCH 09/23] build: consolidate Protobuf dependency to 3.17.1 --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index e49dccb90..0f63837ec 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,7 @@ 31.1-jre 1.18.32 4.5.3 + 3.17.1 4.13.2 @@ -213,6 +214,11 @@ bcprov-jdk15on ${libs.bouncycastle} + + com.google.protobuf + protobuf-java + ${libs.protobuf} + org.hamcrest From 3a42f72f01491e1ed1515f3ebb04a9230fd2898a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 16:04:55 +0200 Subject: [PATCH 10/23] build: consolidate Guava dependency to 31.1 --- carapace-server/pom.xml | 1 - pom.xml | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index 61b019901..a819c3ae3 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -213,7 +213,6 @@ com.google.guava guava - ${libs.guava} org.checkerframework diff --git a/pom.xml b/pom.xml index 0f63837ec..177ddbeef 100644 --- a/pom.xml +++ b/pom.xml @@ -183,6 +183,13 @@ import pom + + com.google.guava + guava-bom + ${libs.guava} + import + pom + org.slf4j From 7b1e38825fe5a35e6da5e95d6fd489ddd57da5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 16:43:52 +0200 Subject: [PATCH 11/23] build: drop unnecessary dependencies * drop javax.xml.bind:jaxb-api * drop org.glassfish.jaxb:jaxb-runtime * drop javax.activation:javax.activation-api * drop javax:javaee-web-api --- carapace-server/pom.xml | 15 --------------- carapace-ui/pom.xml | 41 ----------------------------------------- pom.xml | 3 --- 3 files changed, 59 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index a819c3ae3..badd49d81 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -185,21 +185,6 @@ com.fasterxml.jackson.core jackson-annotations - - javax.xml.bind - jaxb-api - ${libs.jaxws.jaxb-api} - - - org.glassfish.jaxb - jaxb-runtime - ${libs.jaxws.jaxb-impl} - - - javax.activation - javax.activation-api - ${libs.javaxactivation-api} - org.slf4j slf4j-api diff --git a/carapace-ui/pom.xml b/carapace-ui/pom.xml index 0b58512b6..5835835bb 100644 --- a/carapace-ui/pom.xml +++ b/carapace-ui/pom.xml @@ -23,27 +23,9 @@ src/main/webapp - - - javax - javaee-web-api - 7.0 - provided - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - ${endorsed.dir} - - - org.apache.maven.plugins maven-war-plugin @@ -52,29 +34,6 @@ false - - org.apache.maven.plugins - maven-dependency-plugin - - - validate - - copy - - - ${endorsed.dir} - true - - - javax - javaee-endorsed-api - 7.0 - - - - - - diff --git a/pom.xml b/pom.xml index 177ddbeef..d931536bf 100644 --- a/pom.xml +++ b/pom.xml @@ -114,9 +114,6 @@ 9.4.44.v20210927 2.35 2.14.1 - 2.3.1 - 3.0.2 - 1.2.0 1.7.35 31.1-jre 1.18.32 From 83bb5dd0e52893912c16ac9842b1a9153ccbba2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Tue, 15 Oct 2024 15:22:20 +0200 Subject: [PATCH 12/23] build: add Jersey BOM --- carapace-server/pom.xml | 21 +++++++++++---------- pom.xml | 7 +++++++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index badd49d81..a904bfe28 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -51,6 +51,7 @@ caffeine ${libs.caffeine} + org.checkerframework checker-qual @@ -65,7 +66,6 @@ org.antlr ST4 ${libs.antlr} - compile org.apache.curator @@ -102,10 +102,7 @@ herddb-jdbc ${libs.herddb} - - org.bouncycastle - bc-fips - + org.checkerframework checker-qual @@ -114,6 +111,11 @@ com.google.errorprone error_prone_annotations + + + org.bouncycastle + bc-fips + @@ -150,27 +152,22 @@ org.glassfish.jersey.core jersey-server - ${libs.jersey} org.glassfish.jersey.inject jersey-hk2 - ${libs.jersey} org.glassfish.jersey.containers jersey-container-servlet - ${libs.jersey} org.glassfish.jersey.containers jersey-container-jetty-http - ${libs.jersey} org.glassfish.jersey.media jersey-media-json-jackson - ${libs.jersey} runtime @@ -199,6 +196,7 @@ com.google.guava guava + org.checkerframework checker-qual @@ -247,6 +245,7 @@ ${libs.junit} test + org.hamcrest hamcrest-core @@ -265,6 +264,7 @@ ${libs.wiremock} test + org.hamcrest hamcrest-core @@ -277,6 +277,7 @@ ${libs.powermock} test + org.hamcrest hamcrest-core diff --git a/pom.xml b/pom.xml index d931536bf..76393368a 100644 --- a/pom.xml +++ b/pom.xml @@ -173,6 +173,13 @@ import pom + + org.glassfish.jersey + jersey-bom + ${libs.jersey} + import + pom + com.fasterxml.jackson jackson-bom From 32bad9c39c8d40cf3c3548732b5c3287991d2b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Tue, 15 Oct 2024 15:16:49 +0200 Subject: [PATCH 13/23] build: consolidate Prometheus and BookKeeper dependencies --- carapace-server/pom.xml | 5 +---- pom.xml | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index a904bfe28..c2c89754b 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -75,22 +75,19 @@ io.prometheus simpleclient - ${libs.prometheus} io.prometheus simpleclient_hotspot - ${libs.prometheus} io.prometheus simpleclient_servlet - ${libs.prometheus} org.apache.bookkeeper.stats prometheus-metrics-provider - ${libs.prometheus.metrics} + ${libs.bookkeeper} io.micrometer diff --git a/pom.xml b/pom.xml index 76393368a..f4b88a7ba 100644 --- a/pom.xml +++ b/pom.xml @@ -99,10 +99,10 @@ 3.0.5 4.3.1 + 4.14.4 3.8.4 5.2.0 - 0.14.1 - 4.14.4 + 0.16.0 1.11.0 0.26.1 @@ -194,6 +194,13 @@ import pom + + io.prometheus + simpleclient_bom + ${libs.prometheus} + import + pom + org.slf4j @@ -230,6 +237,11 @@ protobuf-java ${libs.protobuf} + + org.apache.bookkeeper.stats + bookkeeper-stats-api + ${libs.bookkeeper} + org.hamcrest From 0539afdbfbe6f001590a471b35381623fc9f410f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Tue, 15 Oct 2024 14:50:03 +0200 Subject: [PATCH 14/23] build: consolidate Apache Commons dependencies --- carapace-server/pom.xml | 12 +++++------- pom.xml | 32 +++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index c2c89754b..46c2073fb 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -116,19 +116,17 @@ - org.apache.commons - commons-lang3 - ${libs.commons.lang3} + commons-codec + commons-codec + test - org.apache.commons - commons-pool2 - ${libs.commons-pool2} + commons-io + commons-io commons-net commons-net - ${libs.commons-net} org.eclipse.jetty diff --git a/pom.xml b/pom.xml index f4b88a7ba..f38c5286a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.carapaceproxy @@ -106,10 +107,11 @@ 1.11.0 0.26.1 + 1.15 3.12.0 - 2.11.1 - 2.11.0 - 3.11.0 + 1.2 + 2.11.0 + 3.11.0 9.4.44.v20210927 2.35 @@ -207,10 +209,30 @@ slf4j-api ${libs.slf4j} + + commons-codec + commons-codec + ${libs.commons.codec} + commons-io commons-io - ${libs.commons-io} + ${libs.commons.io} + + + commons-logging + commons-logging + ${libs.commons.logging} + + + commons-net + commons-net + ${libs.commons.net} + + + org.apache.commons + commons-lang3 + ${libs.commons.lang3} org.apache.zookeeper From 154e1b2f34f18f2415c2f4de251e3bd0da9fd9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 17:25:59 +0200 Subject: [PATCH 15/23] build: add maven-enforcer-plugin with many rules --- carapace-server/pom.xml | 11 +++++----- carapace-ui/pom.xml | 3 ++- pom.xml | 48 +++++++++++++++++++++++++++++++++++------ 3 files changed, 49 insertions(+), 13 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index 46c2073fb..7a7c23f8b 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -196,14 +197,14 @@ org.checkerframework checker-qual - - com.google.errorprone - error_prone_annotations - com.google.code.findbugs jsr305 + + com.google.errorprone + error_prone_annotations + diff --git a/carapace-ui/pom.xml b/carapace-ui/pom.xml index 5835835bb..c01ad4f7c 100644 --- a/carapace-ui/pom.xml +++ b/carapace-ui/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/pom.xml b/pom.xml index f38c5286a..e56bd401a 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,6 @@ 3.12.4 2.2 - 4.5.3.0 9.2 @@ -299,7 +298,7 @@ com.github.spotbugs spotbugs-maven-plugin - ${plugins.spotbugsmaven} + 4.8.6.4 Max 4096 @@ -316,7 +315,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.5.1 false false @@ -352,7 +351,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.8.0 org.codehaus.mojo @@ -362,7 +361,37 @@ org.apache.maven.plugins maven-assembly-plugin - 3.6.0 + 3.7.1 + + + org.apache.maven.plugins + maven-clean-plugin + 3.4.0 + + + org.apache.maven.plugins + maven-install-plugin + 3.1.3 + + + org.apache.maven.plugins + maven-site-plugin + 3.20.0 + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.3 + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 @@ -375,7 +404,7 @@ org.apache.maven.plugins maven-release-plugin - 3.0.1 + 3.1.1 production production @@ -401,12 +430,12 @@ + ${project.groupId} - com.google.errorprone @@ -418,6 +447,11 @@ org.bouncycastle:*-jdk15on + + + 3.9 + + From 02801b5c2742defe164ebe359436184cef547ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Tue, 15 Oct 2024 16:57:50 +0200 Subject: [PATCH 16/23] build: fix also test-scoped conflicts --- carapace-server/pom.xml | 19 +++---------------- pom.xml | 26 +++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index 7a7c23f8b..f280de5f4 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -238,15 +238,7 @@ junit junit - ${libs.junit} test - - - - org.hamcrest - hamcrest-core - - pl.pragmatists @@ -286,12 +278,6 @@ ${libs.powermock} test - - org.mockito - mockito-core - ${libs.mockito} - test - org.apache.curator curator-test @@ -304,11 +290,12 @@ messes up with Intellij IDEA test run of whole project. --> - ch.qos.logback + org.junit.jupiter * + - org.junit.jupiter + ch.qos.logback * diff --git a/pom.xml b/pom.xml index e56bd401a..814bc20f1 100644 --- a/pom.xml +++ b/pom.xml @@ -116,6 +116,7 @@ 9.4.44.v20210927 2.35 2.14.1 + 3.27.0-GA 1.7.35 31.1-jre 1.18.32 @@ -127,7 +128,7 @@ 1.1.1 2.35.0 2.0.9 - 3.12.4 + 3.0.1 2.2 9.2 @@ -269,6 +270,28 @@ hamcrest ${libs.hamcrest} + + junit + junit + ${libs.junit} + + + + org.hamcrest + hamcrest-core + + + + + org.objenesis + objenesis + ${libs.objenesis} + + + org.javassist + javassist + ${libs.javassist} + @@ -442,6 +465,7 @@ com.google.code.findbugs org.bouncycastle:* org.checkerframework + org.hamcrest:hamcrest-core org.bouncycastle:*-jdk15on From b2c024d660cea815d95b74898c66363cbebc0ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 21:34:27 +0200 Subject: [PATCH 17/23] build: add reactor-tools --- carapace-server/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index f280de5f4..0bc5416b7 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -16,6 +16,10 @@ Carapace :: Server + + io.projectreactor + reactor-tools + io.projectreactor.netty reactor-netty-core From bf91df1d34f117b323035494b7f640066b436ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 21:33:55 +0200 Subject: [PATCH 18/23] build: upgrade Netty and Reactor-Netty --- .../test/java/org/carapaceproxy/RawClientTest.java | 12 ++++++------ pom.xml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/carapace-server/src/test/java/org/carapaceproxy/RawClientTest.java b/carapace-server/src/test/java/org/carapaceproxy/RawClientTest.java index 435bfa6b7..405bd2c62 100644 --- a/carapace-server/src/test/java/org/carapaceproxy/RawClientTest.java +++ b/carapace-server/src/test/java/org/carapaceproxy/RawClientTest.java @@ -762,7 +762,7 @@ public void testClosedProxy(String scheme) throws Exception { .withHeader("Content-Type", "text/html") .withHeader("Content-Length", "it works !!".length() + "") .withBody("it works !!"))); - String s = client.executeRequest("GET " + scheme + "://yahoo.com/index.html?p1=v1&p2=https://localhost/index.html?p=1 HTTP/1.1 \r\nHost: localhost\r\n\r\n").getBodyString(); + String s = client.executeRequest("GET " + scheme + "://yahoo.com/index.html?p1=v1&p2=https://localhost/index.html?p=1 HTTP/1.1\r\nHost: localhost\r\n\r\n").getBodyString(); assertEquals("it works !!", s); s = client.get("/index.html?p1=v1&p2=https://localhost/index.html?p=1").getBodyString(); assertEquals("it works !!", s); @@ -773,7 +773,7 @@ public void testClosedProxy(String scheme) throws Exception { .withHeader("Content-Type", "text/html") .withHeader("Content-Length", "it works !!".length() + "") .withBody("it works !!"))); - s = client.executeRequest("GET " + scheme + "://yahoo.com/index.html HTTP/1.1 \r\nHost: localhost\r\n\r\n").getBodyString(); + s = client.executeRequest("GET " + scheme + "://yahoo.com/index.html HTTP/1.1\r\nHost: localhost\r\n\r\n").getBodyString(); assertEquals("it works !!", s); s = client.get("/index.html").getBodyString(); assertEquals("it works !!", s); @@ -785,11 +785,11 @@ public void testClosedProxy(String scheme) throws Exception { .withHeader("Content-Type", "text/html") .withHeader("Content-Length", "it works !!".length() + "") .withBody("it works !!"))); - s = client.executeRequest("GET " + scheme + "://yahoo.com/?p1=v1&p2=https://localhost/index.html?p=1 HTTP/1.1 \r\nHost: localhost\r\n\r\n").getBodyString(); + s = client.executeRequest("GET " + scheme + "://yahoo.com/?p1=v1&p2=https://localhost/index.html?p=1 HTTP/1.1\r\nHost: localhost\r\n\r\n").getBodyString(); assertEquals("it works !!", s); s = client.get("/?p1=v1&p2=https://localhost/index.html?p=1").getBodyString(); assertEquals("it works !!", s); - s = client.executeRequest("GET " + scheme + "://yahoo.com?p1=v1&p2=https://localhost/index.html?p=1 HTTP/1.1 \r\nHost: localhost\r\n\r\n").getBodyString(); + s = client.executeRequest("GET " + scheme + "://yahoo.com?p1=v1&p2=https://localhost/index.html?p=1 HTTP/1.1\r\nHost: localhost\r\n\r\n").getBodyString(); assertEquals("it works !!", s); s = client.get("?p1=v1&p2=https://localhost/index.html?p=1").getBodyString(); assertEquals("it works !!", s); @@ -800,11 +800,11 @@ public void testClosedProxy(String scheme) throws Exception { .withHeader("Content-Type", "text/html") .withHeader("Content-Length", "it works !!".length() + "") .withBody("it works !!"))); - s = client.executeRequest("GET " + scheme + "://yahoo.com/ HTTP/1.1 \r\nHost: localhost\r\n\r\n").getBodyString(); + s = client.executeRequest("GET " + scheme + "://yahoo.com/ HTTP/1.1\r\nHost: localhost\r\n\r\n").getBodyString(); assertEquals("it works !!", s); s = client.get("/").getBodyString(); assertEquals("it works !!", s); - s = client.executeRequest("GET " + scheme + "://yahoo.com HTTP/1.1 \r\nHost: localhost\r\n\r\n").getBodyString(); + s = client.executeRequest("GET " + scheme + "://yahoo.com HTTP/1.1\r\nHost: localhost\r\n\r\n").getBodyString(); assertEquals("it works !!", s); } } diff --git a/pom.xml b/pom.xml index 814bc20f1..8327ead38 100644 --- a/pom.xml +++ b/pom.xml @@ -92,8 +92,8 @@ ${toolchain.java.version} 2.4 - 2022.0.7 - 4.1.92.Final + 2023.0.11 + 4.1.114.Final 2.12 1.70 2.17.113 From 362db7e0bba33147f0f2dcb404b517fe1b0d4cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 22:08:18 +0200 Subject: [PATCH 19/23] build: upgrade Guava --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8327ead38..730f5e361 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ 2.14.1 3.27.0-GA 1.7.35 - 31.1-jre + 33.3.1-jre 1.18.32 4.5.3 3.17.1 From 7fff4b2a00363bbb69b0e2caf7701ed30db502b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 22:22:36 +0200 Subject: [PATCH 20/23] build: upgrade BouncyCastle --- carapace-server/pom.xml | 18 +++++++++++++++++- pom.xml | 8 ++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index 0bc5416b7..f495085a5 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -36,15 +36,31 @@ org.shredzone.acme4j acme4j-client ${libs.acme4j} + + + org.bouncycastle + * + + org.shredzone.acme4j acme4j-utils ${libs.acme4j} + + + org.bouncycastle + * + + + + + org.bouncycastle + bcpkix-jdk18on org.bouncycastle - bcpkix-jdk15on + bcprov-jdk18on software.amazon.awssdk diff --git a/pom.xml b/pom.xml index 730f5e361..2e411b97f 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 2023.0.11 4.1.114.Final 2.12 - 1.70 + 1.78.1 2.17.113 3.0.5 4.3.1 @@ -246,12 +246,12 @@ org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on ${libs.bouncycastle} org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on ${libs.bouncycastle} @@ -468,7 +468,7 @@ org.hamcrest:hamcrest-core - org.bouncycastle:*-jdk15on + org.bouncycastle:*-jdk18on From 110180e0f49aeb8222ee9b04a40389252fa1229f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 22:45:06 +0200 Subject: [PATCH 21/23] build: upgrade ACME4j --- carapace-server/pom.xml | 11 ----------- .../server/certificates/ACMEClient.java | 19 +++++++------------ pom.xml | 2 +- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/carapace-server/pom.xml b/carapace-server/pom.xml index f495085a5..3b343c07b 100644 --- a/carapace-server/pom.xml +++ b/carapace-server/pom.xml @@ -43,17 +43,6 @@ - - org.shredzone.acme4j - acme4j-utils - ${libs.acme4j} - - - org.bouncycastle - * - - - org.bouncycastle bcpkix-jdk18on diff --git a/carapace-server/src/main/java/org/carapaceproxy/server/certificates/ACMEClient.java b/carapace-server/src/main/java/org/carapaceproxy/server/certificates/ACMEClient.java index 03781d7c1..5cebe3e9c 100644 --- a/carapace-server/src/main/java/org/carapaceproxy/server/certificates/ACMEClient.java +++ b/carapace-server/src/main/java/org/carapaceproxy/server/certificates/ACMEClient.java @@ -66,10 +66,6 @@ public class ACMEClient { private final boolean testingModeOn; private final KeyPair userKey; - public enum ChallengeType { - HTTP - } - public ACMEClient(KeyPair userKey, boolean testingMode) { Security.addProvider(new BouncyCastleProvider()); this.userKey = userKey; @@ -140,10 +136,9 @@ public Map getChallengesForOrder(Order order) throws AcmeExce * @return {@link Http01Challenge} to verify */ private Http01Challenge httpChallenge(Authorization auth) throws AcmeException { - Http01Challenge challenge = auth.findChallenge(Http01Challenge.TYPE); - if (challenge == null) { - throw new AcmeException("Found no " + Http01Challenge.TYPE + " challenge, don't know what to do..."); - } + Http01Challenge challenge = auth.findChallenge(Http01Challenge.TYPE) + .map(Http01Challenge.class::cast) + .orElseThrow(() -> new AcmeException("Found no " + Http01Challenge.TYPE + " challenge, don't know what to do...")); LOG.debug("It must be reachable at: http://{}/.well-known/acme-challenge/{}", auth.getIdentifier().getDomain(), challenge.getToken() ); @@ -161,10 +156,10 @@ private Http01Challenge httpChallenge(Authorization auth) throws AcmeException { * @throws org.shredzone.acme4j.exception.AcmeException */ public Challenge dnsChallenge(Authorization auth) throws AcmeException { - Dns01Challenge challenge = auth.findChallenge(Dns01Challenge.TYPE); - if (challenge == null) { - throw new AcmeException("Found no " + Dns01Challenge.TYPE + " challenge, don't know what to do..."); - } + Dns01Challenge challenge = auth + .findChallenge(Dns01Challenge.TYPE) + .map(Dns01Challenge.class::cast) + .orElseThrow(() -> new AcmeException("Found no " + Dns01Challenge.TYPE + " challenge, don't know what to do...")); LOG.info("DNS-challenge _acme-challenge.{}. to save as TXT-record with content {}", auth.getIdentifier().getDomain(), challenge.getDigest()); return challenge; } diff --git a/pom.xml b/pom.xml index 2e411b97f..6da9ad6fb 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ 2023.0.11 4.1.114.Final - 2.12 + 3.4.0 1.78.1 2.17.113 3.0.5 From c70c62078123e43e0413f0418bbc92e84e1d2fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Fri, 18 Oct 2024 23:18:24 +0200 Subject: [PATCH 22/23] build: upgrade other dependencies --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 6da9ad6fb..624af7eec 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 3.0.5 4.3.1 - 4.14.4 + 4.14.8 3.8.4 5.2.0 0.16.0 @@ -110,12 +110,12 @@ 1.15 3.12.0 1.2 - 2.11.0 + 2.14.0 3.11.0 - 9.4.44.v20210927 + 9.4.52.v20230823 2.35 - 2.14.1 + 2.14.3 3.27.0-GA 1.7.35 33.3.1-jre @@ -126,7 +126,7 @@ 4.13.2 1.1.1 - 2.35.0 + 2.35.2 2.0.9 3.0.1 2.2 From 137955e58d9833ab527cfb4758f06137a4ed8259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maltoni?= Date: Sun, 20 Oct 2024 17:21:23 +0200 Subject: [PATCH 23/23] build: update Maven Wrapper --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 48a56c99a..d58dfb70b 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. wrapperVersion=3.3.2 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip