From eb51d7cd574ff16708f0f20f259b484f407175e2 Mon Sep 17 00:00:00 2001 From: Andres Almiray Date: Mon, 31 Oct 2022 20:32:29 +0100 Subject: [PATCH] Update release configuration --- .github/workflows/build.yml | 2 +- .github/workflows/early-access.yml | 9 +++-- .github/workflows/release.yml | 34 +++++++++++++++---- examples/plugin-example/greeter-core/pom.xml | 4 +-- .../greeter-date-util-1.0.0/pom.xml | 2 +- .../greeter-date-util-2.0.0/pom.xml | 2 +- examples/plugin-example/greeter-de/pom.xml | 2 +- examples/plugin-example/greeter-en/pom.xml | 2 +- examples/plugin-example/greeter-fr/pom.xml | 2 +- .../plugin-example/greeter-runner/pom.xml | 2 +- examples/plugin-example/pom.xml | 2 +- examples/pom.xml | 2 +- .../vertx-example/layrry-links-core/pom.xml | 4 +-- .../layrry-links-greenkeeping/pom.xml | 2 +- .../layrry-links-logconfig/pom.xml | 2 +- .../layrry-links-membership/pom.xml | 2 +- .../vertx-example/layrry-links-runner/pom.xml | 2 +- .../layrry-links-tournament/pom.xml | 2 +- examples/vertx-example/pom.xml | 2 +- integration-test/it-app/pom.xml | 2 +- integration-test/it-bar/pom.xml | 2 +- integration-test/it-foo/pom.xml | 2 +- integration-test/it-greeter-1.0.0/pom.xml | 2 +- integration-test/it-greeter-2.0.0/pom.xml | 2 +- integration-test/it-logconfig/pom.xml | 2 +- integration-test/it-runner/pom.xml | 2 +- integration-test/pom.xml | 2 +- layrry-config-toml/pom.xml | 2 +- layrry-config-yaml/pom.xml | 2 +- layrry-config/pom.xml | 2 +- layrry-core/pom.xml | 2 +- layrry-launcher/pom.xml | 2 +- layrry-platform/pom.xml | 2 +- pom.xml | 34 +++++++++++++++++-- 34 files changed, 98 insertions(+), 45 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 438736a2..ad44a3a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/checkout@v3 - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRO }} diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index 23b234f3..ca72ff6a 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -45,7 +45,7 @@ jobs: run: | chmod +x mvnw version=$(./mvnw -ntp help:evaluate -Dexpression=project.version -q -DforceStdout) - echo ::set-output name=VERSION::$(echo "$version") + echo "VERSION=$(echo $version)" >>$GITHUB_OUTPUT release: name: release @@ -54,9 +54,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRO }} @@ -77,6 +79,9 @@ jobs: JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} JRELEASER_SDKMAN_CONSUMER_KEY: ${{ secrets.JRELEASER_SDKMAN_CONSUMER_KEY }} JRELEASER_SDKMAN_CONSUMER_TOKEN: ${{ secrets.JRELEASER_SDKMAN_CONSUMER_TOKEN }} + JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} + JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_PRIVATE_KEY }} run: | ./mvnw -B -ntp -pl :layrry-aggregator -Pjreleaser jreleaser:release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a069d51..c28567b1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: fetch-depth: 0 - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRO }} @@ -51,12 +51,22 @@ jobs: gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - - uses: actions/cache@v3 + - name: Cache Maven + uses: actions/cache@v3 with: - path: ~/.m2 + path: ~/.m2/repository key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: 'Test Build Readiness' + env: + MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + run: | + export GPG_TTY=$(tty) + ./mvnw -ntp --file pom.xml -Dmaven.site.skip=true -Drelease=true verify -e + - name: 'Set release version' id: version run: | @@ -70,15 +80,18 @@ jobs: NEXT_VERSION=$COMPUTED_NEXT_VERSION fi echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_ENV - ./mvnw -B -ntp versions:set versions:commit -DnewVersion=$RELEASE_VERSION + ./mvnw -ntp -B versions:set versions:commit -DnewVersion=$RELEASE_VERSION git config --global user.email "${{ env.USER_EMAIL }}" git config --global user.name "${{ env.USER_NAME }}" git commit -a -m "🏁 Releasing version $RELEASE_VERSION" git push origin HEAD:master + # clean needed to remove previous build + # install needed by tests + # don't @ me <_< - name: Build run: | - ./mvnw -B -ntp install -DskipTests=true + ./mvnw -ntp -B clean install -DskipTests=true - name: 'Release to Maven Central' env: @@ -87,7 +100,7 @@ jobs: MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} run: | export GPG_TTY=$(tty) - ./mvnw --no-transfer-progress -B --file pom.xml \ + ./mvnw -ntp --file pom.xml \ -Drepository.url=https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git \ -Dmaven.site.skip=true -Drelease=true -DskipTests=true deploy -e @@ -96,8 +109,15 @@ jobs: JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} JRELEASER_SDKMAN_CONSUMER_KEY: ${{ secrets.JRELEASER_SDKMAN_CONSUMER_KEY }} JRELEASER_SDKMAN_CONSUMER_TOKEN: ${{ secrets.JRELEASER_SDKMAN_CONSUMER_TOKEN }} + JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} + JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_PRIVATE_KEY }} + JRELEASER_TWITTER_CONSUMER_KEY: ${{ secrets.JRELEASER_TWITTER_CONSUMER_KEY }} + JRELEASER_TWITTER_CONSUMER_SECRET: ${{ secrets.JRELEASER_TWITTER_CONSUMER_SECRET }} + JRELEASER_TWITTER_ACCESS_TOKEN: ${{ secrets.JRELEASER_TWITTER_ACCESS_TOKEN }} + JRELEASER_TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.JRELEASER_TWITTER_ACCESS_TOKEN_SECRET }} run: | - ./mvnw -B -ntp -pl :layrry-aggregator -Pjreleaser jreleaser:full-release + ./mvnw -ntp -B -pl :layrry-aggregator -Pjreleaser jreleaser:full-release - name: 'JReleaser output' if: always() diff --git a/examples/plugin-example/greeter-core/pom.xml b/examples/plugin-example/greeter-core/pom.xml index f7d7db4e..35dfb967 100644 --- a/examples/plugin-example/greeter-core/pom.xml +++ b/examples/plugin-example/greeter-core/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry.example.greeter layrry-plugin-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 @@ -35,7 +35,7 @@ org.moditect.layrry layrry-platform - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT junit diff --git a/examples/plugin-example/greeter-date-util-1.0.0/pom.xml b/examples/plugin-example/greeter-date-util-1.0.0/pom.xml index b3e2d1bf..fb4d4e3f 100644 --- a/examples/plugin-example/greeter-date-util-1.0.0/pom.xml +++ b/examples/plugin-example/greeter-date-util-1.0.0/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry.example.greeter layrry-plugin-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/examples/plugin-example/greeter-date-util-2.0.0/pom.xml b/examples/plugin-example/greeter-date-util-2.0.0/pom.xml index 95523a36..bdd05377 100644 --- a/examples/plugin-example/greeter-date-util-2.0.0/pom.xml +++ b/examples/plugin-example/greeter-date-util-2.0.0/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry.example.greeter layrry-plugin-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/examples/plugin-example/greeter-de/pom.xml b/examples/plugin-example/greeter-de/pom.xml index cdad29dd..59b060d1 100644 --- a/examples/plugin-example/greeter-de/pom.xml +++ b/examples/plugin-example/greeter-de/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry.example.greeter layrry-plugin-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/examples/plugin-example/greeter-en/pom.xml b/examples/plugin-example/greeter-en/pom.xml index 43d8540c..85327baa 100644 --- a/examples/plugin-example/greeter-en/pom.xml +++ b/examples/plugin-example/greeter-en/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry.example.greeter layrry-plugin-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/examples/plugin-example/greeter-fr/pom.xml b/examples/plugin-example/greeter-fr/pom.xml index 4ab746a6..2eac417b 100644 --- a/examples/plugin-example/greeter-fr/pom.xml +++ b/examples/plugin-example/greeter-fr/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry.example.greeter layrry-plugin-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/examples/plugin-example/greeter-runner/pom.xml b/examples/plugin-example/greeter-runner/pom.xml index e2a0b100..ae66bed9 100644 --- a/examples/plugin-example/greeter-runner/pom.xml +++ b/examples/plugin-example/greeter-runner/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry.example.greeter layrry-plugin-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/examples/plugin-example/pom.xml b/examples/plugin-example/pom.xml index d04ebd1d..65112fa7 100644 --- a/examples/plugin-example/pom.xml +++ b/examples/plugin-example/pom.xml @@ -22,7 +22,7 @@ org.moditect.layrry.example layrry-examples-aggregator - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT org.moditect.layrry.example.greeter diff --git a/examples/pom.xml b/examples/pom.xml index a88fdbb8..1f23c0c1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -22,7 +22,7 @@ org.moditect.layrry layrry-aggregator - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT org.moditect.layrry.example diff --git a/examples/vertx-example/layrry-links-core/pom.xml b/examples/vertx-example/layrry-links-core/pom.xml index 437850d1..fc83da79 100644 --- a/examples/vertx-example/layrry-links-core/pom.xml +++ b/examples/vertx-example/layrry-links-core/pom.xml @@ -25,7 +25,7 @@ org.moditect.layrry.example.links layrry-links-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT layrry-links-core @@ -37,7 +37,7 @@ org.moditect.layrry layrry-platform - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT io.vertx diff --git a/examples/vertx-example/layrry-links-greenkeeping/pom.xml b/examples/vertx-example/layrry-links-greenkeeping/pom.xml index 1c01af4f..849e805a 100644 --- a/examples/vertx-example/layrry-links-greenkeeping/pom.xml +++ b/examples/vertx-example/layrry-links-greenkeeping/pom.xml @@ -25,7 +25,7 @@ org.moditect.layrry.example.links layrry-links-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT layrry-links-greenkeeping diff --git a/examples/vertx-example/layrry-links-logconfig/pom.xml b/examples/vertx-example/layrry-links-logconfig/pom.xml index 038a7c35..c8f05a41 100644 --- a/examples/vertx-example/layrry-links-logconfig/pom.xml +++ b/examples/vertx-example/layrry-links-logconfig/pom.xml @@ -23,7 +23,7 @@ org.moditect.layrry.example.links layrry-links-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT layrry-links-logconfig diff --git a/examples/vertx-example/layrry-links-membership/pom.xml b/examples/vertx-example/layrry-links-membership/pom.xml index 0052ef98..f242fee7 100644 --- a/examples/vertx-example/layrry-links-membership/pom.xml +++ b/examples/vertx-example/layrry-links-membership/pom.xml @@ -25,7 +25,7 @@ org.moditect.layrry.example.links layrry-links-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT layrry-links-membership diff --git a/examples/vertx-example/layrry-links-runner/pom.xml b/examples/vertx-example/layrry-links-runner/pom.xml index 591f17e5..711828d4 100644 --- a/examples/vertx-example/layrry-links-runner/pom.xml +++ b/examples/vertx-example/layrry-links-runner/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry.example.links layrry-links-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/examples/vertx-example/layrry-links-tournament/pom.xml b/examples/vertx-example/layrry-links-tournament/pom.xml index ce904528..d7798cf1 100644 --- a/examples/vertx-example/layrry-links-tournament/pom.xml +++ b/examples/vertx-example/layrry-links-tournament/pom.xml @@ -25,7 +25,7 @@ org.moditect.layrry.example.links layrry-links-example - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT layrry-links-tournament diff --git a/examples/vertx-example/pom.xml b/examples/vertx-example/pom.xml index 49046726..f135c35d 100644 --- a/examples/vertx-example/pom.xml +++ b/examples/vertx-example/pom.xml @@ -22,7 +22,7 @@ org.moditect.layrry.example layrry-examples-aggregator - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT org.moditect.layrry.example.links diff --git a/integration-test/it-app/pom.xml b/integration-test/it-app/pom.xml index bc09aa35..6860e6d5 100644 --- a/integration-test/it-app/pom.xml +++ b/integration-test/it-app/pom.xml @@ -23,7 +23,7 @@ org.moditect.layrry.it layrry-integrationtest - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT it-app diff --git a/integration-test/it-bar/pom.xml b/integration-test/it-bar/pom.xml index 0e941b05..98f766f6 100644 --- a/integration-test/it-bar/pom.xml +++ b/integration-test/it-bar/pom.xml @@ -22,7 +22,7 @@ org.moditect.layrry.it layrry-integrationtest - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT it-bar diff --git a/integration-test/it-foo/pom.xml b/integration-test/it-foo/pom.xml index 1b8a8beb..ab95baa3 100644 --- a/integration-test/it-foo/pom.xml +++ b/integration-test/it-foo/pom.xml @@ -23,7 +23,7 @@ org.moditect.layrry.it layrry-integrationtest - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT it-foo diff --git a/integration-test/it-greeter-1.0.0/pom.xml b/integration-test/it-greeter-1.0.0/pom.xml index 9e3c1310..dc1ac0e6 100644 --- a/integration-test/it-greeter-1.0.0/pom.xml +++ b/integration-test/it-greeter-1.0.0/pom.xml @@ -23,7 +23,7 @@ org.moditect.layrry.it layrry-integrationtest - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT it-greeter diff --git a/integration-test/it-greeter-2.0.0/pom.xml b/integration-test/it-greeter-2.0.0/pom.xml index dbbf7c8c..8a7cfc25 100644 --- a/integration-test/it-greeter-2.0.0/pom.xml +++ b/integration-test/it-greeter-2.0.0/pom.xml @@ -23,7 +23,7 @@ org.moditect.layrry.it layrry-integrationtest - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT it-greeter diff --git a/integration-test/it-logconfig/pom.xml b/integration-test/it-logconfig/pom.xml index 6cac9885..3187bcde 100644 --- a/integration-test/it-logconfig/pom.xml +++ b/integration-test/it-logconfig/pom.xml @@ -23,7 +23,7 @@ org.moditect.layrry.it layrry-integrationtest - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT it-logconfig diff --git a/integration-test/it-runner/pom.xml b/integration-test/it-runner/pom.xml index 4b716b37..90e144bf 100644 --- a/integration-test/it-runner/pom.xml +++ b/integration-test/it-runner/pom.xml @@ -23,7 +23,7 @@ org.moditect.layrry.it layrry-integrationtest - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT layrry-integrationtest-runner diff --git a/integration-test/pom.xml b/integration-test/pom.xml index b553d50e..5997edda 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ org.moditect.layrry layrry-aggregator - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT org.moditect.layrry.it diff --git a/layrry-config-toml/pom.xml b/layrry-config-toml/pom.xml index b7eb9d5b..6ce53356 100644 --- a/layrry-config-toml/pom.xml +++ b/layrry-config-toml/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry layrry-aggregator - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/layrry-config-yaml/pom.xml b/layrry-config-yaml/pom.xml index 9a85f517..1721d221 100644 --- a/layrry-config-yaml/pom.xml +++ b/layrry-config-yaml/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry layrry-aggregator - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/layrry-config/pom.xml b/layrry-config/pom.xml index 3492af5a..26139ca9 100644 --- a/layrry-config/pom.xml +++ b/layrry-config/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry layrry-aggregator - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/layrry-core/pom.xml b/layrry-core/pom.xml index 7829c27e..ec4d1769 100644 --- a/layrry-core/pom.xml +++ b/layrry-core/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry layrry-aggregator - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/layrry-launcher/pom.xml b/layrry-launcher/pom.xml index 48e4b1f9..93b04ae9 100644 --- a/layrry-launcher/pom.xml +++ b/layrry-launcher/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry layrry-aggregator - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/layrry-platform/pom.xml b/layrry-platform/pom.xml index 0a33b574..81e62f22 100644 --- a/layrry-platform/pom.xml +++ b/layrry-platform/pom.xml @@ -21,7 +21,7 @@ org.moditect.layrry layrry-aggregator - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index a34c0910..816f5dda 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.moditect.layrry layrry-aggregator - 1.0.0.Alpha2 + 1.0.0-SNAPSHOT pom Layrry Aggregator @@ -48,6 +48,8 @@ 11 2.1.0 3.4.2 + 1.6 + 1.6.13 3.1.0 3.3.0 2.18.0 @@ -61,10 +63,18 @@ + + gunnarmorling + Gunnar Morling + https://www.morling.dev + + author + + aalmiray Andres Almiray - http://andresalmiray.com/ + https://andresalmiray.com @@ -227,14 +237,20 @@ org.jreleaser jreleaser-maven-plugin - 1.1.0 + 1.3.0 false + + CLI + master true + + true + ALWAYS - {{commitShortHash}} {{commitTitle}} @@ -311,8 +327,20 @@ + + + RELEASE + + + + + commons-io + commons-io + 2.11.0 + +