feat: update spring boot and dependencies

CaritasDeutschland · Nov 2, 2020 · b1c648a · b1c648a
1 parent 8966369
commit b1c648a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.6.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -36,6 +36,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate.validator</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>6.1.6.Final</version>
+		</dependency>
 
 		<!-- OpenApi/Swagger dependencies -->
 		<dependency>
@@ -65,17 +70,6 @@
 			<artifactId>springfox-swagger-ui</artifactId>
 			<version>2.9.2</version>
 		</dependency>
-
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-client</artifactId>
-			<version>3.1.4.Final</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-jackson2-provider</artifactId>
-			<version>3.1.4.Final</version>
-		</dependency>
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>javax.ws.rs-api</artifactId>
@@ -99,26 +93,26 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.8</version>
+			<version>3.11</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-text</artifactId>
-			<version>1.6</version>
+			<version>1.9</version>
 		</dependency>
 
 		<!-- Jsoup -->
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
-			<version>1.8.3</version>
+			<version>1.10.2</version>
 		</dependency>
 
 		<!-- thymeleaf -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-			<version>2.1.1.RELEASE</version><!--$NO-MVN-MAN-VER$ -->
+			<version>2.3.5.RELEASE</version><!--$NO-MVN-MAN-VER$ -->
 		</dependency>
 
 		<!-- Test scope dependencies -->

diff --git a/src/main/java/de/caritas/cob/mailservice/config/SecurityConfig.java b/src/main/java/de/caritas/cob/mailservice/config/SecurityConfig.java
@@ -30,7 +30,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
    */
   @Override
   protected void configure(HttpSecurity http) throws Exception {
-    super.configure(http);
     http.csrf().disable()
         .addFilterBefore(new StatelessCsrfFilter(csrfCookieProperty, csrfHeaderProperty),
             CsrfFilter.class)

diff --git a/src/test/java/de/caritas/cob/mailservice/api/controller/MailControllerTestExchangeIT.java b/src/test/java/de/caritas/cob/mailservice/api/controller/MailControllerTestExchangeIT.java
@@ -21,7 +21,7 @@
 
 @RunWith(SpringRunner.class)
 @WebMvcTest(MailController.class)
-@AutoConfigureMockMvc(secure = false)
+@AutoConfigureMockMvc(addFilters = false)
 @TestPropertySource(properties = {"mail.usesmtp=false"})
 public class MailControllerTestExchangeIT {
 

diff --git a/src/test/java/de/caritas/cob/mailservice/api/controller/MailControllerTestSmtpIT.java b/src/test/java/de/caritas/cob/mailservice/api/controller/MailControllerTestSmtpIT.java
@@ -21,7 +21,7 @@
 
 @RunWith(SpringRunner.class)
 @WebMvcTest(MailController.class)
-@AutoConfigureMockMvc(secure = false)
+@AutoConfigureMockMvc(addFilters = false)
 @TestPropertySource(properties = {"mail.usesmtp=true"})
 public class MailControllerTestSmtpIT {