From 7a7972e38543708a49dee74a8670f11109ea618f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Willi=20Sch=C3=B6nborn?= Date: Mon, 4 Jan 2021 10:22:30 +0100 Subject: [PATCH] Bumped problem dependency --- pom.xml | 2 +- .../web/autoconfigure/ProblemJacksonAutoConfiguration.java | 2 +- .../autoconfigure/ProblemJacksonWebMvcAutoConfiguration.java | 2 +- .../spring/web/autoconfigure/CustomWebMvcApplicationTest.java | 2 +- .../problem/spring/web/autoconfigure/NonWebApplicationTest.java | 2 +- .../problem/spring/web/autoconfigure/WebApplicationTest.java | 2 +- .../zalando/problem/spring/web/advice/AdviceTraitTesting.java | 2 +- .../web/advice/general/NestedThrowableAdviceTraitTest.java | 2 +- .../spring/web/advice/security/SecurityAdviceTraitTest.java | 2 +- .../problem/spring/webflux/advice/AdviceTraitTesting.java | 2 +- .../webflux/advice/general/NestedThrowableAdviceTraitTest.java | 2 +- .../spring/webflux/advice/security/SecurityAdviceTraitTest.java | 2 +- .../problem/violations/ConstraintViolationProblemModule.java | 2 +- .../violations/ConstraintViolationProblemModuleTest.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index c674a1a8..23d69141 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 1.7.30 2.12.0 - 0.25.0 + 0.26.0-RC.0 5.3.2 5.4.2 2.4.1 diff --git a/problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/ProblemJacksonAutoConfiguration.java b/problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/ProblemJacksonAutoConfiguration.java index af80c3a0..598338a9 100644 --- a/problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/ProblemJacksonAutoConfiguration.java +++ b/problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/ProblemJacksonAutoConfiguration.java @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.violations.ConstraintViolationProblemModule; import static org.apiguardian.api.API.Status.INTERNAL; diff --git a/problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/ProblemJacksonWebMvcAutoConfiguration.java b/problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/ProblemJacksonWebMvcAutoConfiguration.java index 5825918f..f887e883 100644 --- a/problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/ProblemJacksonWebMvcAutoConfiguration.java +++ b/problem-spring-web-autoconfigure/src/main/java/org/zalando/problem/spring/web/autoconfigure/ProblemJacksonWebMvcAutoConfiguration.java @@ -13,7 +13,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.violations.ConstraintViolationProblemModule; import java.util.List; diff --git a/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/CustomWebMvcApplicationTest.java b/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/CustomWebMvcApplicationTest.java index 01235e96..c6220e42 100644 --- a/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/CustomWebMvcApplicationTest.java +++ b/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/CustomWebMvcApplicationTest.java @@ -7,7 +7,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.violations.ConstraintViolationProblemModule; import javax.annotation.Nullable; diff --git a/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/NonWebApplicationTest.java b/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/NonWebApplicationTest.java index e8c605d0..0673be35 100644 --- a/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/NonWebApplicationTest.java +++ b/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/NonWebApplicationTest.java @@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Configuration; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.spring.web.advice.AdviceTrait; import org.zalando.problem.violations.ConstraintViolationProblemModule; diff --git a/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/WebApplicationTest.java b/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/WebApplicationTest.java index dc72659d..ffd9ef84 100644 --- a/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/WebApplicationTest.java +++ b/problem-spring-web-autoconfigure/src/test/java/org/zalando/problem/spring/web/autoconfigure/WebApplicationTest.java @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Configuration; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.spring.web.advice.AdviceTrait; import org.zalando.problem.violations.ConstraintViolationProblemModule; diff --git a/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/AdviceTraitTesting.java b/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/AdviceTraitTesting.java index 68a095cb..1e01d6ca 100644 --- a/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/AdviceTraitTesting.java +++ b/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/AdviceTraitTesting.java @@ -8,7 +8,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.accept.ContentNegotiationManager; import org.springframework.web.accept.FixedContentNegotiationStrategy; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.spring.web.advice.example.ExampleRestController; import static java.util.Collections.singletonList; diff --git a/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/general/NestedThrowableAdviceTraitTest.java b/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/general/NestedThrowableAdviceTraitTest.java index c88a2b3d..ca465d7f 100644 --- a/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/general/NestedThrowableAdviceTraitTest.java +++ b/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/general/NestedThrowableAdviceTraitTest.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.spring.web.advice.AdviceTraitTesting; import org.zalando.problem.spring.web.advice.ProblemHandling; diff --git a/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/security/SecurityAdviceTraitTest.java b/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/security/SecurityAdviceTraitTest.java index 55324ea7..cc52a6b2 100644 --- a/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/security/SecurityAdviceTraitTest.java +++ b/problem-spring-web/src/test/java/org/zalando/problem/spring/web/advice/security/SecurityAdviceTraitTest.java @@ -27,7 +27,7 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.spring.common.MediaTypes; import org.zalando.problem.spring.web.advice.ProblemHandling; diff --git a/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/AdviceTraitTesting.java b/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/AdviceTraitTesting.java index 6a31257e..0ab11ea8 100644 --- a/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/AdviceTraitTesting.java +++ b/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/AdviceTraitTesting.java @@ -8,7 +8,7 @@ import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.web.reactive.function.client.ExchangeStrategies; import org.springframework.web.server.adapter.WebHttpHandlerBuilder; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.spring.webflux.advice.example.ExampleRestController; import org.zalando.problem.violations.ConstraintViolationProblemModule; diff --git a/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/general/NestedThrowableAdviceTraitTest.java b/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/general/NestedThrowableAdviceTraitTest.java index f3695a9f..757937b4 100644 --- a/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/general/NestedThrowableAdviceTraitTest.java +++ b/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/general/NestedThrowableAdviceTraitTest.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.spring.common.MediaTypes; import org.zalando.problem.spring.webflux.advice.AdviceTraitTesting; import org.zalando.problem.spring.webflux.advice.ProblemHandling; diff --git a/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/security/SecurityAdviceTraitTest.java b/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/security/SecurityAdviceTraitTest.java index e7b83e37..d701986d 100644 --- a/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/security/SecurityAdviceTraitTest.java +++ b/problem-spring-webflux/src/test/java/org/zalando/problem/spring/webflux/advice/security/SecurityAdviceTraitTest.java @@ -21,7 +21,7 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.reactive.config.EnableWebFlux; import org.springframework.web.reactive.config.WebFluxConfigurationSupport; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import org.zalando.problem.spring.common.MediaTypes; import org.zalando.problem.spring.webflux.advice.ProblemHandling; diff --git a/problem-violations/src/main/java/org/zalando/problem/violations/ConstraintViolationProblemModule.java b/problem-violations/src/main/java/org/zalando/problem/violations/ConstraintViolationProblemModule.java index 094a6d64..3f0101ec 100644 --- a/problem-violations/src/main/java/org/zalando/problem/violations/ConstraintViolationProblemModule.java +++ b/problem-violations/src/main/java/org/zalando/problem/violations/ConstraintViolationProblemModule.java @@ -9,7 +9,7 @@ import static org.apiguardian.api.API.Status.STABLE; /** - * A companion to {@link org.zalando.problem.ProblemModule} to enable serialization + * A companion to {@link org.zalando.problem.jackson.ProblemModule} to enable serialization * of {@link ConstraintViolationProblem} and {@link Violation} without relying on auto detection. */ @API(status = STABLE) diff --git a/problem-violations/src/test/java/org/zalando/problem/violations/ConstraintViolationProblemModuleTest.java b/problem-violations/src/test/java/org/zalando/problem/violations/ConstraintViolationProblemModuleTest.java index 784c43c5..5d1bacd3 100644 --- a/problem-violations/src/test/java/org/zalando/problem/violations/ConstraintViolationProblemModuleTest.java +++ b/problem-violations/src/test/java/org/zalando/problem/violations/ConstraintViolationProblemModuleTest.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.json.JsonMapper; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; -import org.zalando.problem.ProblemModule; +import org.zalando.problem.jackson.ProblemModule; import java.net.URI;