Update Spring Framework and Spring Security to version 5.2.0 and Spri…

…ng Boot to version 2.2.0.
PascalSchumacher · Sep 11, 2019 · 1e88c2f · 1e88c2f
1 parent 7b86c52
commit 1e88c2f
Show file tree

Hide file tree

Showing 17 changed files with 62 additions and 34 deletions.
diff --git a/...e-app-engine-rest/src/test/java/org/flowable/app/rest/DispatcherServletConfiguration.java b/...e-app-engine-rest/src/test/java/org/flowable/app/rest/DispatcherServletConfiguration.java
@@ -21,14 +21,17 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.servlet.resource.ResourceUrlProvider;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -59,9 +62,9 @@ public MultipartResolver multipartResolver() {
         return new PutAwareStandardServletMultiPartResolver();
     }
 
-    @Bean
     @Override
-    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
+    public RequestMappingHandlerMapping requestMappingHandlerMapping(ContentNegotiationManager mvcContentNegotiationManager,
+            FormattingConversionService mvcConversionService, ResourceUrlProvider mvcResourceUrlProvider) {
         LOGGER.debug("Creating requestMappingHandlerMapping");
         RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
         requestMappingHandlerMapping.setUseSuffixPatternMatch(false);

diff --git a/...ble-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationSecurityTest.java b/...ble-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationSecurityTest.java
@@ -57,7 +57,6 @@ public class FlowableRestApplicationSecurityTest {
         Arrays.asList(
             "self",
             "flowable",
-            "auditevents",
             "beans",
             "health",
             "conditions",
@@ -72,7 +71,6 @@ public class FlowableRestApplicationSecurityTest {
             "metrics",
             "metrics-requiredMetricName",
             "scheduledtasks",
-            "httptrace",
             "mappings",
             "caches",
             "caches-cache",

diff --git a/...owable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/DispatcherServletConfiguration.java b/...owable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/DispatcherServletConfiguration.java
@@ -21,14 +21,17 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.servlet.resource.ResourceUrlProvider;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -59,9 +62,9 @@ public MultipartResolver multipartResolver() {
         return new PutAwareStandardServletMultiPartResolver();
     }
 
-    @Bean
     @Override
-    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
+    public RequestMappingHandlerMapping requestMappingHandlerMapping(ContentNegotiationManager mvcContentNegotiationManager,
+            FormattingConversionService mvcConversionService, ResourceUrlProvider mvcResourceUrlProvider) {
         LOGGER.debug("Creating requestMappingHandlerMapping");
         RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
         requestMappingHandlerMapping.setUseSuffixPatternMatch(false);

diff --git a/...-content-rest/src/test/java/org/flowable/content/rest/DispatcherServletConfiguration.java b/...-content-rest/src/test/java/org/flowable/content/rest/DispatcherServletConfiguration.java
@@ -21,14 +21,17 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.servlet.resource.ResourceUrlProvider;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -59,9 +62,9 @@ public MultipartResolver multipartResolver() {
         return new PutAwareStandardServletMultiPartResolver();
     }
 
-    @Bean
     @Override
-    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
+    public RequestMappingHandlerMapping requestMappingHandlerMapping(ContentNegotiationManager mvcContentNegotiationManager,
+            FormattingConversionService mvcConversionService, ResourceUrlProvider mvcResourceUrlProvider) {
         LOGGER.debug("Creating requestMappingHandlerMapping");
         RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
         requestMappingHandlerMapping.setUseSuffixPatternMatch(false);

diff --git a/...flowable-dmn-rest/src/test/java/org/flowable/dmn/rest/DispatcherServletConfiguration.java b/...flowable-dmn-rest/src/test/java/org/flowable/dmn/rest/DispatcherServletConfiguration.java
@@ -21,14 +21,17 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.servlet.resource.ResourceUrlProvider;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -59,9 +62,9 @@ public MultipartResolver multipartResolver() {
         return new PutAwareStandardServletMultiPartResolver();
     }
 
-    @Bean
     @Override
-    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
+    public RequestMappingHandlerMapping requestMappingHandlerMapping(ContentNegotiationManager mvcContentNegotiationManager,
+            FormattingConversionService mvcConversionService, ResourceUrlProvider mvcResourceUrlProvider) {
         LOGGER.debug("Creating requestMappingHandlerMapping");
         RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
         requestMappingHandlerMapping.setUseSuffixPatternMatch(false);

diff --git a/...owable-form-rest/src/test/java/org/flowable/form/rest/DispatcherServletConfiguration.java b/...owable-form-rest/src/test/java/org/flowable/form/rest/DispatcherServletConfiguration.java
@@ -20,14 +20,17 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.servlet.resource.ResourceUrlProvider;
 
 import java.util.List;
 
@@ -58,9 +61,9 @@ public MultipartResolver multipartResolver() {
         return new PutAwareStandardServletMultiPartResolver();
     }
 
-    @Bean
     @Override
-    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
+    public RequestMappingHandlerMapping requestMappingHandlerMapping(ContentNegotiationManager mvcContentNegotiationManager,
+            FormattingConversionService mvcConversionService, ResourceUrlProvider mvcResourceUrlProvider) {
         LOGGER.debug("Creating requestMappingHandlerMapping");
         RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
         requestMappingHandlerMapping.setUseSuffixPatternMatch(false);

diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/DispatcherServletConfiguration.java b/modules/flowable-rest/src/test/java/org/flowable/rest/DispatcherServletConfiguration.java
@@ -21,14 +21,17 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.servlet.resource.ResourceUrlProvider;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -59,9 +62,9 @@ public MultipartResolver multipartResolver() {
         return new PutAwareStandardServletMultiPartResolver();
     }
 
-    @Bean
     @Override
-    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
+    public RequestMappingHandlerMapping requestMappingHandlerMapping(ContentNegotiationManager mvcContentNegotiationManager,
+            FormattingConversionService mvcConversionService, ResourceUrlProvider mvcResourceUrlProvider) {
         LOGGER.debug("Creating requestMappingHandlerMapping");
         RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
         requestMappingHandlerMapping.setUseSuffixPatternMatch(false);

diff --git a/...-autoconfigure/src/main/java/org/flowable/spring/boot/DispatcherServletConfiguration.java b/...-autoconfigure/src/main/java/org/flowable/spring/boot/DispatcherServletConfiguration.java
@@ -23,15 +23,18 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.servlet.resource.ResourceUrlProvider;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -70,9 +73,9 @@ public MultipartResolver multipartResolver() {
         return multipartResolver;
     }
 
-    @Bean
     @Override
-    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
+    public RequestMappingHandlerMapping requestMappingHandlerMapping(ContentNegotiationManager mvcContentNegotiationManager,
+            FormattingConversionService mvcConversionService, ResourceUrlProvider mvcResourceUrlProvider) {
         LOGGER.debug("Creating requestMappingHandlerMapping");
         RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
         requestMappingHandlerMapping.setUseSuffixPatternMatch(false);

diff --git a/...le-spring/src/test/java/org/flowable/spring/test/autodeployment/SpringAutoDeployTest.java b/...le-spring/src/test/java/org/flowable/spring/test/autodeployment/SpringAutoDeployTest.java
@@ -98,7 +98,7 @@ public void testNoRedeploymentForSpringContainerRestart() throws Exception {
     public void testResourceRedeploymentAfterProcessDefinitionChange() throws Exception {
         createAppContext(CTX_PATH);
         assertEquals(1, repositoryService.createDeploymentQuery().count());
-        ((AbstractXmlApplicationContext) applicationContext).destroy();
+        ((AbstractXmlApplicationContext) applicationContext).close();
 
         String filePath = "org/flowable/spring/test/autodeployment/autodeploy.a.bpmn20.xml";
         String originalBpmnFileContent = IoUtil.readFileAsString(filePath);

diff --git a/...src/test/java/org/flowable/ui/admin/application/FlowableAdminApplicationSecurityTest.java b/...src/test/java/org/flowable/ui/admin/application/FlowableAdminApplicationSecurityTest.java
@@ -59,7 +59,6 @@ public class FlowableAdminApplicationSecurityTest {
     private static final Set<String> ACTUATOR_LINKS = new HashSet<>(
         Arrays.asList(
             "self",
-            "auditevents",
             "beans",
             "health",
             "conditions",
@@ -74,7 +73,6 @@ public class FlowableAdminApplicationSecurityTest {
             "metrics",
             "metrics-requiredMetricName",
             "scheduledtasks",
-            "httptrace",
             "mappings",
             "caches",
             "caches-cache",

diff --git a/...app/src/test/java/org/flowable/ui/idm/application/FlowableIdmApplicationSecurityTest.java b/...app/src/test/java/org/flowable/ui/idm/application/FlowableIdmApplicationSecurityTest.java
@@ -61,7 +61,6 @@ public class FlowableIdmApplicationSecurityTest {
     private static final Set<String> ACTUATOR_LINKS = new HashSet<>(
         Arrays.asList(
             "self",
-            "auditevents",
             "beans",
             "health",
             "conditions",
@@ -76,7 +75,6 @@ public class FlowableIdmApplicationSecurityTest {
             "metrics",
             "metrics-requiredMetricName",
             "scheduledtasks",
-            "httptrace",
             "mappings",
             "caches",
             "caches-cache",

diff --git a/...idm-conf/src/main/java/org/flowable/ui/idm/servlet/ApiDispatcherServletConfiguration.java b/...idm-conf/src/main/java/org/flowable/ui/idm/servlet/ApiDispatcherServletConfiguration.java
@@ -18,12 +18,15 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.servlet.resource.ResourceUrlProvider;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -40,12 +43,13 @@ public SessionLocaleResolver localeResolver() {
         return new SessionLocaleResolver();
     }
 
-    @Bean
-    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
+    @Override
+    public RequestMappingHandlerMapping requestMappingHandlerMapping(ContentNegotiationManager mvcContentNegotiationManager,
+            FormattingConversionService mvcConversionService, ResourceUrlProvider mvcResourceUrlProvider) {
         RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
         requestMappingHandlerMapping.setUseSuffixPatternMatch(false);
         requestMappingHandlerMapping.setRemoveSemicolonContent(false);
-        requestMappingHandlerMapping.setInterceptors(getInterceptors());
+        requestMappingHandlerMapping.setInterceptors(getInterceptors(mvcConversionService, mvcResourceUrlProvider));
         return requestMappingHandlerMapping;
     }
 

diff --git a/...idm-conf/src/main/java/org/flowable/ui/idm/servlet/AppDispatcherServletConfiguration.java b/...idm-conf/src/main/java/org/flowable/ui/idm/servlet/AppDispatcherServletConfiguration.java
@@ -45,6 +45,7 @@ public LocaleChangeInterceptor localeChangeInterceptor() {
         return localeChangeInterceptor;
     }
 
+    @Override
     public RequestMappingHandlerMapping getRequestMappingHandlerMapping() {
         LOGGER.debug("Creating requestMappingHandlerMapping");
         RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();

diff --git a/...test/java/org/flowable/ui/modeler/application/FlowableModelerApplicationSecurityTest.java b/...test/java/org/flowable/ui/modeler/application/FlowableModelerApplicationSecurityTest.java
@@ -59,7 +59,6 @@ public class FlowableModelerApplicationSecurityTest {
     private static final Set<String> ACTUATOR_LINKS = new HashSet<>(
         Arrays.asList(
             "self",
-            "auditevents",
             "beans",
             "health",
             "conditions",
@@ -74,7 +73,6 @@ public class FlowableModelerApplicationSecurityTest {
             "metrics",
             "metrics-requiredMetricName",
             "scheduledtasks",
-            "httptrace",
             "mappings",
             "caches",
             "caches-cache",

diff --git a/...conf/src/main/java/org/flowable/ui/modeler/servlet/ApiDispatcherServletConfiguration.java b/...conf/src/main/java/org/flowable/ui/modeler/servlet/ApiDispatcherServletConfiguration.java
@@ -18,12 +18,15 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.servlet.resource.ResourceUrlProvider;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -40,12 +43,13 @@ public SessionLocaleResolver localeResolver() {
         return new SessionLocaleResolver();
     }
 
-    @Bean
-    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
+    @Override
+    public RequestMappingHandlerMapping requestMappingHandlerMapping(ContentNegotiationManager mvcContentNegotiationManager,
+            FormattingConversionService mvcConversionService, ResourceUrlProvider mvcResourceUrlProvider) {
         RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
         requestMappingHandlerMapping.setUseSuffixPatternMatch(false);
         requestMappingHandlerMapping.setRemoveSemicolonContent(false);
-        requestMappingHandlerMapping.setInterceptors(getInterceptors());
+        requestMappingHandlerMapping.setInterceptors(getInterceptors(mvcConversionService, mvcResourceUrlProvider));
         return requestMappingHandlerMapping;
     }
 

diff --git a/...p/src/test/java/org/flowable/ui/task/application/FlowableTaskApplicationSecurityTest.java b/...p/src/test/java/org/flowable/ui/task/application/FlowableTaskApplicationSecurityTest.java
@@ -59,7 +59,6 @@ public class FlowableTaskApplicationSecurityTest {
     private static final Set<String> ACTUATOR_LINKS = new HashSet<>(
         Arrays.asList(
             "self",
-            "auditevents",
             "beans",
             "health",
             "conditions",
@@ -74,7 +73,6 @@ public class FlowableTaskApplicationSecurityTest {
             "metrics",
             "metrics-requiredMetricName",
             "scheduledtasks",
-            "httptrace",
             "flowable",
             "mappings",
             "caches",