LIBS-726 - Update dependencies (#16)

* LIBS-726 - Update dependencies * PR * PR
springtainer · Jun 12, 2020 · ed0236a · ed0236a
1 parent 4a1d2c7
commit ed0236a
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 51 deletions.
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,10 +7,13 @@ 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
@@ -25,31 +28,35 @@ jobs:
 
       - name: setup-gpg
         env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-        run: echo ${GPG_PRIVATE_KEY} | base64 --decode | gpg --batch --import
+          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 -Dgpg.executable=gpg -Dgpg.passphrase=${GPG_PASSPHRASE}
+          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-mysql
 
-[![Maven Central](https://img.shields.io/maven-metadata/v/http/central.maven.org/maven2/com/avides/springboot/springtainer/springtainer-mysql/maven-metadata.xml.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.avides.springboot.springtainer%22%20AND%20a%3A%22springtainer-mysql%22)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.avides.springboot.springtainer/springtainer-mysql/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.avides.springboot.springtainer/springtainer-mysql)
 [![Build](https://github.com/springtainer/springtainer-mysql/workflows/release/badge.svg)](https://github.com/springtainer/springtainer-mysql/actions)
 [![Nightly build](https://github.com/springtainer/springtainer-mysql/workflows/nightly/badge.svg)](https://github.com/springtainer/springtainer-mysql/actions)
 [![Coverage report](https://sonarcloud.io/api/project_badges/measure?project=springtainer_springtainer-mysql&metric=coverage)](https://sonarcloud.io/dashboard?id=springtainer_springtainer-mysql)
@@ -12,7 +12,7 @@
 <dependency>
 	<groupId>com.avides.springboot.springtainer</groupId>
 	<artifactId>springtainer-mysql</artifactId>
-	<version>1.0.1</version>
+	<version>1.1.0</version>
 	<scope>test</scope>
 </dependency>
 ```
@@ -21,7 +21,7 @@
 Properties consumed (in `bootstrap.properties`):
 - `embedded.container.mysql.enabled` (default is `true`)
 - `embedded.container.mysql.startup-timeout` (default is `30`)
-- `embedded.container.mysql.docker-image` (default is `mysql:8.0.18`)
+- `embedded.container.mysql.docker-image` (default is `mysql:8.0.20`)
 - `embedded.container.mysql.port` (default is `3306`)
 - `embedded.container.mysql.root-password` (default is `root`)
 - `embedded.container.mysql.database-name` (default is `embeddedMySqlDb`)

diff --git a/pom.xml b/pom.xml
@@ -3,14 +3,14 @@
 
   <groupId>com.avides.springboot.springtainer</groupId>
   <artifactId>springtainer-mysql</artifactId>
-  <version>1.0.1</version>
+  <version>1.1.0</version>
 
   <name>springtainer-mysql</name>
   <description>MySQL test-container</description>
   <url>https://github.com/springtainer/springtainer-mysql</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,40 @@
     <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>
+    <mysql-connector-java.version>8.0.20</mysql-connector-java.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>
+    <!-- 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>
   </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>
@@ -90,15 +94,15 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <version>8.0.18</version>
+      <version>${mysql-connector-java.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>
@@ -141,7 +145,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/mysql/MysqlProperties.java b/src/main/java/com/avides/springboot/springtainer/mysql/MysqlProperties.java
@@ -26,6 +26,6 @@ public class MysqlProperties extends AbstractEmbeddedContainerProperties
 
     public MysqlProperties()
     {
-        setDockerImage("mysql:8.0.18");
+        setDockerImage("mysql:8.0.20");
     }
 }
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.mysql.docker-image",
 			"type": "java.lang.String",
 			"description": "Docker-image",
-			"defaultValue": "mysql:8.0.18"
+			"defaultValue": "mysql:8.0.20"
 		},
 		{
 			"name": "embedded.container.mysql.port",

diff --git a/src/test/java/com/avides/springboot/springtainer/mysql/MysqlPropertiesTest.java b/src/test/java/com/avides/springboot/springtainer/mysql/MysqlPropertiesTest.java
@@ -13,7 +13,7 @@ public void testDefaults()
         MysqlProperties properties = new MysqlProperties();
         assertTrue(properties.isEnabled());
         assertEquals(30, properties.getStartupTimeout());
-        assertEquals("mysql:8.0.18", properties.getDockerImage());
+        assertEquals("mysql:8.0.20", properties.getDockerImage());
 
         assertEquals(3306, properties.getPort());
         assertEquals("root", properties.getRootPassword());