Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Converge dependency versions #500

Merged
merged 23 commits into from
Oct 21, 2024
Merged

Converge dependency versions #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
27bff23
build: consolidate Jackson dependency to 2.14.1
NiccoMlt Oct 15, 2024
43b5f1a
build: remove unwanted dependencies to annotations
NiccoMlt Oct 18, 2024
2bdb075
build: consolidate SLF4J dependency to 1.7.35
NiccoMlt Oct 18, 2024
2d140be
build: consolidate ZooKeeper dependency to 3.8.4
NiccoMlt Oct 18, 2024
dc88904
build: consolidate Jetty dependency to 9.4.56.v20240826
NiccoMlt Oct 15, 2024
59930fe
build: consolidate Netty dependency through BOM
NiccoMlt Oct 15, 2024
86ac0e1
build: consolidate BouncyCastle dependency
NiccoMlt Oct 15, 2024
6d14b31
build: add maven-enforcer-plugin
NiccoMlt Oct 15, 2024
752e56b
build: consolidate Protobuf dependency to 3.17.1
NiccoMlt Oct 18, 2024
3a42f72
build: consolidate Guava dependency to 31.1
NiccoMlt Oct 18, 2024
7b1e388
build: drop unnecessary dependencies
NiccoMlt Oct 18, 2024
83bb5dd
build: add Jersey BOM
NiccoMlt Oct 15, 2024
32bad9c
build: consolidate Prometheus and BookKeeper dependencies
NiccoMlt Oct 15, 2024
0539afd
build: consolidate Apache Commons dependencies
NiccoMlt Oct 15, 2024
154e1b2
build: add maven-enforcer-plugin with many rules
NiccoMlt Oct 18, 2024
02801b5
build: fix also test-scoped conflicts
NiccoMlt Oct 15, 2024
b2c024d
build: add reactor-tools
NiccoMlt Oct 18, 2024
bf91df1
build: upgrade Netty and Reactor-Netty
NiccoMlt Oct 18, 2024
362db7e
build: upgrade Guava
NiccoMlt Oct 18, 2024
7fff4b2
build: upgrade BouncyCastle
NiccoMlt Oct 18, 2024
110180e
build: upgrade ACME4j
NiccoMlt Oct 18, 2024
c70c620
build: upgrade other dependencies
NiccoMlt Oct 18, 2024
137955e
build: update Maven Wrapper
NiccoMlt Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
169 changes: 54 additions & 115 deletions carapace-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -15,6 +16,10 @@
<name>Carapace :: Server</name>

<dependencies>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-tools</artifactId>
</dependency>
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-core</artifactId>
Expand All @@ -26,7 +31,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${libs.netty.ssl}</version>
</dependency>
<dependency>
<groupId>org.shredzone.acme4j</groupId>
Expand All @@ -40,72 +44,39 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.shredzone.acme4j</groupId>
<artifactId>acme4j-utils</artifactId>
<version>${libs.acme4j}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${libs.bouncycastle}</version>
<type>jar</type>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>route53</artifactId>
<version>${libs.awssdk}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>${libs.caffeine}</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>ST4</artifactId>
<version>${libs.antlr}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${libs.zookkeeper}</version>
<exclusions>
<!-- Excluding unnecessary annotations that are bundled in multiple versions by libraries -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.yetus</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>ST4</artifactId>
<version>${libs.antlr}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
Expand All @@ -114,29 +85,19 @@
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
<version>${libs.prometheus}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_hotspot</artifactId>
<version>${libs.prometheus}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_servlet</artifactId>
<version>${libs.prometheus}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper.stats</groupId>
<artifactId>prometheus-metrics-provider</artifactId>
<version>${libs.prometheus.metrics}</version>
<type>jar</type>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<version>${libs.bookkeeper}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
Expand All @@ -148,116 +109,87 @@
<artifactId>herddb-jdbc</artifactId>
<version>${libs.herddb}</version>
<exclusions>
<!-- Excluding unnecessary annotations that are bundled in multiple versions by libraries -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
<!-- BouncyCastle FIPS clashes with other BouncyCastle modules -->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>*</artifactId>
<artifactId>bc-fips</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${libs.commons.lang3}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>${libs.commons-pool2}</version>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${libs.commons-io}</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>${libs.commons-net}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${libs.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${libs.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${libs.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${libs.jetty}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${libs.jersey}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${libs.jersey}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>${libs.jersey}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-jetty-http</artifactId>
<version>${libs.jersey}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${libs.jersey}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${libs.jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${libs.jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${libs.jackson}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${libs.jaxws.jaxb-api}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${libs.jaxws.jaxb-impl}</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>${libs.javaxactivation-api}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${libs.slf4j}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -268,7 +200,21 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${libs.guava}</version>
<exclusions>
<!-- Excluding unnecessary annotations that are bundled in multiple versions by libraries -->
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down Expand Up @@ -301,20 +247,12 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${libs.junit}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
<version>${libs.junitparams}</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -323,6 +261,7 @@
<version>${libs.wiremock}</version>
<scope>test</scope>
<exclusions>
<!-- Clashes with org.hamcrest:hamcrest -->
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
Expand All @@ -335,6 +274,7 @@
<version>${libs.powermock}</version>
<scope>test</scope>
<exclusions>
<!-- Clashes with org.hamcrest:hamcrest -->
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
Expand All @@ -347,12 +287,6 @@
<version>${libs.powermock}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${libs.mockito}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
Expand All @@ -368,6 +302,11 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>*</artifactId>
</exclusion>
<!-- We want a single SLF4J backend in our classpath! -->
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
Loading
Loading