From fe93959fd02e49be1027da96e21c5e4303fd9997 Mon Sep 17 00:00:00 2001 From: Philippe Charles Date: Wed, 14 Apr 2021 16:30:50 +0200 Subject: [PATCH 1/5] Update for next development version --- pom.xml | 2 +- sandbox-api/pom.xml | 2 +- sandbox-cli/pom.xml | 6 +++--- sandbox-impl/pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 7305144a..8fcfd1fe 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.nbbrd.sandbox sandbox-parent - 1.14.0 + 1.14.1-SNAPSHOT pom sandbox diff --git a/sandbox-api/pom.xml b/sandbox-api/pom.xml index 108b5056..f7e79e5c 100644 --- a/sandbox-api/pom.xml +++ b/sandbox-api/pom.xml @@ -5,7 +5,7 @@ sandbox-parent com.github.nbbrd.sandbox - 1.14.0 + 1.14.1-SNAPSHOT 4.0.0 diff --git a/sandbox-cli/pom.xml b/sandbox-cli/pom.xml index 766a8f6e..df2f5259 100644 --- a/sandbox-cli/pom.xml +++ b/sandbox-cli/pom.xml @@ -5,7 +5,7 @@ sandbox-parent com.github.nbbrd.sandbox - 1.14.0 + 1.14.1-SNAPSHOT 4.0.0 @@ -25,12 +25,12 @@ com.github.nbbrd.sandbox sandbox-api - 1.14.0 + 1.14.1-SNAPSHOT com.github.nbbrd.sandbox sandbox-impl - 1.14.0 + 1.14.1-SNAPSHOT info.picocli diff --git a/sandbox-impl/pom.xml b/sandbox-impl/pom.xml index 55f6ce58..696755fa 100644 --- a/sandbox-impl/pom.xml +++ b/sandbox-impl/pom.xml @@ -5,7 +5,7 @@ sandbox-parent com.github.nbbrd.sandbox - 1.14.0 + 1.14.1-SNAPSHOT 4.0.0 @@ -19,7 +19,7 @@ com.github.nbbrd.sandbox sandbox-api - 1.14.0 + 1.14.1-SNAPSHOT com.github.lalyos From 0bb6f5cd4aecbc7b17ad4c574752b43a2602ea8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Apr 2021 04:12:19 +0000 Subject: [PATCH 2/5] Bump pomchecker-enforcer-rules from 1.1.0 to 1.2.0 Bumps pomchecker-enforcer-rules from 1.1.0 to 1.2.0. Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8fcfd1fe..9b8d6ea8 100644 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,7 @@ org.kordamp.maven pomchecker-enforcer-rules - 1.1.0 + 1.2.0 From 8c4e87aeade8e9746b6541282bae61dd943061d9 Mon Sep 17 00:00:00 2001 From: Philippe Charles Date: Mon, 19 Apr 2021 10:51:03 +0200 Subject: [PATCH 3/5] Fix logic in maven deploy script --- .github/workflows/java8-maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java8-maven.yml b/.github/workflows/java8-maven.yml index 15a4430d..1896b23c 100644 --- a/.github/workflows/java8-maven.yml +++ b/.github/workflows/java8-maven.yml @@ -72,7 +72,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Deploy snapshot with Maven if settings defined - run: test -f ci.settings.xml && mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules + run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules env: OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} @@ -109,7 +109,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Deploy with Maven if settings defined - run: test -f ci.settings.xml && mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules + run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules env: OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} From 4b8a1031b2bb2948667dd992c7f96367b510d56b Mon Sep 17 00:00:00 2001 From: Philippe Charles Date: Fri, 23 Apr 2021 16:26:19 +0200 Subject: [PATCH 4/5] Add release deploy to GitHub Packages --- .github/workflows/java8-maven.yml | 2 ++ ci.settings.xml | 6 +++--- pom.xml | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/java8-maven.yml b/.github/workflows/java8-maven.yml index 1896b23c..2b572262 100644 --- a/.github/workflows/java8-maven.yml +++ b/.github/workflows/java8-maven.yml @@ -115,6 +115,8 @@ jobs: OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} - name: Build assets with Maven run: mvn -B -ntp install -DskipTests=true -P base-deploy diff --git a/ci.settings.xml b/ci.settings.xml index 2be48f0f..21798eb9 100644 --- a/ci.settings.xml +++ b/ci.settings.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - ossrh - ${env.OSSRH_USERNAME} - ${env.OSSRH_TOKEN} + github + ${env.GITHUB_ACTOR} + ${env.GITHUB_TOKEN} diff --git a/pom.xml b/pom.xml index 9b8d6ea8..e0d8b152 100644 --- a/pom.xml +++ b/pom.xml @@ -294,8 +294,9 @@ release-deploy - local-folder - file:${basedir}/../releases + github + GitHub Packages + https://maven.pkg.github.com/nbbrd/sandbox From a380ff9233448461a50956c1f4a791dcc5fcc24a Mon Sep 17 00:00:00 2001 From: Philippe Charles Date: Fri, 23 Apr 2021 16:31:27 +0200 Subject: [PATCH 5/5] Update versions for release --- pom.xml | 2 +- sandbox-api/pom.xml | 2 +- sandbox-cli/pom.xml | 6 +++--- sandbox-impl/pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index e0d8b152..9eef79e7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.nbbrd.sandbox sandbox-parent - 1.14.1-SNAPSHOT + 1.15.0 pom sandbox diff --git a/sandbox-api/pom.xml b/sandbox-api/pom.xml index f7e79e5c..0819c33c 100644 --- a/sandbox-api/pom.xml +++ b/sandbox-api/pom.xml @@ -5,7 +5,7 @@ sandbox-parent com.github.nbbrd.sandbox - 1.14.1-SNAPSHOT + 1.15.0 4.0.0 diff --git a/sandbox-cli/pom.xml b/sandbox-cli/pom.xml index df2f5259..7b50b685 100644 --- a/sandbox-cli/pom.xml +++ b/sandbox-cli/pom.xml @@ -5,7 +5,7 @@ sandbox-parent com.github.nbbrd.sandbox - 1.14.1-SNAPSHOT + 1.15.0 4.0.0 @@ -25,12 +25,12 @@ com.github.nbbrd.sandbox sandbox-api - 1.14.1-SNAPSHOT + 1.15.0 com.github.nbbrd.sandbox sandbox-impl - 1.14.1-SNAPSHOT + 1.15.0 info.picocli diff --git a/sandbox-impl/pom.xml b/sandbox-impl/pom.xml index 696755fa..9bffd38c 100644 --- a/sandbox-impl/pom.xml +++ b/sandbox-impl/pom.xml @@ -5,7 +5,7 @@ sandbox-parent com.github.nbbrd.sandbox - 1.14.1-SNAPSHOT + 1.15.0 4.0.0 @@ -19,7 +19,7 @@ com.github.nbbrd.sandbox sandbox-api - 1.14.1-SNAPSHOT + 1.15.0 com.github.lalyos