Dropwizard 3 support

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.yammer.tenacity</groupId>
     <artifactId>tenacity-parent</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1-DROPWIZARD-3-PATCH</version>
     <packaging>pom</packaging>
 
     <name>Tenacity</name>
@@ -56,17 +56,31 @@
         </developer>
     </developers>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>fk-art-release</id>
+            <name>Flipkart-Artifactory</name>
+            <url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>fk-art-snapshot</id>
+            <name>Flipkart-Artifactory</name>
+            <url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <!--To deploy/publish artifacts to Flipkart Universal Artifactory: -->
     <distributionManagement>
-        <snapshotRepository>
-            <id>sonatype-nexus-snapshots</id>
-            <name>Sonatype Nexus Snapshots</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
         <repository>
-            <id>sonatype-nexus-staging</id>
-            <name>Nexus Release Repository</name>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+            <id>fk-art-release</id>
+            <name>Flipkart-Artifactory</name>
+            <url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
         </repository>
+        <snapshotRepository>
+            <id>fk-art-snapshot</id>
+            <name>Flipkart-Artifactory</name>
+            <url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
+        </snapshotRepository>
     </distributionManagement>
 
     <properties>
@@ -75,7 +89,7 @@
         <wiremock.version>2.8.0</wiremock.version>
         <hamcrest.version>1.3</hamcrest.version>
         <assertj.core.version>3.8.0</assertj.core.version>
-        <mockito.version>2.10.0</mockito.version>
+        <mockito.version>4.0.0</mockito.version>
     </properties>
 
     <dependencyManagement>
@@ -107,6 +121,16 @@
                 <updatePolicy>always</updatePolicy>
             </snapshots>
         </repository>
+        <repository>
+            <id>fk-art-snapshot</id>
+            <name>Flipkart-Artifactory</name>
+            <url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
+        </repository>
+        <repository>
+            <id>fk-art-release</id>
+            <name>Flipkart-Artifactory</name>
+            <url>https://jfrog.fkinternal.com/artifactory/maven_virtual</url>
+        </repository>
     </repositories>
 
     <profiles>
@@ -148,131 +172,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>UTF-8</encoding>
-                    <optimize>true</optimize>
-                    <debug>true</debug>
-                    <compilerId>javac-with-errorprone</compilerId>
-                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
-                    <showWarnings>true</showWarnings>
-                    <compilerArgument>-XepDisableWarningsInGeneratedCode</compilerArgument>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.plexus</groupId>
-                        <artifactId>plexus-compiler-javac-errorprone</artifactId>
-                        <version>2.8.2</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.google.errorprone</groupId>
-                        <artifactId>error_prone_core</artifactId>
-                        <version>2.1.1</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
-                <configuration>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <mavenExecutorId>forked-path</mavenExecutorId>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.0-M1</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                    <docencoding>UTF-8</docencoding>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.5</version>
-                <configuration>
-                    <effort>Max</effort>
-                    <threshold>Default</threshold>
-                    <xmlOutput>true</xmlOutput>
-                    <excludeFilterFile>${basedir}/../findbugs-exclude.xml</excludeFilterFile>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M1</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <rules>
-                        <DependencyConvergence />
-                    </rules>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>enforce</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <phase>validate</phase>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>

tenacity-bom/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>tenacity-parent</artifactId>
         <groupId>com.yammer.tenacity</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1-DROPWIZARD-3-PATCH</version>
     </parent>
 
     <artifactId>tenacity-bom</artifactId>
@@ -22,7 +22,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <dropwizard.version>1.2.0</dropwizard.version>
+        <dropwizard.version>3.0.1</dropwizard.version>
         <hystrix.version>1.5.13</hystrix.version>
     </properties>
 
@@ -36,6 +36,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>io.dropwizard</groupId>
+                <artifactId>dropwizard-testing</artifactId>
+                <version>${dropwizard.version}</version>
+            </dependency>
 
             <!-- Hystrix -->
             <dependency>

tenacity-client/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>tenacity-parent</artifactId>
         <groupId>com.yammer.tenacity</groupId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1-DROPWIZARD-3-PATCH</version>
     </parent>
 
     <artifactId>tenacity-client</artifactId>

tenacity-client/src/main/java/com/yammer/tenacity/client/TenacityClientBuilder.java

@@ -4,7 +4,7 @@
 import com.yammer.tenacity.core.properties.TenacityPropertyKey;
 import io.dropwizard.client.JerseyClientBuilder;
 import io.dropwizard.client.JerseyClientConfiguration;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.setup.Environment;
 
 import javax.ws.rs.client.Client;
 

tenacity-client/src/test/java/com/yammer/tenacity/client/tests/TenacityClientTest.java

@@ -15,10 +15,10 @@
 import com.yammer.tenacity.core.properties.TenacityPropertyKey;
 import com.yammer.tenacity.core.properties.TenacityPropertyKeyFactory;
 import com.yammer.tenacity.testing.TenacityTestRule;
-import io.dropwizard.Application;
-import io.dropwizard.Configuration;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.Application;
+import io.dropwizard.core.Configuration;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 import io.dropwizard.testing.junit.DropwizardAppRule;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;

tenacity-client/src/test/java/com/yammer/tenacity/client/tests/TenacityResourcesJerseyTest.java

@@ -2,7 +2,7 @@
 
 import com.google.common.io.Resources;
 import com.yammer.tenacity.client.TenacityClientBuilder;
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 import io.dropwizard.client.JerseyClientBuilder;
 import io.dropwizard.testing.junit.DropwizardAppRule;
 import org.junit.BeforeClass;

tenacity-client/src/test/java/com/yammer/tenacity/client/tests/TenacityResourcesServletTest.java

@@ -2,7 +2,7 @@
 
 import com.google.common.io.Resources;
 import com.yammer.tenacity.client.TenacityClientBuilder;
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 import io.dropwizard.client.JerseyClientBuilder;
 import io.dropwizard.testing.junit.DropwizardAppRule;
 import org.junit.BeforeClass;

tenacity-client/src/test/java/com/yammer/tenacity/client/tests/TenacityServletAdminService.java

@@ -1,7 +1,7 @@
 package com.yammer.tenacity.client.tests;
 
 import com.yammer.tenacity.core.bundle.TenacityBundleBuilder;
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 
 public class TenacityServletAdminService extends TenacityServletService {
     @Override

tenacity-client/src/test/java/com/yammer/tenacity/client/tests/TenacityServletService.java

@@ -7,10 +7,10 @@
 import com.yammer.tenacity.core.config.TenacityConfiguration;
 import com.yammer.tenacity.core.properties.TenacityPropertyKey;
 import com.yammer.tenacity.core.properties.TenacityPropertyKeyFactory;
-import io.dropwizard.Application;
-import io.dropwizard.Configuration;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.Application;
+import io.dropwizard.core.Configuration;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 
 import java.util.Map;
 

tenacity-core/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.yammer.tenacity</groupId>
         <artifactId>tenacity-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1-DROPWIZARD-3-PATCH</version>
     </parent>
 
     <artifactId>tenacity-core</artifactId>
@@ -27,6 +27,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.13.0</version> <!-- Use the latest version available -->
+        </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-core</artifactId>

tenacity-core/src/main/java/com/yammer/tenacity/core/bundle/BaseTenacityBundleConfigurationFactory.java

@@ -3,7 +3,7 @@
 import com.yammer.tenacity.core.config.BreakerboxConfiguration;
 import com.yammer.tenacity.core.config.TenacityConfiguration;
 import com.yammer.tenacity.core.properties.TenacityPropertyKey;
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 
 import java.util.Collections;
 import java.util.Map;

tenacity-core/src/main/java/com/yammer/tenacity/core/bundle/TenacityBundleBuilder.java

@@ -5,7 +5,7 @@
 import com.netflix.hystrix.strategy.executionhook.HystrixCommandExecutionHook;
 import com.yammer.tenacity.core.errors.TenacityContainerExceptionMapper;
 import com.yammer.tenacity.core.errors.TenacityExceptionMapper;
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 
 import javax.ws.rs.ext.ExceptionMapper;
 import java.util.Optional;

tenacity-core/src/main/java/com/yammer/tenacity/core/bundle/TenacityBundleConfigurationFactory.java

@@ -4,7 +4,7 @@
 import com.yammer.tenacity.core.config.TenacityConfiguration;
 import com.yammer.tenacity.core.properties.TenacityPropertyKey;
 import com.yammer.tenacity.core.properties.TenacityPropertyKeyFactory;
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 
 import java.util.Map;
 

tenacity-core/src/main/java/com/yammer/tenacity/core/bundle/TenacityConfiguredBundle.java

@@ -16,12 +16,12 @@
 import com.yammer.tenacity.core.servlets.TenacityCircuitBreakersServlet;
 import com.yammer.tenacity.core.servlets.TenacityConfigurationServlet;
 import com.yammer.tenacity.core.servlets.TenacityPropertyKeysServlet;
-import io.dropwizard.Configuration;
-import io.dropwizard.ConfiguredBundle;
-import io.dropwizard.server.AbstractServerFactory;
-import io.dropwizard.server.ServerFactory;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.Configuration;
+import io.dropwizard.core.ConfiguredBundle;
+import io.dropwizard.core.server.AbstractServerFactory;
+import io.dropwizard.core.server.ServerFactory;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 import io.dropwizard.util.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;