From 8f3f1afb04684b62849aee0ff7a69dc9da60e048 Mon Sep 17 00:00:00 2001
From: Caesar Ralf <caesarralf@spotify.com>
Date: Thu, 20 May 2021 13:58:13 +0200
Subject: [PATCH 1/6] Upgrade guice 4.2.2 -> 5.0.1

---
 pom.xml | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index afdcff61..bb3973e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,12 +76,7 @@
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <version>4.2.2</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.inject.extensions</groupId>
-                <artifactId>guice-multibindings</artifactId>
-                <version>4.2.2</version>
+                <version>5.0.1</version>
             </dependency>
             <dependency>
                 <groupId>net.sf.jopt-simple</groupId>
@@ -97,28 +92,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>

From b1e08e7ea24a9c16025f6de6fdbf70f149c4ee9e Mon Sep 17 00:00:00 2001
From: -l <caesarralf@spotify.com>
Date: Fri, 21 May 2021 14:58:13 +0200
Subject: [PATCH 2/6] Upgrade missinglink to get bugfix

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index bb3973e1..eebf1bd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -328,7 +328,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>
@@ -466,7 +466,7 @@
                             <dependency>:auto-value-annotations::</dependency>
                             <dependency>javax.annotation:javax.annotation-api::</dependency>
                             <dependency>com.google.code.findbugs:::</dependency>
-                        </ignoredUnusedDeclaredDependencies>                    
+                        </ignoredUnusedDeclaredDependencies>
                     </configuration>
                 </execution>
                 </executions>
@@ -575,7 +575,7 @@
                     <plugin>
                         <groupId>com.spotify</groupId>
                         <artifactId>missinglink-maven-plugin</artifactId>
-                        <version>0.2.0</version>
+                        <version>0.2.2</version>
                         <configuration>
                             <includeScopes>compile,test,runtime</includeScopes>
                             <failOnConflicts>true</failOnConflicts>

From 0b49032d3da9448d6f30655eccab5904deede516 Mon Sep 17 00:00:00 2001
From: -l <caesarralf@spotify.com>
Date: Wed, 2 Jun 2021 13:38:30 +0200
Subject: [PATCH 3/6] Bump dropwizard metrics from 4.0.5 -> 4.2.0

We are avoid explicitly using the bom because it brings too many
transitive dependencies.
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index eebf1bd6..69b977e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,13 +125,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>

From a416bc934a2e6e5b48d87442e0ddbf2fd07af1b5 Mon Sep 17 00:00:00 2001
From: -l <caesarralf@spotify.com>
Date: Wed, 2 Jun 2021 15:38:12 +0200
Subject: [PATCH 4/6] Change guice import to use its BOM

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 69b977e4..5bf53882 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,8 +75,10 @@
             </dependency>
             <dependency>
                 <groupId>com.google.inject</groupId>
-                <artifactId>guice</artifactId>
+                <artifactId>guice-bom</artifactId>
                 <version>5.0.1</version>
+                <scope>import</scope>
+                <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>net.sf.jopt-simple</groupId>

From 0a2e25c6ab6e5d38cd8f89e1c1ec4bca4b6c9118 Mon Sep 17 00:00:00 2001
From: -l <caesarralf@spotify.com>
Date: Wed, 2 Jun 2021 15:45:37 +0200
Subject: [PATCH 5/6] Remove plugin version that has already been defined

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5bf53882..e521ac17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -577,7 +577,6 @@
                     <plugin>
                         <groupId>com.spotify</groupId>
                         <artifactId>missinglink-maven-plugin</artifactId>
-                        <version>0.2.2</version>
                         <configuration>
                             <includeScopes>compile,test,runtime</includeScopes>
                             <failOnConflicts>true</failOnConflicts>

From e833edc63fec3af47ae44ec7be1482a68431c365 Mon Sep 17 00:00:00 2001
From: -l <caesarralf@spotify.com>
Date: Wed, 2 Jun 2021 15:52:01 +0200
Subject: [PATCH 6/6] Add dependency to guice-multibindings in
 dependencyManagement

To guarantee backwards compatibility. The artifact already comes empty.
---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index e521ac17..8c168c0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,18 @@
                 <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.3</version>
+            </dependency>
             <dependency>
                 <groupId>net.sf.jopt-simple</groupId>
                 <artifactId>jopt-simple</artifactId>