Merge pull request #535 from zalando/feature/re-integrate-tags

Re-integrate changes from latest tag
zalando · Sep 23, 2020 · 947d0ef · 947d0ef
2 parents d28d6cd + db09833
commit 947d0ef
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 12 deletions.
diff --git a/.java-version b/.java-version
@@ -0,0 +1 @@
+1.8
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.zalando</groupId>
     <artifactId>problem-spring-parent</artifactId>
-    <version>0.26.0-SNAPSHOT</version>
+    <version>0.27.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <url>https://github.com/zalando/problem-spring-web</url>
     <organization>
@@ -170,9 +170,11 @@
             </exclusions>
         </dependency>
         <dependency>
+            <!-- CVE-2017-18640 -->
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <version>1.27</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/problem-spring-common/pom.xml b/problem-spring-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>problem-spring-parent</artifactId>
-        <version>0.26.0-SNAPSHOT</version>
+        <version>0.27.0-SNAPSHOT</version>
     </parent>
     <artifactId>problem-spring-common</artifactId>
     <dependencies>

diff --git a/problem-spring-web-autoconfigure/pom.xml b/problem-spring-web-autoconfigure/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>problem-spring-parent</artifactId>
-        <version>0.26.0-SNAPSHOT</version>
+        <version>0.27.0-SNAPSHOT</version>
     </parent>
     <artifactId>problem-spring-web-autoconfigure</artifactId>
     <dependencies>

diff --git a/.../src/main/java/org/zalando/problem/spring/web/autoconfigure/ProblemAutoConfiguration.java b/.../src/main/java/org/zalando/problem/spring/web/autoconfigure/ProblemAutoConfiguration.java
@@ -1,20 +1,17 @@
 package org.zalando.problem.spring.web.autoconfigure;
 
 import org.apiguardian.api.API;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.WebSecurityConfigurer;
 import org.zalando.problem.spring.web.advice.AdviceTrait;
 
 import static org.apiguardian.api.API.Status.INTERNAL;
 
 @API(status = INTERNAL)
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication
-@ConditionalOnClass(WebSecurityConfigurer.class)
 public class ProblemAutoConfiguration {
 
     @Bean

diff --git a/...g/zalando/problem/spring/web/autoconfigure/security/ProblemSecurityAutoConfiguration.java b/...g/zalando/problem/spring/web/autoconfigure/security/ProblemSecurityAutoConfiguration.java
@@ -2,7 +2,6 @@
 
 import lombok.AllArgsConstructor;
 import org.apiguardian.api.API;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -26,7 +25,7 @@
 import static org.apiguardian.api.API.Status.INTERNAL;
 
 @API(status = INTERNAL)
-@AllArgsConstructor(onConstructor = @__(@Autowired))
+@AllArgsConstructor
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication
 @ConditionalOnClass(WebSecurityConfigurer.class)

diff --git a/problem-spring-web-starter/pom.xml b/problem-spring-web-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>problem-spring-parent</artifactId>
         <groupId>org.zalando</groupId>
-        <version>0.26.0-SNAPSHOT</version>
+        <version>0.27.0-SNAPSHOT</version>
     </parent>
     <artifactId>problem-spring-web-starter</artifactId>
     <dependencies>

diff --git a/problem-spring-web/pom.xml b/problem-spring-web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>problem-spring-parent</artifactId>
-        <version>0.26.0-SNAPSHOT</version>
+        <version>0.27.0-SNAPSHOT</version>
     </parent>
     <artifactId>problem-spring-web</artifactId>
     <dependencies>

diff --git a/problem-spring-webflux/pom.xml b/problem-spring-webflux/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>problem-spring-parent</artifactId>
-        <version>0.26.0-SNAPSHOT</version>
+        <version>0.27.0-SNAPSHOT</version>
     </parent>
     <artifactId>problem-spring-webflux</artifactId>
     <dependencies>

diff --git a/problem-violations/pom.xml b/problem-violations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>problem-spring-parent</artifactId>
-        <version>0.26.0-SNAPSHOT</version>
+        <version>0.27.0-SNAPSHOT</version>
     </parent>
     <artifactId>problem-violations</artifactId>
 </project>