diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index b6c5930..5caca45 100644 --- a/.github/workflows/github-ci.yml +++ b/.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 diff --git a/README.md b/README.md index b5cc29d..7d988ae 100644 --- a/README.md +++ b/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 in.vectorpro.dropwizard dropwizard-swagger - 2.1.12-1 + 5.0.0-1-rc.1 ``` diff --git a/dropwizard-swagger-bom/pom.xml b/dropwizard-swagger-bom/pom.xml index 21e3d03..c649431 100644 --- a/dropwizard-swagger-bom/pom.xml +++ b/dropwizard-swagger-bom/pom.xml @@ -9,7 +9,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> in.vectorpro.dropwizard dropwizard-swagger-parent - 2.1.12-2 + 5.0.0-1-rc.1 dropwizard-swagger-bom @@ -73,7 +73,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> in.vectorpro.dropwizard dropwizard-swagger - 2.1.12-2 + 5.0.0-1-rc.1 in.vectorpro.dropwizard @@ -83,27 +83,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> io.swagger.core.v3 swagger-annotations - 2.2.2 + 2.2.41 io.swagger.core.v3 swagger-core - 2.2.2 + 2.2.41 io.swagger.core.v3 swagger-integration - 2.2.2 + 2.2.41 io.swagger.core.v3 - swagger-jaxrs2 - 2.2.2 + swagger-jaxrs2-jakarta + 2.2.41 io.swagger.core.v3 swagger-models - 2.2.2 + 2.2.41 diff --git a/dropwizard-swagger/pom.xml b/dropwizard-swagger/pom.xml index 0d0970f..f6bb940 100644 --- a/dropwizard-swagger/pom.xml +++ b/dropwizard-swagger/pom.xml @@ -22,7 +22,7 @@ in.vectorpro.dropwizard dropwizard-swagger-parent - 2.1.12-2 + 5.0.0-1-rc.1 dropwizard-swagger @@ -113,8 +113,14 @@ io.swagger.core.v3 - swagger-jaxrs2 + swagger-jaxrs2-jakarta ${swagger.version} + + + snakeyaml + org.yaml + + io.rest-assured diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/OAuth2Resource.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/OAuth2Resource.java index 8ea48a1..98f8f5e 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/OAuth2Resource.java +++ b/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 { diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleApplication.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleApplication.java index b496f8f..21ef153 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleApplication.java +++ b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleApplication.java @@ -18,7 +18,6 @@ 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; @@ -26,8 +25,9 @@ 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 { diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleConfiguration.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleConfiguration.java index 47827df..6cb3496 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleConfiguration.java +++ b/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 { diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleResource.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleResource.java index 7e58c4c..f619e23 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/sample/SampleResource.java +++ b/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") diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/BackwardsCompatibleSwaggerResource.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/BackwardsCompatibleSwaggerResource.java index 6d3e7bb..29371b6 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/BackwardsCompatibleSwaggerResource.java +++ b/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 { diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/ConfigurationHelper.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/ConfigurationHelper.java index 90736dd..ae6632d 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/ConfigurationHelper.java +++ b/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; /** diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerBundle.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerBundle.java index 358132f..c18c5e2 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerBundle.java +++ b/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; diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerBundleConfiguration.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerBundleConfiguration.java index 159144d..23333d3 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerBundleConfiguration.java +++ b/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; diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerOAuth2Configuration.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerOAuth2Configuration.java index 7a17b07..229e347 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerOAuth2Configuration.java +++ b/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) diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerResource.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerResource.java index 3c98a60..754cd3e 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerResource.java +++ b/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) diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerView.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerView.java index 77eb566..b659f69 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerView.java +++ b/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 diff --git a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerViewConfiguration.java b/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerViewConfiguration.java index bc5a02c..78caa7c 100644 --- a/dropwizard-swagger/src/main/java/in/vectorpro/dropwizard/swagger/SwaggerViewConfiguration.java +++ b/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 diff --git a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplication.java b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplication.java index 37d985e..a64f024 100644 --- a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplication.java +++ b/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 { diff --git a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithApiSelectorDisabled.java b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithApiSelectorDisabled.java index 42682ae..b53a744 100644 --- a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithApiSelectorDisabled.java +++ b/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 { diff --git a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAssetsAndPathSetProgramatically.java b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAssetsAndPathSetProgramatically.java index 67d9609..e2b7b58 100644 --- a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAssetsAndPathSetProgramatically.java +++ b/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 { diff --git a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAuthAndApiSelectorDisabled.java b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAuthAndApiSelectorDisabled.java index 26986d7..fa80c90 100644 --- a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAuthAndApiSelectorDisabled.java +++ b/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 { diff --git a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAuthDisabled.java b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAuthDisabled.java index 4ae3d6e..446c27b 100644 --- a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithAuthDisabled.java +++ b/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 { diff --git a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithCustomTemplate.java b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithCustomTemplate.java index 6c5b057..5469603 100644 --- a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithCustomTemplate.java +++ b/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 { diff --git a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithPathSetProgramatically.java b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithPathSetProgramatically.java index c8c378f..abda1fc 100644 --- a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithPathSetProgramatically.java +++ b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestApplicationWithPathSetProgramatically.java @@ -15,10 +15,10 @@ */ package in.vectorpro.dropwizard.swagger; -import io.dropwizard.Application; -import io.dropwizard.server.DefaultServerFactory; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.Application; +import io.dropwizard.core.server.DefaultServerFactory; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; public class TestApplicationWithPathSetProgramatically extends Application { diff --git a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestConfiguration.java b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestConfiguration.java index 65c90d9..bb3a428 100644 --- a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestConfiguration.java +++ b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestConfiguration.java @@ -16,7 +16,7 @@ package in.vectorpro.dropwizard.swagger; import com.fasterxml.jackson.annotation.JsonProperty; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; public class TestConfiguration extends Configuration { diff --git a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestResource.java b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestResource.java index 94d6f1d..a9b30d2 100644 --- a/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestResource.java +++ b/dropwizard-swagger/src/test/java/in/vectorpro/dropwizard/swagger/TestResource.java @@ -19,10 +19,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.servers.Server; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; @Path("/test.json") @OpenAPIDefinition(servers = {@Server(url = "/test")}) diff --git a/pom.xml b/pom.xml index 659c014..0a1f744 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ in.vectorpro.dropwizard dropwizard-swagger-parent - 2.1.12-2 + 5.0.0-1-rc.1 pom @@ -87,10 +87,11 @@ UTF-8 false - 2.1.12 + 5.0.0 + 2.20.0 33.5.0-jre 5.10.5 - 2.2.2 + 2.2.41 5.27.0 3.30.2-GA @@ -109,6 +110,13 @@ pom import + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import +