Skip to content
This repository has been archived by the owner on Sep 28, 2021. It is now read-only.

Commit

Permalink
Upgrade guice 4.2.2 -> 5.0.1 (#356)
Browse files Browse the repository at this point in the history
* Upgrade guice 4.2.2 -> 5.0.1

* Upgrade missinglink to get bugfix

* Bump dropwizard metrics from 4.0.5 -> 4.2.0

We are avoid explicitly using the bom because it brings too many
transitive dependencies.

* Change guice import to use its BOM

* Remove plugin version that has already been defined

* Add dependency to guice-multibindings in dependencyManagement

To guarantee backwards compatibility. The artifact already comes empty.

Co-authored-by: Caesar Ralf <caesarralf@spotify.com>
  • Loading branch information
caesar-ralf and caesar-ralf committed Jun 2, 2021
1 parent cb91256 commit 6395083
Showing 1 changed file with 18 additions and 32 deletions.
50 changes: 18 additions & 32 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,22 @@
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>4.2.2</version>
<artifactId>guice-bom</artifactId>
<version>5.0.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<!--
From Guice 5+ multi-bindings is officially part of the its core library.
From Guice 4.2.x Guice already transferred the code into its core library,
but left the artifact `guice-multibindings` with no code in it for backward compatibility.
We are explicitly settings this version here so that we can move our users to Guice 5.0.1
without breaking their projects.
We should delete this dependency as soon as we can guarantee everyone moved to 5.0.1 -->
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
<version>4.2.2</version>
<version>4.2.3</version>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
Expand All @@ -97,28 +106,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
Expand Down Expand Up @@ -152,13 +139,13 @@
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>4.0.5</version>
<artifactId>metrics-jvm</artifactId>
<version>4.2.0</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jvm</artifactId>
<version>4.0.5</version>
<artifactId>metrics-core</artifactId>
<version>4.2.0</version>
</dependency>
<dependency>
<groupId>com.spotify.metrics</groupId>
Expand Down Expand Up @@ -355,7 +342,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>missinglink-maven-plugin</artifactId>
<version>0.2.0</version>
<version>0.2.2</version>
<configuration>
<failOnConflicts>true</failOnConflicts>
</configuration>
Expand Down Expand Up @@ -493,7 +480,7 @@
<dependency>:auto-value-annotations::</dependency>
<dependency>javax.annotation:javax.annotation-api::</dependency>
<dependency>com.google.code.findbugs:::</dependency>
</ignoredUnusedDeclaredDependencies>
</ignoredUnusedDeclaredDependencies>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -602,7 +589,6 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>missinglink-maven-plugin</artifactId>
<version>0.2.0</version>
<configuration>
<includeScopes>compile,test,runtime</includeScopes>
<failOnConflicts>true</failOnConflicts>
Expand Down

0 comments on commit 6395083

Please sign in to comment.