LIBS-396 JDK11 & SpringBoot 2.1 & Build improved (#6)

julian-eggers · Sven Illgen · commit fc042b9b5623 · 2018-11-15T17:01:38.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,20 +7,16 @@ language: java
 
 jdk:
   - oraclejdk8
+  - oraclejdk11  
 
 cache:
   directories:
   - $HOME/.m2
 
+install: mvn verify -Dgpg.skip=true
+  
 before_install:
-  - wget -O ~/codacy-coverage-reporter-assembly.jar https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/4.0.0/codacy-coverage-reporter-4.0.0-assembly.jar
-
-install: 
-  - mvn clean compile
+  - wget -O ~/codacy-coverage-reporter-assembly.jar https://github.com/codacy/codacy-coverage-reporter/releases/download/4.0.5/codacy-coverage-reporter-4.0.5-assembly.jar
 
-script: 
-  - mvn verify -Dgpg.skip=true
-  
 after_success:
-  - mvn coveralls:report
   - java -jar ~/codacy-coverage-reporter-assembly.jar report -l Java -r target/site/jacoco/jacoco.xml
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,7 +1,13 @@
-pipeline 
+pipeline
 {
     agent any
 
+    environment
+    {
+        deploymentBranch = "master"
+        mavenExecutable = "mvn-jdk8"
+    }
+
     triggers
     {
         cron('H H(0-5) * * *')
@@ -22,42 +28,56 @@ pipeline
         {
             steps
             {
-                sh 'mvn clean compile test-compile'
+                sh '${mavenExecutable} clean compile test-compile'
             }
         }
-  
+
         stage('Unit-Tests')
         {
             steps
             {
-                sh 'mvn surefire:test'
+                sh '${mavenExecutable} surefire:test'
             }
         }
-  
+
         stage('Integration-Tests')
         {
+            when { branch "${env.deploymentBranch}" }
+
             steps
             {
-                sh 'mvn failsafe:integration-test failsafe:verify'
+                sh '${mavenExecutable} failsafe:integration-test failsafe:verify'
             }
         }
-        
+
         stage('Release')
         {
-            when { branch "master" }
-        
+            when { branch "${env.deploymentBranch}" }
+
             steps
             {
-                sh 'mvn clean deploy -Dmaven.test.skip=true'
+                 sh '${mavenExecutable} clean deploy -Dmaven.test.skip=true'
             }
         }
-        
+
         stage('SonarQube')
         {
+            when { branch "${env.deploymentBranch}" }
+
             steps
             {
-                sh 'mvn clean verify sonar:sonar -Dsonar.host.url=http://sonarqube.avidesmedia/'
+                sh '${mavenExecutable} clean verify sonar:sonar -Dsonar.host.url=http://sonarqube.avidesmedia/'
             }
-        } 
+        }
+
+        stage('POM-Analysis')
+        {
+            when { branch "${env.deploymentBranch}" }
+
+            steps
+            {
+                 sh '${mavenExecutable} enforcer:enforce'
+            }
+        }
     }
 }
diff --git a/README.md b/README.md
@@ -2,16 +2,16 @@ springboot-testcontainer-mongodb
 ================================
 
 [![Maven Central](https://img.shields.io/maven-metadata/v/http/central.maven.org/maven2/com/avides/springboot/testcontainer/springboot-testcontainer-mongodb/maven-metadata.xml.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.avides.springboot.testcontainer%22%20AND%20a%3A%22springboot-testcontainer-mongodb%22)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/5e0661e8bfe04eb28e66015aa0611483)](https://www.codacy.com/app/avides-builds/springboot-testcontainer-mongodb?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=springboot-testcontainer/springboot-testcontainer-mongodb&amp;utm_campaign=Badge_Grade)
-[![Coverage Status](https://coveralls.io/repos/springboot-testcontainer/springboot-testcontainer-mongodb/badge.svg)](https://coveralls.io/r/springboot-testcontainer/springboot-testcontainer-mongodb)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/5e0661e8bfe04eb28e66015aa0611483)](https://www.codacy.com/app/avides-builds/springboot-testcontainer-mongodb)
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/5e0661e8bfe04eb28e66015aa0611483)](https://www.codacy.com/app/avides-builds/springboot-testcontainer-mongodb)
 [![Build Status](https://travis-ci.org/springboot-testcontainer/springboot-testcontainer-mongodb.svg?branch=master)](https://travis-ci.org/springboot-testcontainer/springboot-testcontainer-mongodb)
 
 ### Dependency
 ```xml
 <dependency>
 	<groupId>com.avides.springboot.testcontainer</groupId>
 	<artifactId>springboot-testcontainer-mongodb</artifactId>
-	<version>0.1.0-RC5</version>
+	<version>0.1.0-RC6</version>
 	<scope>test</scope>
 </dependency>
 ```
@@ -20,7 +20,7 @@ springboot-testcontainer-mongodb
 Properties consumed (in `bootstrap.properties`):
 - `embedded.container.mongodb.enabled` (default is `true`)
 - `embedded.container.mongodb.startup-timeout` (default is `30`)
-- `embedded.container.mongodb.docker-image` (default is `mongo:3.4.15`)
+- `embedded.container.mongodb.docker-image` (default is `mongo:3.4.18`)
 - `embedded.container.mongodb.port` (default is `27017`)
 
 Properties provided (in `application-it.properties`):
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <name>springboot-testcontainer-mongodb</name>
   <description>MongoDB test-container</description>
   <url>https://github.com/springboot-testcontainer/springboot-testcontainer-mongodb</url>
-  <version>0.1.0-RC5</version>
+  <version>0.1.0-RC6</version>
 
   <properties>
     <!-- System -->
@@ -14,24 +14,23 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>1.8</java.version>
     <!-- Testing -->
-    <jacoco.version>0.8.1</jacoco.version>
-    <powermock.version>1.7.3</powermock.version>
-    <easymock.version>3.6</easymock.version>
+    <jacoco.version>0.8.2</jacoco.version>
+    <powermock.version>2.0.0-RC.3</powermock.version>
+    <easymock.version>4.0.1</easymock.version>
     <!-- Build -->
-    <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+    <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
     <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
     <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
     <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-    <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
-    <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
-    <coveralls.version>4.3.0</coveralls.version>
+    <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+    <maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version>
     <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-    <maven-scm-provider-gitexe.version>1.10.0</maven-scm-provider-gitexe.version>
-    <github-release-plugin.version>1.2.0</github-release-plugin.version>
+    <maven-scm-provider-gitexe.version>1.11.1</maven-scm-provider-gitexe.version>
+    <github-release-plugin.version>1.3.0</github-release-plugin.version>
     <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
-    <!-- Other -->
-    <spring.version>5.0.7.RELEASE</spring.version>
-    <spring-boot.version>2.0.3.RELEASE</spring-boot.version>
+    <!-- Spring -->
+    <spring.version>5.0.10.RELEASE</spring.version>
+    <spring-boot.version>2.0.6.RELEASE</spring-boot.version>
   </properties>
 
   <repositories>
@@ -46,32 +45,32 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.0</version>
+      <version>1.18.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.avides.springboot.testcontainer</groupId>
       <artifactId>springboot-testcontainer-common</artifactId>
-      <version>0.1.0-RC6</version>
+      <version>0.1.0-RC10</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-configuration-processor</artifactId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
       <version>${spring-boot.version}</version>
-      <optional>true</optional>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-mongodb</artifactId>
-      <version>2.0.8.RELEASE</version>
+      <version>2.0.11.RELEASE</version>
       <scope>provided</scope>
     </dependency>
 
     <!-- Testing -->
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.10.0</version>
+      <version>3.11.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -219,6 +218,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <configuration>
+          <rules>
+            <dependencyConvergence />
+          </rules>
+          <fail>false</fail>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
@@ -242,20 +251,59 @@
             <goals>
               <goal>report</goal>
             </goals>
+            <configuration>
+              <dataFile>target/jacoco-ut.exec</dataFile>
+              <outputDirectory>target/jacoco-ut</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>integration-test-report</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+            <configuration>
+              <dataFile>target/jacoco-it.exec</dataFile>
+              <outputDirectory>target/jacoco-it</outputDirectory>
+            </configuration>
           </execution>
           <execution>
             <id>agent</id>
             <goals>
               <goal>prepare-agent</goal>
             </goals>
           </execution>
+          <execution>
+            <id>merge-results</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>merge</goal>
+            </goals>
+            <configuration>
+              <fileSets>
+                <fileSet>
+                  <directory>target</directory>
+                  <includes>
+                    <include>*.exec</include>
+                  </includes>
+                </fileSet>
+              </fileSets>
+              <destFile>target/jacoco.exec</destFile>
+            </configuration>
+          </execution>
+          <execution>
+            <id>post-merge-report</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+            <configuration>
+              <dataFile>target/jacoco.exec</dataFile>
+              <outputDirectory>target/site/jacoco</outputDirectory>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.eluder.coveralls</groupId>
-        <artifactId>coveralls-maven-plugin</artifactId>
-        <version>${coveralls.version}</version>
-      </plugin>
       <!-- DEPLOYMENT -->
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
diff --git a/src/main/java/com/avides/springboot/testcontainer/mongodb/MongodbProperties.java b/src/main/java/com/avides/springboot/testcontainer/mongodb/MongodbProperties.java
@@ -20,6 +20,6 @@ public class MongodbProperties extends AbstractEmbeddedContainerProperties
 
     public MongodbProperties()
     {
-        setDockerImage("mongo:3.4.15");
+        setDockerImage("mongo:3.4.18");
     }
 }
diff --git a/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -17,7 +17,7 @@
 			"name": "embedded.container.mongodb.docker-image",
 			"type": "java.lang.String",
 			"description": "Docker-image",
-			"defaultValue": "mongo:3.4.15"
+			"defaultValue": "mongo:3.4.18"
 		},
 		{
 			"name": "embedded.container.mongodb.port",
diff --git a/src/test/java/com/avides/springboot/testcontainer/mongodb/MongodbPropertiesTest.java b/src/test/java/com/avides/springboot/testcontainer/mongodb/MongodbPropertiesTest.java
@@ -13,7 +13,7 @@ public void testDefaults()
         MongodbProperties properties = new MongodbProperties();
         assertTrue(properties.isEnabled());
         assertEquals(30, properties.getStartupTimeout());
-        assertEquals("mongo:3.4.15", properties.getDockerImage());
+        assertEquals("mongo:3.4.18", properties.getDockerImage());
 
         assertEquals(27017, properties.getPort());
     }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,13 @@`
`1`		`-pipeline`
	`1`	`+pipeline`
`2`	`2`	`{`
`3`	`3`	`agent any`
`4`	`4`
	`5`	`+ environment`
	`6`	`+ {`
	`7`	`+ deploymentBranch = "master"`
	`8`	`+ mavenExecutable = "mvn-jdk8"`
	`9`	`+ }`
	`10`	`+`
`5`	`11`	`triggers`
`6`	`12`	`{`
`7`	`13`	`cron('H H(0-5) * * *')`
`@@ -22,42 +28,56 @@ pipeline`
`22`	`28`	`{`
`23`	`29`	`steps`
`24`	`30`	`{`
`25`		`- sh 'mvn clean compile test-compile'`
	`31`	`+ sh '${mavenExecutable} clean compile test-compile'`
`26`	`32`	`}`
`27`	`33`	`}`
`28`		`-`
	`34`	`+`
`29`	`35`	`stage('Unit-Tests')`
`30`	`36`	`{`
`31`	`37`	`steps`
`32`	`38`	`{`
`33`		`- sh 'mvn surefire:test'`
	`39`	`+ sh '${mavenExecutable} surefire:test'`
`34`	`40`	`}`
`35`	`41`	`}`
`36`		`-`
	`42`	`+`
`37`	`43`	`stage('Integration-Tests')`
`38`	`44`	`{`
	`45`	`+ when { branch "${env.deploymentBranch}" }`
	`46`	`+`
`39`	`47`	`steps`
`40`	`48`	`{`
`41`		`- sh 'mvn failsafe:integration-test failsafe:verify'`
	`49`	`+ sh '${mavenExecutable} failsafe:integration-test failsafe:verify'`
`42`	`50`	`}`
`43`	`51`	`}`
`44`		`-`
	`52`	`+`
`45`	`53`	`stage('Release')`
`46`	`54`	`{`
`47`		`- when { branch "master" }`
`48`		`-`
	`55`	`+ when { branch "${env.deploymentBranch}" }`
	`56`	`+`
`49`	`57`	`steps`
`50`	`58`	`{`
`51`		`- sh 'mvn clean deploy -Dmaven.test.skip=true'`
	`59`	`+ sh '${mavenExecutable} clean deploy -Dmaven.test.skip=true'`
`52`	`60`	`}`
`53`	`61`	`}`
`54`		`-`
	`62`	`+`
`55`	`63`	`stage('SonarQube')`
`56`	`64`	`{`
	`65`	`+ when { branch "${env.deploymentBranch}" }`
	`66`	`+`
`57`	`67`	`steps`
`58`	`68`	`{`
`59`		`- sh 'mvn clean verify sonar:sonar -Dsonar.host.url=http://sonarqube.avidesmedia/'`
	`69`	`+ sh '${mavenExecutable} clean verify sonar:sonar -Dsonar.host.url=http://sonarqube.avidesmedia/'`
`60`	`70`	`}`
`61`		`- }`
	`71`	`+ }`
	`72`	`+`
	`73`	`+ stage('POM-Analysis')`
	`74`	`+ {`
	`75`	`+ when { branch "${env.deploymentBranch}" }`
	`76`	`+`
	`77`	`+ steps`
	`78`	`+ {`
	`79`	`+ sh '${mavenExecutable} enforcer:enforce'`
	`80`	`+ }`
	`81`	`+ }`
`62`	`82`	`}`
`63`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public class MongodbProperties extends AbstractEmbeddedContainerProperties`
`20`	`20`
`21`	`21`	`public MongodbProperties()`
`22`	`22`	`{`
`23`		`- setDockerImage("mongo:3.4.15");`
	`23`	`+ setDockerImage("mongo:3.4.18");`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"name": "embedded.container.mongodb.docker-image",`
`18`	`18`	`"type": "java.lang.String",`
`19`	`19`	`"description": "Docker-image",`
`20`		`- "defaultValue": "mongo:3.4.15"`
	`20`	`+ "defaultValue": "mongo:3.4.18"`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"name": "embedded.container.mongodb.port",`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public void testDefaults()`
`13`	`13`	`MongodbProperties properties = new MongodbProperties();`
`14`	`14`	`assertTrue(properties.isEnabled());`
`15`	`15`	`assertEquals(30, properties.getStartupTimeout());`
`16`		`- assertEquals("mongo:3.4.15", properties.getDockerImage());`
	`16`	`+ assertEquals("mongo:3.4.18", properties.getDockerImage());`
`17`	`17`
`18`	`18`	`assertEquals(27017, properties.getPort());`
`19`	`19`	`}`