Get Spring Boot 2 release onto master

pom.xml

@@ -7,7 +7,7 @@
     <groupId>ucles.weblab</groupId>
     <artifactId>weblab-spring-boot</artifactId>
     <packaging>pom</packaging>
-    <version>0.5-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
 
     <modules>
         <module>weblab-spring-boot-starter</module>
@@ -18,8 +18,9 @@
     </modules>
 
     <properties>
-        <common-java.version>0.5-SNAPSHOT</common-java.version>
-        <spring-boot.version>1.5.3.RELEASE</spring-boot.version>
+        <common-java.version>2.0.0-SNAPSHOT</common-java.version>
+        <spring-boot.version>2.0.2.RELEASE</spring-boot.version>
+        <spring-security-jwt.version>1.0.9.RELEASE</spring-security-jwt.version>
         <activiti.version>5.19.0.1</activiti.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

weblab-spring-boot-autoconfiguration/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>weblab-spring-boot</artifactId>
         <groupId>ucles.weblab</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -36,11 +36,6 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>ucles.weblab</groupId>
-            <artifactId>weblab-files</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>ucles.weblab</groupId>
             <artifactId>weblab-audit</artifactId>

weblab-spring-boot-autoconfiguration/src/main/java/ucles/weblab/common/config/feedback/FeedbackAutoConfiguration.java

@@ -8,8 +8,8 @@
 import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.DispatcherServletAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;

weblab-spring-boot-autoconfiguration/src/main/java/ucles/weblab/common/config/forms/FormsMongoAutoConfiguration.java

@@ -8,8 +8,8 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.DispatcherServletAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -33,16 +33,16 @@
 //@ConditionalOnBean(MongoOperations.class)
 @ConditionalOnProperty(prefix = "spring.data.mongodb.repositories", name = "enabled", havingValue = "true", matchIfMissing = true)
 @EnableMongoRepositories(basePackageClasses = {FormRepositoryMongo.class})
-public class FormsMongoAutoConfiguration {      
-        
-    
+public class FormsMongoAutoConfiguration {
+
+
     @Configuration
     @AutoConfigureAfter({DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class})
     @ConditionalOnWebApplication
     @ConditionalOnClass({RestController.class, ResourceAssembler.class, ObjectMapper.class})
     @ComponentScan(basePackageClasses = {FormController.class })
     public static class FormsAutoConfigurationWeb {
-       
+
         @Bean
         public FormResourceAssembler formResourceAssembler(ObjectMapper objectMapper) {
             return new FormResourceAssembler(objectMapper);
@@ -55,9 +55,9 @@ public FormDelegate formDelegate(FormRepositoryMongo formRepositoryMongo,
                                         ObjectMapper objectMapper) {
             return new FormDelegate(formRepositoryMongo, formAssembler, formFactory, objectMapper);
         }
-    
+
     }
-    
+
     @Bean
     public FormFactory formFactoryMongo() {
         return new FormFactoryMongo();

weblab-spring-boot-autoconfiguration/src/main/java/ucles/weblab/common/config/schema/SchemaCreatorAutoConfiguration.java

@@ -6,12 +6,13 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
 import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
 import org.springframework.security.core.context.SecurityContextHolder;
+import ucles.weblab.common.config.xc.CrossContextAutoConfiguration;
 import ucles.weblab.common.i18n.service.LocalisationService;
 import ucles.weblab.common.schema.webapi.ControllerMethodSchemaCreator;
 import ucles.weblab.common.schema.webapi.EnumSchemaCreator;
@@ -27,7 +28,7 @@
 @Configuration
 @ConditionalOnBean({ ObjectMapper.class, CrossContextConversionService.class })
 @ConditionalOnClass({ SecurityContextHolder.class, JsonSchemaFactory.class, SecurityChecker.class, MethodSecurityExpressionHandler.class, ResourceSchemaCreator.class })
-@AutoConfigureAfter(SecurityAutoConfiguration.class)
+@AutoConfigureAfter({SecurityAutoConfiguration.class, CrossContextAutoConfiguration.class})
 public class SchemaCreatorAutoConfiguration {
 
     @Bean

weblab-spring-boot-autoconfiguration/src/main/java/ucles/weblab/common/config/xc/CrossContextAutoConfiguration.java

@@ -9,8 +9,8 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.autoconfigure.web.DispatcherServletAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

weblab-spring-boot-autoconfiguration/src/main/resources/META-INF/spring.factories

@@ -1,8 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  ucles.weblab.common.config.files.FilesAutoConfiguration,\
-  ucles.weblab.common.config.files.FilesJpaAutoConfiguration,\
-  ucles.weblab.common.config.files.FilesMongoAutoConfiguration,\
-  ucles.weblab.common.config.files.FilesS3AutoConfiguration,\
   ucles.weblab.common.config.audit.AuditAutoConfiguration,\
   ucles.weblab.common.config.forms.FormsAutoConfiguration,\
   ucles.weblab.common.config.feedback.FeedbackAutoConfiguration,\

weblab-spring-boot-starter-actions/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>weblab-spring-boot</artifactId>
         <groupId>ucles.weblab</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

weblab-spring-boot-starter-actions/src/main/java/ucles/weblab/common/actions/webapi/ActionDecorator.java

@@ -3,17 +3,18 @@
 import com.fasterxml.jackson.module.jsonSchema.types.NullSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.MethodIntrospector;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.hateoas.ResourceSupport;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.method.HandlerMethodSelector;
 import ucles.weblab.common.i18n.service.LocalisationService;
 import ucles.weblab.common.schema.webapi.ResourceSchemaCreator;
 import ucles.weblab.common.security.SecurityChecker;
@@ -172,8 +173,8 @@ private Optional<ActionableResourceSupport.Action> processControllerAction(Actio
     }
 
     private Method findControllerMethod(ActionCommand actionCommand) {
-        final Set<Method> methods = HandlerMethodSelector.selectMethods(actionCommand.controller(),
-                method -> actionCommand.method().equals(method.getName()));
+        final Set<Method> methods = MethodIntrospector.selectMethods(actionCommand.controller(),
+                (ReflectionUtils.MethodFilter) method -> actionCommand.method().equals(method.getName()));
         if (methods.size() > 1) {
             log.error("More than one controller method matches ");
             return null;

weblab-spring-boot-starter-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>weblab-spring-boot</artifactId>
         <groupId>ucles.weblab</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -64,6 +64,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-jwt</artifactId>
+            <version>${spring-security-jwt.version}</version>
         </dependency>
         <!--<dependency>
             <groupId>org.springframework</groupId>

weblab-spring-boot-starter-workflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>weblab-spring-boot</artifactId>
         <groupId>ucles.weblab</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

weblab-spring-boot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>weblab-spring-boot</artifactId>
         <groupId>ucles.weblab</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

weblab-spring-boot-starter/src/main/java/ucles/weblab/common/config/CommonConfig.java

@@ -8,8 +8,8 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.autoconfigure.web.DispatcherServletAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.MultipartProperties;
+import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.MultipartProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;