diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index b4801daa..af13c80b 100644 --- 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 index ab96ebc9..f45991d1 100644 --- 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 index 710e2516..e5f60f03 100644 --- 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 index 31547b11..b37e58c2 100644 --- a/keycloak-storage-provider/pom.xml +++ b/keycloak-storage-provider/pom.xml @@ -6,7 +6,7 @@ de.adorsys.sts secure-token-service - 1.1.19 + 1.1.20-SNAPSHOT keycloak-storage-provider diff --git a/pom.xml b/pom.xml index 6fcd15aa..e37ad028 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ de.adorsys.sts secure-token-service - 1.1.19 + 1.1.20-SNAPSHOT pom SecureTokenService @@ -65,6 +65,14 @@ 1.17.6 9.31 + 1.6.13 + 3.3.0 + 3.0.1 + 3.3.0 + 3.2.0 + 3.1.1 + 3.1.0 + 3.6.0 @@ -441,7 +449,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + ${maven-javadoc-plugin.version} ${project.build.sourceEncoding} ${project.build.sourceEncoding} @@ -451,7 +459,7 @@ maven-release-plugin - 3.0.0-M1 + ${maven-release-plugin.version} release true @@ -468,7 +476,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + ${maven-jar-plugin.version} @@ -492,7 +500,7 @@ org.codehaus.mojo buildnumber-maven-plugin - 1.4 + ${buildnumber-maven-plugin.version} validate @@ -531,7 +539,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven-deploy-plugin.version} true @@ -539,20 +547,18 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + ${nexus-staging-maven-plugin.version} true sonatype https://oss.sonatype.org/ true - true - 30 org.apache.maven.plugins maven-source-plugin - 3.2.1 + ${maven-source-plugin.version} attach-sources @@ -565,13 +571,8 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + ${maven-gpg-plugin.version} - opensource@adorsys.de - - --pinentry-mode - loopback - @@ -580,18 +581,13 @@ sign - - - --pinentry-mode - loopback - - org.apache.maven.plugins maven-javadoc-plugin + ${maven-javadoc-plugin.version} 17 none diff --git a/scripts/mvn_deploy.sh b/scripts/mvn_deploy.sh index 0df07a6f..fd0932f8 100755 --- 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 index 231a87f7..726fc47c 100644 --- a/sts-common/pom.xml +++ b/sts-common/pom.xml @@ -5,7 +5,7 @@ de.adorsys.sts secure-token-service - 1.1.19 + 1.1.20-SNAPSHOT sts-common diff --git a/sts-example/pom.xml b/sts-example/pom.xml index bfc46dce..ce36eab7 100644 --- a/sts-example/pom.xml +++ b/sts-example/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-keymanagement/pom.xml b/sts-keymanagement/pom.xml index 40edfbad..4ee68daf 100644 --- a/sts-keymanagement/pom.xml +++ b/sts-keymanagement/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-keymanagement/sts-keymanagement-api/pom.xml b/sts-keymanagement/sts-keymanagement-api/pom.xml index b7baf071..57c4da0e 100644 --- a/sts-keymanagement/sts-keymanagement-api/pom.xml +++ b/sts-keymanagement/sts-keymanagement-api/pom.xml @@ -5,7 +5,7 @@ sts-keymanagement de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-keymanagement/sts-keymanagement-impl/pom.xml b/sts-keymanagement/sts-keymanagement-impl/pom.xml index 15c0ccaf..854dca24 100644 --- a/sts-keymanagement/sts-keymanagement-impl/pom.xml +++ b/sts-keymanagement/sts-keymanagement-impl/pom.xml @@ -5,7 +5,7 @@ sts-keymanagement de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 @@ -14,7 +14,6 @@ de.adorsys.sts sts-keymanagement-api - 1.1.19 de.adorsys.sts diff --git a/sts-persistence-jpa/pom.xml b/sts-persistence-jpa/pom.xml index eae67aa3..5ff7a498 100644 --- a/sts-persistence-jpa/pom.xml +++ b/sts-persistence-jpa/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-persistence-mongo/pom.xml b/sts-persistence-mongo/pom.xml index e8560885..e657e86c 100644 --- a/sts-persistence-mongo/pom.xml +++ b/sts-persistence-mongo/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-pop/pom.xml b/sts-pop/pom.xml index 2df08154..a2312fa0 100644 --- a/sts-pop/pom.xml +++ b/sts-pop/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-resource-server/pom.xml b/sts-resource-server/pom.xml index cf798d6d..1d44ca31 100644 --- a/sts-resource-server/pom.xml +++ b/sts-resource-server/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-secret-server/pom.xml b/sts-secret-server/pom.xml index 70bc10d0..fbf5a8a7 100644 --- a/sts-secret-server/pom.xml +++ b/sts-secret-server/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT diff --git a/sts-secret/pom.xml b/sts-secret/pom.xml index 020bb609..e6957674 100644 --- a/sts-secret/pom.xml +++ b/sts-secret/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-server-info/pom.xml b/sts-server-info/pom.xml index 683ed467..00d8b1cf 100644 --- a/sts-server-info/pom.xml +++ b/sts-server-info/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-service-component-example/pom.xml b/sts-service-component-example/pom.xml index 58f35a9e..c2b5dfad 100644 --- a/sts-service-component-example/pom.xml +++ b/sts-service-component-example/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-simple-encryption/pom.xml b/sts-simple-encryption/pom.xml index 13ffc8b4..0ced4766 100644 --- a/sts-simple-encryption/pom.xml +++ b/sts-simple-encryption/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-spring/pom.xml b/sts-spring/pom.xml index 0bb1b7a6..7bff9f92 100644 --- a/sts-spring/pom.xml +++ b/sts-spring/pom.xml @@ -3,7 +3,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-token-auth/pom.xml b/sts-token-auth/pom.xml index cab132e0..6c527cb2 100644 --- a/sts-token-auth/pom.xml +++ b/sts-token-auth/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0 diff --git a/sts-token/pom.xml b/sts-token/pom.xml index b4fe429e..75af0cca 100644 --- a/sts-token/pom.xml +++ b/sts-token/pom.xml @@ -5,7 +5,7 @@ secure-token-service de.adorsys.sts - 1.1.19 + 1.1.20-SNAPSHOT 4.0.0