Merge pull request #6 from michaeljohnalbers/dropwizard-4.0-support

Updates for Dropwizard 4.0.x
mtakaki · Sep 16, 2023 · 6e84087 · 6e84087
2 parents 372768e + f7bace1
commit 6e84087
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <dropwizard.version>3.0.1</dropwizard.version>
+        <dropwizard.version>4.0.1</dropwizard.version>
         <!-- Flaky test setting, re-run more 2 times in case of a failure -->
         <surefire.rerunFailingTestsCount>2</surefire.rerunFailingTestsCount>
     </properties>

diff --git a/src/main/java/com/github/mtakaki/dropwizard/admin/AdminResourceBundle.java b/src/main/java/com/github/mtakaki/dropwizard/admin/AdminResourceBundle.java
@@ -4,7 +4,7 @@
 import org.glassfish.jersey.server.filter.RolesAllowedDynamicFeature;
 import org.glassfish.jersey.servlet.ServletContainer;
 
-import com.codahale.metrics.jersey2.InstrumentedResourceMethodApplicationListener;
+import com.codahale.metrics.jersey3.InstrumentedResourceMethodApplicationListener;
 
 import io.dropwizard.jersey.DropwizardResourceConfig;
 import io.dropwizard.jersey.setup.JerseyContainerHolder;

diff --git a/src/test/java/com/github/mtakaki/dropwizard/admin/AdminResourceBundleIntegrationTest.java b/src/test/java/com/github/mtakaki/dropwizard/admin/AdminResourceBundleIntegrationTest.java
@@ -2,11 +2,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;