[#12] Dropwizard 5.x.x upgrade

.github/workflows/github-ci.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'master'
+      - 'master-5.x.x'
   pull_request:
     types: [opened, synchronize, reopened]
   release:
@@ -19,10 +20,10 @@ jobs:
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: Cache Maven packages
         uses: actions/cache@v4

README.md

@@ -6,12 +6,12 @@ Dropwizard Swagger Integration
 
 A Dropwizard bundle that serves Swagger UI static content and loads Swagger endpoints.
 
-Current version has been tested with Dropwizard 2.1.12 and Swagger 2.2.2 which supports OpenApi 3.0 specifications
+Current version has been tested with Dropwizard 5.0.0 and Swagger 2.2.41 which supports OpenApi 3.0 specifications
 
 Requirements
 --------------
-* Dropwizard 2.1.12
-* Swagger API 2.2.2
+* Dropwizard 5.0.0
+* Swagger API 2.2.41
 * Swagger UI 5.27.0
 
 Usage
@@ -23,7 +23,7 @@ Usage
 <dependency>
     <groupId>in.vectorpro.dropwizard</groupId>
     <artifactId>dropwizard-swagger</artifactId>
-    <version>2.1.12-1</version>
+    <version>5.0.0-1-rc.1</version>
 </dependency>
 ```
 

dropwizard-swagger-bom/pom.xml

@@ -9,7 +9,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <parent>
         <groupId>in.vectorpro.dropwizard</groupId>
         <artifactId>dropwizard-swagger-parent</artifactId>
-        <version>2.1.12-2</version>
+        <version>5.0.0-1-rc.1</version>
     </parent>
 
     <artifactId>dropwizard-swagger-bom</artifactId>
@@ -73,7 +73,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <dependency>
                 <groupId>in.vectorpro.dropwizard</groupId>
                 <artifactId>dropwizard-swagger</artifactId>
-                <version>2.1.12-2</version>
+                <version>5.0.0-1-rc.1</version>
             </dependency>
             <dependency>
                 <groupId>in.vectorpro.dropwizard</groupId>
@@ -83,27 +83,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-annotations</artifactId>
-                <version>2.2.2</version>
+                <version>2.2.41</version>
             </dependency>
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-core</artifactId>
-                <version>2.2.2</version>
+                <version>2.2.41</version>
             </dependency>
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-integration</artifactId>
-                <version>2.2.2</version>
+                <version>2.2.41</version>
             </dependency>
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
-                <artifactId>swagger-jaxrs2</artifactId>
-                <version>2.2.2</version>
+                <artifactId>swagger-jaxrs2-jakarta</artifactId>
+                <version>2.2.41</version>
             </dependency>
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-models</artifactId>
-                <version>2.2.2</version>
+                <version>2.2.41</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

dropwizard-swagger/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>in.vectorpro.dropwizard</groupId>
         <artifactId>dropwizard-swagger-parent</artifactId>
-        <version>2.1.12-2</version>
+        <version>5.0.0-1-rc.1</version>
     </parent>
 
     <artifactId>dropwizard-swagger</artifactId>
@@ -113,8 +113,14 @@
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-jaxrs2</artifactId>
+            <artifactId>swagger-jaxrs2-jakarta</artifactId>
             <version>${swagger.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>snakeyaml</artifactId>
+                    <groupId>org.yaml</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/OAuth2Resource.java

@@ -22,15 +22,15 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.UUID;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriBuilder;
 
 @Path("/oauth2")
 public class OAuth2Resource {

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleApplication.java

@@ -18,16 +18,16 @@
 import com.google.common.collect.Lists;
 import in.vectorpro.dropwizard.swagger.SwaggerBundle;
 import in.vectorpro.dropwizard.swagger.SwaggerBundleConfiguration;
-import io.dropwizard.Application;
 import io.dropwizard.auth.AuthDynamicFeature;
 import io.dropwizard.auth.AuthFilter;
 import io.dropwizard.auth.AuthValueFactoryProvider;
 import io.dropwizard.auth.PrincipalImpl;
 import io.dropwizard.auth.basic.BasicCredentialAuthFilter;
 import io.dropwizard.auth.chained.ChainedAuthFilter;
 import io.dropwizard.auth.oauth.OAuthCredentialAuthFilter;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.Application;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 import java.util.List;
 import org.glassfish.jersey.server.filter.RolesAllowedDynamicFeature;
 
@@ -52,7 +52,7 @@ protected SwaggerBundleConfiguration getSwaggerBundleConfiguration(
             return configuration.getSwagger();
           }
         });
-  };
+  }
 
   @Override
   public void run(SampleConfiguration configuration, Environment environment) throws Exception {

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleConfiguration.java

@@ -17,9 +17,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import in.vectorpro.dropwizard.swagger.SwaggerBundleConfiguration;
-import io.dropwizard.Configuration;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import io.dropwizard.core.Configuration;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 public class SampleConfiguration extends Configuration {
 

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleResource.java

@@ -29,10 +29,10 @@
 import io.swagger.v3.oas.annotations.security.SecurityScheme;
 import io.swagger.v3.oas.annotations.security.SecuritySchemes;
 import io.swagger.v3.oas.annotations.tags.Tag;
-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.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 @Path("/")
 @Tag(name = "HelloTag")

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/BackwardsCompatibleSwaggerResource.java

@@ -17,16 +17,16 @@
 
 import io.swagger.v3.jaxrs2.integration.resources.BaseOpenApiResource;
 import io.swagger.v3.oas.annotations.Operation;
-import javax.servlet.ServletConfig;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.ServletConfig;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 
 @Path("/swagger.{type:json|yaml}")
 public class BackwardsCompatibleSwaggerResource extends BaseOpenApiResource {

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/ConfigurationHelper.java

@@ -15,10 +15,10 @@
  */
 package in.vectorpro.dropwizard.swagger;
 
-import io.dropwizard.Configuration;
-import io.dropwizard.server.DefaultServerFactory;
-import io.dropwizard.server.ServerFactory;
-import io.dropwizard.server.SimpleServerFactory;
+import io.dropwizard.core.Configuration;
+import io.dropwizard.core.server.DefaultServerFactory;
+import io.dropwizard.core.server.ServerFactory;
+import io.dropwizard.core.server.SimpleServerFactory;
 import java.util.Optional;
 
 /**

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerBundle.java

@@ -15,12 +15,12 @@
  */
 package in.vectorpro.dropwizard.swagger;
 
-import io.dropwizard.Configuration;
-import io.dropwizard.ConfiguredBundle;
+import io.dropwizard.core.Configuration;
+import io.dropwizard.core.ConfiguredBundle;
 import io.dropwizard.assets.AssetsBundle;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
-import io.dropwizard.views.ViewBundle;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
+import io.dropwizard.views.common.ViewBundle;
 import io.swagger.v3.core.converter.ModelConverters;
 import io.swagger.v3.core.jackson.ModelResolver;
 import io.swagger.v3.jaxrs2.SwaggerSerializers;

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerBundleConfiguration.java

@@ -27,7 +27,7 @@
 import io.swagger.v3.oas.models.servers.Server;
 import org.hibernate.validator.constraints.NotEmpty;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerOAuth2Configuration.java

@@ -18,7 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.google.common.collect.Maps;
 import java.util.Map;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /** For the meaning of all these properties please refer to Swagger UI documentation */
 @JsonIgnoreProperties(ignoreUnknown = true)

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerResource.java

@@ -17,10 +17,10 @@
 
 import static in.vectorpro.dropwizard.swagger.SwaggerResource.PATH;
 
-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.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 @Path(PATH)
 @Produces(MediaType.TEXT_HTML)

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerView.java

@@ -15,9 +15,9 @@
  */
 package in.vectorpro.dropwizard.swagger;
 
-import io.dropwizard.views.View;
+import io.dropwizard.views.common.View;
 import java.nio.charset.StandardCharsets;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * Serves the content of Swagger's index page which has been "templatized" to support replacing the

dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerViewConfiguration.java

@@ -17,7 +17,7 @@
 
 import com.google.common.collect.Sets;
 import java.util.Set;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * Contains all configurable parameters required to render the SwaggerUI View from the default

dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplication.java

@@ -15,9 +15,9 @@
  */
 package in.vectorpro.dropwizard.swagger;
 
-import io.dropwizard.Application;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.Application;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 
 public class TestApplication extends Application<TestConfiguration> {
 

dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithApiSelectorDisabled.java

@@ -15,9 +15,9 @@
  */
 package in.vectorpro.dropwizard.swagger;
 
-import io.dropwizard.Application;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.Application;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 
 public class TestApplicationWithApiSelectorDisabled extends Application<TestConfiguration> {
 

dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAssetsAndPathSetProgramatically.java

@@ -16,7 +16,7 @@
 package in.vectorpro.dropwizard.swagger;
 
 import io.dropwizard.assets.AssetsBundle;
-import io.dropwizard.setup.Bootstrap;
+import io.dropwizard.core.setup.Bootstrap;
 
 public class TestApplicationWithAssetsAndPathSetProgramatically
     extends TestApplicationWithPathSetProgramatically {

dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAuthAndApiSelectorDisabled.java

@@ -15,9 +15,9 @@
  */
 package in.vectorpro.dropwizard.swagger;
 
-import io.dropwizard.Application;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.Application;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 
 public class TestApplicationWithAuthAndApiSelectorDisabled extends Application<TestConfiguration> {
 

dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAuthDisabled.java

@@ -15,9 +15,9 @@
  */
 package in.vectorpro.dropwizard.swagger;
 
-import io.dropwizard.Application;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.Application;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 
 public class TestApplicationWithAuthDisabled extends Application<TestConfiguration> {
 

dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithCustomTemplate.java

@@ -15,10 +15,10 @@
  */
 package in.vectorpro.dropwizard.swagger;
 
-import io.dropwizard.Application;
+import io.dropwizard.core.Application;
 import io.dropwizard.assets.AssetsBundle;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 
 public class TestApplicationWithCustomTemplate extends Application<TestConfiguration> {