Migrate to Spring Boot 2

build.gradle

@@ -23,7 +23,8 @@ apply plugin: 'pmd'
 
 apply plugin: 'com.github.kt3k.coveralls'
 
-sourceCompatibility = 1.7
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 group = "com.github.jmnarloch"
 archivesBaseName="modelmapper-spring-boot-starter"
@@ -38,7 +39,7 @@ task wrapper(type: Wrapper) {
 
 jar {
     manifest {
-        attributes 'Implementation-Title': 'Spring Boot Starter for ModelMapper',
+        attributes 'Implementation-Title': 'Spring Boot 2 Starter for ModelMapper',
                    'Implementation-Version': version
     }
 }
@@ -57,8 +58,6 @@ dependencies {
     compile (libraries.modelMapper)
 
     testCompile (libraries.springBootTest)
-    testCompile (libraries.junit)
-    testCompile (libraries.mockito)
 }
 
 findbugs {

gradle.properties

@@ -1,2 +1,2 @@
-#Tue, 10 Nov 2015 00:11:37 +0100
-version=1.1.1-SNAPSHOT
+#Tue, 6 Nov 2018
+version=2.0.0-SNAPSHOT

libraries.gradle

@@ -1,12 +1,9 @@
 ext {
 
     libraries = [
-            springBoot : 'org.springframework.boot:spring-boot-starter:1.2.5.RELEASE',
-            springBootTest : 'org.springframework.boot:spring-boot-starter-test:1.2.5.RELEASE',
+            springBoot : 'org.springframework.boot:spring-boot-starter:2.1.0.RELEASE',
+            springBootTest : 'org.springframework.boot:spring-boot-starter-test:2.1.0.RELEASE',
 
-            modelMapper : 'org.modelmapper:modelmapper:0.7.5',
-
-            junit        : 'junit:junit:4.12',
-            mockito      : 'org.mockito:mockito-all:1.10.19'
+            modelMapper : 'org.modelmapper:modelmapper:2.3.1'
     ]
 }

src/main/java/com/github/jmnarloch/spring/boot/modelmapper/ConverterConfigurerSupport.java

@@ -44,7 +44,6 @@ public abstract class ConverterConfigurerSupport<S, D> implements ModelMapperCon
      */
     @Override
     public void configure(ModelMapper modelMapper) {
-
         modelMapper.addConverter(converter());
     }
 }

src/main/java/com/github/jmnarloch/spring/boot/modelmapper/ModelMapperAutoConfiguration.java

@@ -41,7 +41,6 @@ public class ModelMapperAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean(ModelMapperFactoryBean.class)
     public ModelMapperFactoryBean modelMapperFactoryBean() {
-
         return new ModelMapperFactoryBean();
     }
 }

src/main/java/com/github/jmnarloch/spring/boot/modelmapper/ModelMapperFactoryBean.java

@@ -79,9 +79,7 @@ public boolean isSingleton() {
      */
     private void configure(ModelMapper modelMapper) {
         if (configurers != null) {
-            for (ModelMapperConfigurer modelMapperConfigurer : configurers) {
-                modelMapperConfigurer.configure(modelMapper);
-            }
+            configurers.forEach(modelMapperConfigurer -> modelMapperConfigurer.configure(modelMapper));
         }
     }
 }

src/main/java/com/github/jmnarloch/spring/boot/modelmapper/PropertyMapConfigurerSupport.java

@@ -44,7 +44,6 @@ public abstract class PropertyMapConfigurerSupport<S, D> implements ModelMapperC
      */
     @Override
     public void configure(ModelMapper modelMapper) {
-
         modelMapper.addMappings(mapping());
     }
 }

src/test/java/com/github/jmnarloch/spring/boot/modelmapper/ConverterConfigurerSupportTest.java

@@ -25,9 +25,9 @@
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.springframework.util.Assert.notNull;
 
@@ -36,8 +36,8 @@
  *
  * @author Jakub Narloch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ConverterConfigurerSupportTest.Application.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = ConverterConfigurerSupportTest.Application.class)
 public class ConverterConfigurerSupportTest {
 
     @Autowired

src/test/java/com/github/jmnarloch/spring/boot/modelmapper/ModelMapperAutoConfigurationTest.java

@@ -20,9 +20,9 @@
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.List;
 
@@ -36,8 +36,8 @@
  *
  * @author Jakub Narloch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ModelMapperAutoConfigurationTest.Application.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = ModelMapperAutoConfigurationTest.Application.class)
 public class ModelMapperAutoConfigurationTest {
 
     @Autowired

src/test/java/com/github/jmnarloch/spring/boot/modelmapper/ModelMapperOrderedConfigurerTest.java

@@ -22,11 +22,11 @@
 import org.modelmapper.convention.MatchingStrategies;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.Arrays;
 import java.util.List;
@@ -39,8 +39,8 @@
  *
  * @author Jakub Narloch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ModelMapperOrderedConfigurerTest.Application.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = ModelMapperOrderedConfigurerTest.Application.class)
 public class ModelMapperOrderedConfigurerTest {
 
     @Autowired

src/test/java/com/github/jmnarloch/spring/boot/modelmapper/NoConfigurerModelMapperAutoConfigurationTest.java

@@ -20,8 +20,8 @@
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.springframework.util.Assert.notNull;
 
@@ -30,8 +30,8 @@
  *
  * @author Jakub Narloch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = NoConfigurerModelMapperAutoConfigurationTest.Application.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = NoConfigurerModelMapperAutoConfigurationTest.Application.class)
 public class NoConfigurerModelMapperAutoConfigurationTest {
 
     @Autowired

src/test/java/com/github/jmnarloch/spring/boot/modelmapper/PropertyMapConfigurerSupportTest.java

@@ -24,9 +24,9 @@
 import org.modelmapper.PropertyMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.springframework.util.Assert.notNull;
 
@@ -35,8 +35,8 @@
  *
  * @author Jakub Narloch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = PropertyMapConfigurerSupportTest.Application.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = PropertyMapConfigurerSupportTest.Application.class)
 public class PropertyMapConfigurerSupportTest {
 
     @Autowired