diff --git a/pom.xml b/pom.xml index 2b2c67e..428ff13 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.6.RELEASE + 2.3.5.RELEASE @@ -36,6 +36,11 @@ org.springframework.boot spring-boot-starter-web + + org.hibernate.validator + hibernate-validator + 6.1.6.Final + @@ -65,17 +70,6 @@ springfox-swagger-ui 2.9.2 - - - org.jboss.resteasy - resteasy-client - 3.1.4.Final - - - org.jboss.resteasy - resteasy-jackson2-provider - 3.1.4.Final - javax.ws.rs javax.ws.rs-api @@ -99,26 +93,26 @@ org.apache.commons commons-lang3 - 3.8 + 3.11 org.apache.commons commons-text - 1.6 + 1.9 org.jsoup jsoup - 1.8.3 + 1.10.2 org.springframework.boot spring-boot-starter-thymeleaf - 2.1.1.RELEASE + 2.3.5.RELEASE diff --git a/src/main/java/de/caritas/cob/mailservice/config/SecurityConfig.java b/src/main/java/de/caritas/cob/mailservice/config/SecurityConfig.java index 9607b77..942f5ea 100644 --- 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 index 25e568c..c9eb13e 100644 --- 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 index 31ae762..59db5ec 100644 --- 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 {