LIBS-730 - Update dependencies (#15)

Henrik Adamski · web-flow · commit ac942ecca09e · 2020-06-18T12:11:52.000+02:00
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -2,10 +2,12 @@ name: nightly
 
 on:
   schedule:
-    - cron: 0 0 * * *
+    - cron: 0 0 * * 1
 
 jobs:
-  build:
+  nightly:
+    timeout-minutes: 30
+
     runs-on: ubuntu-latest
 
     steps:
@@ -14,10 +16,11 @@ jobs:
         with:
           java-version: 11
 
-      - uses: actions/checkout@v1
+      - name: checkout
+        uses: actions/checkout@v2
 
       - name: caching
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -34,12 +37,13 @@ jobs:
 
       - name: sonar-analyse
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_HOST: ${{ secrets.OS_SONAR_HOST_URL }}
+          SONAR_TOKEN: ${{ secrets.OS_SONAR_TOKEN }}
         run: |
           export SONAR_ORGANIZATION=$(echo ${GITHUB_REPOSITORY} | cut -d / -f 1)
           mvn sonar:sonar \
-            -Dsonar.host.url=https://sonarcloud.io/ \
-            -Dsonar.login=${{ secrets.SONAR_TOKEN }} \
+            -Dsonar.host.url=${SONAR_HOST} \
+            -Dsonar.login=${SONAR_TOKEN} \
             -Dsonar.organization=${SONAR_ORGANIZATION} \
             -Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
             -Dsonar.java.binaries=./target/classes
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,50 +7,56 @@ on:
 
 jobs:
   release:
+    timeout-minutes: 30
+
     env:
-      GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     runs-on: ubuntu-latest
+
     steps:
       - name: setup-java
         uses: actions/setup-java@v1
         with:
           java-version: 11
+          server-id: ossrh
+          server-username: OSSRH_USERNAME
+          server-password: OSSRH_PASSWORD
+
+      - name: setup-github-release
+        run: sed -i -e 's/<\/servers>/<server><id>github<\/id><username>x-access-token<\/username><password>${GITHUB_TOKEN}<\/password><\/server><\/servers>/g' /home/runner/.m2/settings.xml
 
       - name: setup-gpg
         env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-        run: echo ${GPG_PRIVATE_KEY} | base64 --decode | gpg --batch --import
-
-      - name: setup-maven-settings
-        uses: s4u/maven-settings-action@v1
-        with:
-          servers: '[{"id": "ossrh", "username": "${OSSRH_USERNAME}", "password": "${OSSRH_PASSWORD}"}, {"id": "github", "username": "x-access-token", "password": "${GITHUB_TOKEN}"}]'
-          properties: '[{"gpg.executable": "gpg"}, {"gpg.passphrase": "${GPG_PASSPHRASE}"}]'
-          sonatypeSnapshots: true
+          GPG_PRIVATE_KEY: ${{ secrets.OS_GPG_PRIVATE_KEY }}
+        run: cat <(echo -e "${GPG_PRIVATE_KEY}") | gpg --batch --import
 
       - name: checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: caching
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-
 
       - name: deploy
         env:
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        run: mvn clean verify deploy
+          OSSRH_USERNAME: ${{ secrets.OS_OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OS_OSSRH_PASSWORD }}
+          GPG_PASSPHRASE: ${{ secrets.OS_GPG_PASSPHRASE }}
+        run: mvn deploy -Dmaven.wagon.http.pool=false -Dgpg.executable=gpg -Dgpg.passphrase=${GPG_PASSPHRASE}
 
       - name: sonar-analyse
+        env:
+          SONAR_HOST: ${{ secrets.OS_SONAR_HOST_URL }}
+          SONAR_TOKEN: ${{ secrets.OS_SONAR_TOKEN }}
         run: |
           export SONAR_ORGANIZATION=$(echo ${GITHUB_REPOSITORY} | cut -d / -f 1)
           mvn sonar:sonar \
-            -Dsonar.host.url=https://sonarcloud.io/ \
-            -Dsonar.login=${{ secrets.SONAR_TOKEN }} \
+            -Dsonar.host.url=${SONAR_HOST} \
+            -Dsonar.login=${SONAR_TOKEN} \
             -Dsonar.organization=${SONAR_ORGANIZATION} \
             -Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
             -Dsonar.java.binaries=./target/classes
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
@@ -5,7 +5,9 @@ on:
     types: [opened, synchronize]
 
 jobs:
-  build:
+  review:
+    timeout-minutes: 30
+
     runs-on: ubuntu-latest
 
     steps:
@@ -15,10 +17,17 @@ jobs:
           java-version: 11
 
       - name: checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
+
+      - name: project-version-check
+        uses: avides/actions-project-version-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          file-to-check: pom.xml
+          additional-files-to-check: README.md
 
       - name: caching
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -35,17 +44,19 @@ jobs:
 
       - name: sonar-analyse
         env:
+          SONAR_HOST: ${{ secrets.OS_SONAR_HOST_URL }}
+          SONAR_TOKEN: ${{ secrets.OS_SONAR_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          export GITHUB_PULL_REQUEST=$(cut -d / -f 3 <(echo ${GITHUB_REF}))
           export SONAR_ORGANIZATION=$(echo ${GITHUB_REPOSITORY} | cut -d / -f 1)
           mvn sonar:sonar \
-            -Dsonar.host.url=https://sonarcloud.io/ \
-            -Dsonar.login=${{ secrets.SONAR_TOKEN }} \
+            -Dsonar.host.url=${SONAR_HOST} \
+            -Dsonar.login=${SONAR_TOKEN} \
             -Dsonar.organization=${SONAR_ORGANIZATION} \
             -Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
-            -Dsonar.pullrequest.key=${GITHUB_PULL_REQUEST} \
-            -Dsonar.pullrequest.branch=${GITHUB_REF} \
+            -Dsonar.pullrequest.key=${{ github.event.number }} \
+            -Dsonar.pullrequest.branch=${{ github.event.pull_request.head.ref }} \
+            -Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} \
             -Dsonar.java.binaries=./target/classes
 
       - name: pom-analyse
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # springtainer-mongodb
 
-[![Maven Central](https://img.shields.io/maven-metadata/v/http/central.maven.org/maven2/com/avides/springboot/springtainer/springtainer-mongodb/maven-metadata.xml.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.avides.springboot.springtainer%22%20AND%20a%3A%22springtainer-mongodb%22)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.avides.springboot.springtainer/springtainer-mongodb/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.avides.springboot.springtainer/springtainer-mongodb)
 [![Build](https://github.com/springtainer/springtainer-mongodb/workflows/release/badge.svg)](https://github.com/springtainer/springtainer-mongodb/actions)
 [![Nightly build](https://github.com/springtainer/springtainer-mongodb/workflows/nightly/badge.svg)](https://github.com/springtainer/springtainer-mongodb/actions)
 [![Coverage report](https://sonarcloud.io/api/project_badges/measure?project=springtainer_springtainer-mongodb&metric=coverage)](https://sonarcloud.io/dashboard?id=springtainer_springtainer-mongodb)
@@ -12,7 +12,7 @@
 <dependency>
 	<groupId>com.avides.springboot.springtainer</groupId>
 	<artifactId>springtainer-mongodb</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<scope>test</scope>
 </dependency>
 ```
@@ -21,7 +21,7 @@
 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:4.0.13`)
+- `embedded.container.mongodb.docker-image` (default is `mongo:4.0.18`)
 - `embedded.container.mongodb.port` (default is `27017`)
 
 Properties provided (in `application-it.properties`):
diff --git a/pom.xml b/pom.xml
@@ -3,14 +3,14 @@
 
   <groupId>com.avides.springboot.springtainer</groupId>
   <artifactId>springtainer-mongodb</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
 
   <name>springtainer-mongodb</name>
   <description>MongoDB test-container</description>
   <url>https://github.com/springtainer/springtainer-mongodb</url>
   <organization>
     <name>AVIDES Media AG</name>
-    <url>http://www.avides.com</url>
+    <url>https://www.avides.com</url>
   </organization>
   <licenses>
     <license>
@@ -38,36 +38,42 @@
     <maven.build.timestamp.format>dd.MM.yyyy HH:mm</maven.build.timestamp.format>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>11</java.version>
-    <!-- Testing -->
-    <jacoco.version>0.8.5</jacoco.version>
-    <powermock.version>2.0.4</powermock.version>
-    <easymock.version>4.1</easymock.version>
     <!-- Build -->
     <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-    <maven-source-plugin.version>3.2.0</maven-source-plugin.version>
-    <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
+    <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+    <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
     <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-    <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
-    <maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version>
-    <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
-    <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+    <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+    <maven-failsafe-plugin.version>3.0.0-M4</maven-failsafe-plugin.version>
+    <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
+    <maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version>
     <maven-scm-provider-gitexe.version>1.11.2</maven-scm-provider-gitexe.version>
-    <exists-maven-plugin.version>0.0.6</exists-maven-plugin.version>
+    <exists-maven-plugin.version>0.3.0</exists-maven-plugin.version>
     <github-release-plugin.version>1.4.0</github-release-plugin.version>
     <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
     <!-- Spring -->
-    <spring.version>5.2.1.RELEASE</spring.version>
-    <spring-boot.version>2.2.1.RELEASE</spring-boot.version>
+    <spring.version>5.2.7.RELEASE</spring.version>
+    <spring-boot.version>2.3.1.RELEASE</spring-boot.version>
     <!-- Other -->
-    <springtainer-common.version>1.0.0</springtainer-common.version>
+    <springtainer-common.version>1.1.2</springtainer-common.version>
+    <lombok.version>1.18.12</lombok.version>
+    <spring-data-mongodb.version>3.0.1.RELEASE</spring-data-mongodb.version>
+    <mongo-java-driver.version>3.12.5</mongo-java-driver.version>
+    <!-- Testing -->
+    <jacoco.version>0.8.5</jacoco.version>
+    <powermock.version>2.0.7</powermock.version>
+    <easymock.version>4.2</easymock.version>
+    <assertj-core.version>3.16.1</assertj-core.version>
+    <logback-classic.version>1.2.3</logback-classic.version>
+    <mongodb-driver-sync.version>4.0.4</mongodb-driver-sync.version>
   </properties>
 
   <dependencies>
     <!-- Common -->
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.10</version>
+      <version>${lombok.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -84,15 +90,21 @@
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-mongodb</artifactId>
-      <version>2.2.2.RELEASE</version>
+      <version>${spring-data-mongodb.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mongodb</groupId>
+      <artifactId>mongodb-driver-sync</artifactId>
+      <version>${mongodb-driver-sync.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <!-- Testing -->
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.14.0</version>
+      <version>${assertj-core.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -135,7 +147,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.3</version>
+      <version>${logback-classic.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/main/java/com/avides/springboot/springtainer/mongodb/EmbeddedMongodbContainerAutoConfiguration.java b/src/main/java/com/avides/springboot/springtainer/mongodb/EmbeddedMongodbContainerAutoConfiguration.java
@@ -16,8 +16,8 @@
 
 import com.avides.springboot.springtainer.common.container.AbstractBuildingEmbeddedContainer;
 import com.avides.springboot.springtainer.common.container.EmbeddedContainer;
-import com.mongodb.MongoClient;
-import com.mongodb.ServerAddress;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 
 @Configuration
 @ConditionalOnProperty(name = "embedded.container.mongodb.enabled", matchIfMissing = true)
@@ -32,7 +32,7 @@ public EmbeddedContainer mongodbContainer(ConfigurableEnvironment environment, M
         return new MongodbContainer("mongodb", environment, properties);
     }
 
-    public class MongodbContainer extends AbstractBuildingEmbeddedContainer<MongodbProperties>
+    public static class MongodbContainer extends AbstractBuildingEmbeddedContainer<MongodbProperties>
     {
         public MongodbContainer(String service, ConfigurableEnvironment environment, MongodbProperties properties)
         {
@@ -51,7 +51,7 @@ protected Map<String, Object> providedProperties()
         @Override
         protected boolean isContainerReady(MongodbProperties properties)
         {
-            try (MongoClient mongoClient = new MongoClient(new ServerAddress(getContainerHost(), getContainerPort(properties.getPort()))))
+            try (MongoClient mongoClient = MongoClients.create("mongodb://" + getContainerHost() + ":" + getContainerPort(properties.getPort())))
             {
                 return mongoClient.getDatabase("admin") != null;
             }
diff --git a/src/main/java/com/avides/springboot/springtainer/mongodb/MongodbProperties.java b/src/main/java/com/avides/springboot/springtainer/mongodb/MongodbProperties.java
@@ -20,6 +20,6 @@ public class MongodbProperties extends AbstractEmbeddedContainerProperties
 
     public MongodbProperties()
     {
-        setDockerImage("mongo:4.0.13");
+        setDockerImage("mongo:4.0.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:4.0.13"
+			"defaultValue": "mongo:4.0.18"
 		},
 		{
 			"name": "embedded.container.mongodb.port",
diff --git a/src/test/java/com/avides/springboot/springtainer/mongodb/MongodbPropertiesTest.java b/src/test/java/com/avides/springboot/springtainer/mongodb/MongodbPropertiesTest.java
@@ -13,7 +13,7 @@ public void testDefaults()
         MongodbProperties properties = new MongodbProperties();
         assertTrue(properties.isEnabled());
         assertEquals(30, properties.getStartupTimeout());
-        assertEquals("mongo:4.0.13", properties.getDockerImage());
+        assertEquals("mongo:4.0.18", properties.getDockerImage());
 
         assertEquals(27017, properties.getPort());
     }

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`
`17`	`17`	`import com.avides.springboot.springtainer.common.container.AbstractBuildingEmbeddedContainer;`
`18`	`18`	`import com.avides.springboot.springtainer.common.container.EmbeddedContainer;`
`19`		`-import com.mongodb.MongoClient;`
`20`		`-import com.mongodb.ServerAddress;`
	`19`	`+import com.mongodb.client.MongoClient;`
	`20`	`+import com.mongodb.client.MongoClients;`
`21`	`21`
`22`	`22`	`@Configuration`
`23`	`23`	`@ConditionalOnProperty(name = "embedded.container.mongodb.enabled", matchIfMissing = true)`
`@@ -32,7 +32,7 @@ public EmbeddedContainer mongodbContainer(ConfigurableEnvironment environment, M`
`32`	`32`	`return new MongodbContainer("mongodb", environment, properties);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public class MongodbContainer extends AbstractBuildingEmbeddedContainer<MongodbProperties>`
	`35`	`+ public static class MongodbContainer extends AbstractBuildingEmbeddedContainer<MongodbProperties>`
`36`	`36`	`{`
`37`	`37`	`public MongodbContainer(String service, ConfigurableEnvironment environment, MongodbProperties properties)`
`38`	`38`	`{`
`@@ -51,7 +51,7 @@ protected Map<String, Object> providedProperties()`
`51`	`51`	`@Override`
`52`	`52`	`protected boolean isContainerReady(MongodbProperties properties)`
`53`	`53`	`{`
`54`		`- try (MongoClient mongoClient = new MongoClient(new ServerAddress(getContainerHost(), getContainerPort(properties.getPort()))))`
	`54`	`+ try (MongoClient mongoClient = MongoClients.create("mongodb://" + getContainerHost() + ":" + getContainerPort(properties.getPort())))`
`55`	`55`	`{`
`56`	`56`	`return mongoClient.getDatabase("admin") != null;`
`57`	`57`	`}`
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:4.0.13");`
	`23`	`+ setDockerImage("mongo:4.0.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:4.0.13"`
	`20`	`+ "defaultValue": "mongo:4.0.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:4.0.13", properties.getDockerImage());`
	`16`	`+ assertEquals("mongo:4.0.18", properties.getDockerImage());`
`17`	`17`
`18`	`18`	`assertEquals(27017, properties.getPort());`
`19`	`19`	`}`