update workflow to java 17 (#168)

* update workflow to java 17 * Start next iteration with 1.1.20-SNAPSHOT * update maven plugin versions
adorsys · Feb 12, 2024 · 7d63804 · 7d63804
1 parent 19a16c6
commit 7d63804
Show file tree

Hide file tree

Showing 23 changed files with 71 additions and 61 deletions.
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -7,19 +7,20 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - name: Check out repository code
-        uses: actions/checkout@v2
+      - name: Step 1 - Checkout repository code
+        uses: actions/checkout@v4
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+      - name: Step 2 - Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
           java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
 
-      - name: Maven build and test
-        run: mvn clean verify -B -V
+      - name: Step 3 - Build & Test
+        run: mvn clean verify -ntp
 
-      - name: Build client
+      - name: Step 4 - Build client
         run: ./scripts/build_client.sh
diff --git a/.github/workflows/push-in-develop.yml b/.github/workflows/push-in-develop.yml
@@ -6,15 +6,22 @@ on:
 
 jobs:
   Develop-Branch-Build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - name: Check out repository code
-        uses: actions/checkout@v2
+      - name: Step 1 - Checkout repository code
+        uses: actions/checkout@v4
 
-      - name: Maven build and test
-        run: mvn clean verify -B -V
+      - name: Step 2 - Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
 
-      - name: Build client
+      - name: Step 3 - Build & Test
+        run: mvn clean verify -ntp
+
+      - name: Step 5 - Build client
         run: ./scripts/build_client.sh
 
       - name: Maven deploy snapshot

diff --git a/.github/workflows/push-with-v-tag.yml b/.github/workflows/push-with-v-tag.yml
@@ -6,12 +6,19 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - name: Check out repository code
-        uses: actions/checkout@v2
+      - name: Step 1 - Checkout repository code
+        uses: actions/checkout@v4
 
-      - name: deploy to Maven
+      - name: Step 2 - Setup JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Step 3 - deploy to Maven
         run: ./scripts/mvn_deploy.sh
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

diff --git a/keycloak-storage-provider/pom.xml b/keycloak-storage-provider/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.adorsys.sts</groupId>
         <artifactId>secure-token-service</artifactId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>keycloak-storage-provider</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>de.adorsys.sts</groupId>
     <artifactId>secure-token-service</artifactId>
-    <version>1.1.19</version>
+    <version>1.1.20-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>SecureTokenService</name>
@@ -65,6 +65,14 @@
         <testcontainers.version>1.17.6</testcontainers.version>
         <nimbus-jose-jwt.version>9.31</nimbus-jose-jwt.version>
         <scmBranch/>
+        <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
+        <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
+        <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+        <buildnumber-maven-plugin.version>3.2.0</buildnumber-maven-plugin.version>
+        <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
+        <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
+        <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
     </properties>
 
     <modules>
@@ -441,7 +449,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>${maven-javadoc-plugin.version}</version>
                     <configuration>
                         <charset>${project.build.sourceEncoding}</charset>
                         <encoding>${project.build.sourceEncoding}</encoding>
@@ -451,7 +459,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>3.0.0-M1</version>
+                    <version>${maven-release-plugin.version}</version>
                     <configuration>
                         <releaseProfiles>release</releaseProfiles>
                         <autoVersionSubmodules>true</autoVersionSubmodules>
@@ -468,7 +476,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>${maven-jar-plugin.version}</version>
                     <configuration>
                         <archive>
                             <manifest>
@@ -492,7 +500,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>buildnumber-maven-plugin</artifactId>
-                    <version>1.4</version>
+                    <version>${buildnumber-maven-plugin.version}</version>
                     <executions>
                         <execution>
                             <phase>validate</phase>
@@ -531,28 +539,26 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.8.2</version>
+                        <version>${maven-deploy-plugin.version}</version>
                         <configuration>
                             <deployAtEnd>true</deployAtEnd>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.13</version>
+                        <version>${nexus-staging-maven-plugin.version}</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>sonatype</serverId>
                             <nexusUrl>https://oss.sonatype.org/</nexusUrl>
                             <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                            <keepStagingRepositoryOnFailure>true</keepStagingRepositoryOnFailure>
-                            <stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.2.1</version>
+                        <version>${maven-source-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -565,13 +571,8 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>${maven-gpg-plugin.version}</version>
                         <configuration>
-                                <keyname>[email protected]</keyname>
-                            <gpgArguments>
-                                <arg>--pinentry-mode</arg>
-                                <arg>loopback</arg>
-                            </gpgArguments>
                         </configuration>
                         <executions>
                             <execution>
@@ -580,18 +581,13 @@
                                 <goals>
                                     <goal>sign</goal>
                                 </goals>
-                                <configuration>
-                                    <gpgArguments>
-                                        <arg>--pinentry-mode</arg>
-                                        <arg>loopback</arg>
-                                    </gpgArguments>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>${maven-javadoc-plugin.version}</version>
                         <configuration>
                             <source>17</source>
                             <doclint>none</doclint>

diff --git a/scripts/mvn_deploy.sh b/scripts/mvn_deploy.sh
@@ -5,4 +5,4 @@ set -e
 echo "$GPG_SECRET_KEY" | base64 --decode | $GPG_EXECUTABLE --import --no-tty --batch --yes || true
 echo "$GPG_OWNERTRUST" | base64 --decode | $GPG_EXECUTABLE --import-ownertrust --no-tty --batch --yes || true
 
-mvn --no-transfer-progress --settings scripts/settings.xml package gpg:sign deploy -Prelease -DskipTests -B -U || exit 1
+mvn clean deploy -ntp --settings scripts/settings.xml gpg:sign -Prelease -DskipTests -U || exit 1
diff --git a/sts-common/pom.xml b/sts-common/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.adorsys.sts</groupId>
 		<artifactId>secure-token-service</artifactId>
-		<version>1.1.19</version>
+		<version>1.1.20-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>sts-common</artifactId>

diff --git a/sts-example/pom.xml b/sts-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-keymanagement/pom.xml b/sts-keymanagement/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-keymanagement/sts-keymanagement-api/pom.xml b/sts-keymanagement/sts-keymanagement-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sts-keymanagement</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-keymanagement/sts-keymanagement-impl/pom.xml b/sts-keymanagement/sts-keymanagement-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sts-keymanagement</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,6 @@
         <dependency>
             <groupId>de.adorsys.sts</groupId>
             <artifactId>sts-keymanagement-api</artifactId>
-            <version>1.1.19</version>
         </dependency>
         <dependency>
             <groupId>de.adorsys.sts</groupId>

diff --git a/sts-persistence-jpa/pom.xml b/sts-persistence-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-persistence-mongo/pom.xml b/sts-persistence-mongo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-pop/pom.xml b/sts-pop/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-resource-server/pom.xml b/sts-resource-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-secret-server/pom.xml b/sts-secret-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
 
 

diff --git a/sts-secret/pom.xml b/sts-secret/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-server-info/pom.xml b/sts-server-info/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-service-component-example/pom.xml b/sts-service-component-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-simple-encryption/pom.xml b/sts-simple-encryption/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-spring/pom.xml b/sts-spring/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-token-auth/pom.xml b/sts-token-auth/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-token/pom.xml b/sts-token/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.19</version>
+        <version>1.1.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>