From e884a22c5fe282a3905cd7b6af1795241931a838 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 3 Jun 2025 11:19:08 -0700 Subject: [PATCH 01/60] skip tests for now --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 5f0fc09a..af3a3757 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -131,7 +131,7 @@ jobs: - id: release name: Release to production - run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DpreparationGoals=install + run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -DpreparationGoals=install - id: rollback name: Rollback From b64487f4e4124ec7bb6ed1f8f454f81d38175bdb Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 3 Jun 2025 11:34:10 -0700 Subject: [PATCH 02/60] trying with this command to skip prod environment checks for now --- .github/workflows/maven-publish.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index af3a3757..1d8571e9 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -131,7 +131,8 @@ jobs: - id: release name: Release to production - run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -DpreparationGoals=install + run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install + # run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -X -DpreparationGoals=install - id: rollback name: Rollback From 32941535498d158f812f1a19ad23a1496a6d834b Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 3 Jun 2025 12:11:08 -0700 Subject: [PATCH 03/60] something is awry with git? --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 1d8571e9..98a06cd5 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -131,7 +131,7 @@ jobs: - id: release name: Release to production - run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install + run: git remote -v && mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install # run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -X -DpreparationGoals=install - id: rollback From 499a47ec6fa969b50329b95b15bd621b9dc556e6 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 3 Jun 2025 13:26:26 -0700 Subject: [PATCH 04/60] try passing github credentials --- .github/workflows/maven-publish.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 98a06cd5..8c4e317f 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -58,6 +58,7 @@ jobs: java-version: '17' distribution: 'temurin' cache: 'maven' + server-id: github settings-path: ${{ github.workspace }} - id: server-setup @@ -114,6 +115,7 @@ jobs: java-version: '17' distribution: 'temurin' cache: 'maven' + server-id: github settings-path: ${{ github.workspace }} - id: server-setup @@ -131,7 +133,9 @@ jobs: - id: release name: Release to production - run: git remote -v && mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install # run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -X -DpreparationGoals=install - id: rollback From 90373f4fc2ad3636a17d98f753b79588660caa6f Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 3 Jun 2025 14:16:52 -0700 Subject: [PATCH 05/60] removing ssh key and using https instead --- .github/workflows/maven-publish.yml | 18 ++---------------- parent-pom/pom.xml | 4 ++-- pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 8c4e317f..7dc00c9a 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -16,7 +16,7 @@ jobs: if: ${{ github.ref == 'refs/heads/develop' }} environment: dev permissions: - contents: read + contents: write packages: write steps: @@ -41,12 +41,6 @@ jobs: # Verify gpg secret key gpg --list-secret-keys --keyid-format LONG - - id: ssh-setup - name: Set SSH key - uses: webfactory/ssh-agent@v0.9.0 - with: - ssh-private-key: ${{ secrets.TAG_SSH_KEY }} - - id: git-config name: Set GIT user name and email uses: fregante/setup-git-user@v2 @@ -82,7 +76,7 @@ jobs: if: ${{ github.ref == 'refs/heads/main' }} environment: dev permissions: - contents: read + contents: write packages: write steps: @@ -98,12 +92,6 @@ jobs: # Verify gpg secret key gpg --list-secret-keys --keyid-format LONG - - id: ssh-setup - name: Set SSH key - uses: webfactory/ssh-agent@v0.9.0 - with: - ssh-private-key: ${{ secrets.TAG_SSH_KEY }} - - id: git-config name: Set GIT user name and email uses: fregante/setup-git-user@v2 @@ -133,8 +121,6 @@ jobs: - id: release name: Release to production - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install # run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -X -DpreparationGoals=install diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 32862ca7..2af1a75a 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -27,8 +27,8 @@ - scm:git:git@github.com:polyapi/polyapi-java.git - scm:git:git@github.com:polyapi/polyapi-java.git + scm:git:https://github.com/polyapi/polyapi-java.git + scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java HEAD diff --git a/pom.xml b/pom.xml index f69e2965..38caac2d 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,8 @@ - scm:git:git@github.com:polyapi/polyapi-java.git - scm:git:git@github.com:polyapi/polyapi-java.git + scm:git:https://github.com/polyapi/polyapi-java.git + scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java HEAD From 944922f31ed88fadfaf3082211d75c6a54c0c21d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 21:44:52 +0000 Subject: [PATCH 06/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 539fcfd0..6ce31f1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eca445a0..eaa6bd12 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 2af1a75a..6d6638ef 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 8ee5cb6a..04f45ef0 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 38caac2d..890b493a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From 2c697d1141832fad503ad24fc57dedca5c012bbd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 21:44:53 +0000 Subject: [PATCH 07/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 6ce31f1e..cf28ce1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eaa6bd12..75472332 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 6d6638ef..8b444c3d 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 04f45ef0..93cf2165 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 890b493a..ddef9809 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From 85d00015cec6fc9946ac0a4894446da95440eaa7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 21:44:57 +0000 Subject: [PATCH 08/60] [maven-release-plugin] rollback the release of polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 6 ++++-- polyapi-maven-plugin/pom.xml | 5 +++-- pom.xml | 6 ++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index cf28ce1e..539fcfd0 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index 75472332..eca445a0 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 8b444c3d..2af1a75a 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 93cf2165..8ee5cb6a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index ddef9809..38caac2d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom From be9ff6e98b1bbd484eaac7d3b647d23c11dffb46 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 3 Jun 2025 14:56:27 -0700 Subject: [PATCH 09/60] lets try setting the git remote repository --- .github/workflows/maven-publish.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 7dc00c9a..32da92f0 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -96,6 +96,16 @@ jobs: name: Set GIT user name and email uses: fregante/setup-git-user@v2 + + - id: git-auth + name: Configure git to use GitHub token over HTTPS + run: | + git remote set-url origin https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git + + - name: Override SCM URL with GitHub token + run: | + git config --global url."https://${{ secrets.GITHUB_TOKEN }}@github.com/".insteadOf "https://github.com/" + - id: jdk-setup name: Setup JDK uses: actions/setup-java@v3 From 5ff35427792f64c1da585daf6b2ad3ebd4d16b63 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 21:57:11 +0000 Subject: [PATCH 10/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 539fcfd0..6ce31f1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eca445a0..eaa6bd12 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 2af1a75a..6d6638ef 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 8ee5cb6a..04f45ef0 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 38caac2d..890b493a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From b5b10f9b4b90a728c9d480a990fb739ed274bf82 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 21:57:12 +0000 Subject: [PATCH 11/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 6ce31f1e..cf28ce1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eaa6bd12..75472332 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 6d6638ef..8b444c3d 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 04f45ef0..93cf2165 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 890b493a..ddef9809 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From 7bee73ffe0f78929782453b467e0d076bb5a79da Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 21:57:16 +0000 Subject: [PATCH 12/60] [maven-release-plugin] rollback the release of polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 6 ++++-- polyapi-maven-plugin/pom.xml | 5 +++-- pom.xml | 6 ++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index cf28ce1e..539fcfd0 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index 75472332..eca445a0 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 8b444c3d..2af1a75a 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 93cf2165..8ee5cb6a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index ddef9809..38caac2d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom From 8dd3c240cd4e80704a58b6a9ade4ec7f931274ec Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 3 Jun 2025 14:59:47 -0700 Subject: [PATCH 13/60] round 2 --- .github/workflows/maven-publish.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 32da92f0..5c9228c7 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -102,10 +102,6 @@ jobs: run: | git remote set-url origin https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git - - name: Override SCM URL with GitHub token - run: | - git config --global url."https://${{ secrets.GITHUB_TOKEN }}@github.com/".insteadOf "https://github.com/" - - id: jdk-setup name: Setup JDK uses: actions/setup-java@v3 @@ -131,7 +127,7 @@ jobs: - id: release name: Release to production - run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install + run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install -Dscm.url=scm:git:https://${secrets.GITHUB_TOKEN}@github.com/polyapi/polyapi-java.git # run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -X -DpreparationGoals=install - id: rollback From 35c9eaea236dadf790c3a9764d8ed69b051fea42 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 3 Jun 2025 15:01:05 -0700 Subject: [PATCH 14/60] round 3 --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 5c9228c7..9dc78328 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -127,7 +127,7 @@ jobs: - id: release name: Release to production - run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install -Dscm.url=scm:git:https://${secrets.GITHUB_TOKEN}@github.com/polyapi/polyapi-java.git + run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install -Dscm.url=scm:git:https://${{secrets.GITHUB_TOKEN}}@github.com/polyapi/polyapi-java.git # run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -X -DpreparationGoals=install - id: rollback From 4e9b13faf01c6de0151fb32d46fd76ba18d2a942 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 22:01:53 +0000 Subject: [PATCH 15/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 539fcfd0..6ce31f1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eca445a0..eaa6bd12 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 2af1a75a..6d6638ef 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 8ee5cb6a..04f45ef0 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 38caac2d..890b493a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From a2f5460b594e8e79d0f28e46901e89f285ff27ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 22:01:54 +0000 Subject: [PATCH 16/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 6ce31f1e..cf28ce1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eaa6bd12..75472332 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 6d6638ef..8b444c3d 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 04f45ef0..93cf2165 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 890b493a..ddef9809 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:https://github.com/polyapi/polyapi-java.git scm:git:https://github.com/polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From 25973da5bbf89d793a622b553563fd56f596ee1b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 22:01:58 +0000 Subject: [PATCH 17/60] [maven-release-plugin] rollback the release of polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 6 ++++-- polyapi-maven-plugin/pom.xml | 5 +++-- pom.xml | 6 ++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index cf28ce1e..539fcfd0 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index 75472332..eca445a0 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 8b444c3d..2af1a75a 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 93cf2165..8ee5cb6a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index ddef9809..38caac2d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom From 2085fa39876ad4ddb7d3d04dab40936ed1af8337 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 3 Jun 2025 15:07:04 -0700 Subject: [PATCH 18/60] let's go back to ssh --- .github/workflows/maven-publish.yml | 20 +++++++++++++------- parent-pom/pom.xml | 4 ++-- pom.xml | 4 ++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 9dc78328..5b3f8d40 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -41,6 +41,12 @@ jobs: # Verify gpg secret key gpg --list-secret-keys --keyid-format LONG + - id: ssh-setup + name: Set SSH key + uses: webfactory/ssh-agent@v0.9.0 + with: + ssh-private-key: ${{ secrets.TAG_SSH_KEY }} + - id: git-config name: Set GIT user name and email uses: fregante/setup-git-user@v2 @@ -92,16 +98,16 @@ jobs: # Verify gpg secret key gpg --list-secret-keys --keyid-format LONG + - id: ssh-setup + name: Set SSH key + uses: webfactory/ssh-agent@v0.9.0 + with: + ssh-private-key: ${{ secrets.TAG_SSH_KEY }} + - id: git-config name: Set GIT user name and email uses: fregante/setup-git-user@v2 - - - id: git-auth - name: Configure git to use GitHub token over HTTPS - run: | - git remote set-url origin https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git - - id: jdk-setup name: Setup JDK uses: actions/setup-java@v3 @@ -127,7 +133,7 @@ jobs: - id: release name: Release to production - run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install -Dscm.url=scm:git:https://${{secrets.GITHUB_TOKEN}}@github.com/polyapi/polyapi-java.git + run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install # run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -X -DpreparationGoals=install - id: rollback diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 2af1a75a..32862ca7 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -27,8 +27,8 @@ - scm:git:https://github.com/polyapi/polyapi-java.git - scm:git:https://github.com/polyapi/polyapi-java.git + scm:git:git@github.com:polyapi/polyapi-java.git + scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java HEAD diff --git a/pom.xml b/pom.xml index 38caac2d..f69e2965 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,8 @@ - scm:git:https://github.com/polyapi/polyapi-java.git - scm:git:https://github.com/polyapi/polyapi-java.git + scm:git:git@github.com:polyapi/polyapi-java.git + scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java HEAD From 7a06ffd7ce5af3eec339d4ae932ddf8857d055bf Mon Sep 17 00:00:00 2001 From: "eric.neumann" Date: Tue, 3 Jun 2025 17:39:25 -0700 Subject: [PATCH 19/60] EN #4386 fix simple-name collisions --- .../generation/PolyObjectResolverService.java | 16 +++++- .../service/template/PolyHandlebars.java | 45 +++++++++++++++ .../resources/templates/ResolvedContext.hbs | 57 +++++++++++-------- 3 files changed, 92 insertions(+), 26 deletions(-) diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/generation/PolyObjectResolverService.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/generation/PolyObjectResolverService.java index fc5190ad..7fb74f16 100644 --- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/generation/PolyObjectResolverService.java +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/generation/PolyObjectResolverService.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.Function; @@ -43,6 +44,8 @@ @Slf4j public class PolyObjectResolverService { private final JsonSchemaParser jsonSchemaParser; + private static final Pattern VALID_IMPORT = + Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*(\\.[a-zA-Z_][a-zA-Z0-9_]*)+$"); public PolyObjectResolverService(JsonSchemaParser jsonSchemaParser) { this.jsonSchemaParser = jsonSchemaParser; @@ -92,12 +95,21 @@ public ResolvedServerVariableSpecification resolve(ServerVariableSpecification s public ResolvedContext resolve(Context context) { Set imports = new HashSet<>(); - context.getSubcontexts().stream().map(subcontext -> format("%s.%s", subcontext.getPackageName(), subcontext.getClassName())).forEach(imports::add); + context.getSubcontexts().stream() + .map(subcontext -> format("%s.%s", subcontext.getPackageName(), subcontext.getClassName())) + .filter(s -> !s.isBlank()) + .forEach(imports::add); context.getSpecifications().forEach(specification -> { ImportsCollectorVisitor importsCollectorVisitor = new ImportsCollectorVisitor(specification.getPackageName(), specification.getClassName(), jsonSchemaParser); importsCollectorVisitor.doVisit(specification); - imports.addAll(importsCollectorVisitor.getImports()); + importsCollectorVisitor.getImports().stream() + .filter(Objects::nonNull) + .filter(s -> !s.isBlank()) + .filter(s -> VALID_IMPORT.matcher(s).matches()) + .filter(s -> !s.substring(s.lastIndexOf('.') + 1).equals(context.getClassName())) + .forEach(imports::add); }); + return new ResolvedContext(context.getName(), context.getPackageName(), imports, context.getClassName(), context.getSubcontexts().stream().map(this::resolve).toList(), context.getSpecifications().stream().map(specification -> { PolyObjectResolverVisitor visitor = new PolyObjectResolverVisitor(this); visitor.doVisit(specification); diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/template/PolyHandlebars.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/template/PolyHandlebars.java index 5d812e8a..5781e0ba 100644 --- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/template/PolyHandlebars.java +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/template/PolyHandlebars.java @@ -7,6 +7,7 @@ import java.util.function.BiPredicate; import java.util.function.Function; +import java.lang.reflect.Method; public class PolyHandlebars extends Handlebars { @@ -15,6 +16,50 @@ public PolyHandlebars() { registerSimpleHelper("toCamelCase", StringUtils::toCamelCase); registerSimpleHelper("toPascalCase", StringUtils::toCamelCase); registerConditionalHelper("ifIsType", (object, options) -> object.getClass().getSimpleName().equals(options.param(0))); + registerSimpleHelper("lastSegment", (Object fqn) -> { + if (fqn == null) { + return ""; + } + String s = fqn.toString(); + int idx = s.lastIndexOf('.'); + return idx == -1 ? s : s.substring(idx + 1); + }); + registerConditionalHelper("eq", + (obj, opts) -> { + Object other = opts.param(0, ""); + return obj != null && obj.toString().equals(other == null ? "" : other.toString()); + }); + registerHelper("typeRef", (Object ctx, Options opts) -> { + if (ctx == null) { + return ""; + } + String fqn = ctx.toString(); + String parentSimple = opts.param(0, "").toString(); + String simple = fqn.substring(fqn.lastIndexOf('.') + 1); + return simple.equals(parentSimple) ? fqn : simple; + }); + registerHelper("classFqn", (Object ctx, Options o) -> { + if (ctx == null) return ""; + + for (String m : new String[]{"getFullClassName", "getFullName"}) { + try { + Method mm = ctx.getClass().getMethod(m); + Object val = mm.invoke(ctx); + if (val != null) return val.toString(); + } catch (ReflectiveOperationException ignored) {} + } + + try { + Method pm = ctx.getClass().getMethod("getPackageName"); + Method cm = ctx.getClass().getMethod("getClassName"); + Object pkg = pm.invoke(ctx); + Object cls = cm.invoke(ctx); + if (pkg != null && cls != null) return pkg + "." + cls; + if (cls != null) return cls.toString(); + } catch (ReflectiveOperationException ignored) {} + + return ""; + }); } private void registerSimpleHelper(String name, Function helper) { diff --git a/polyapi-maven-plugin/src/main/resources/templates/ResolvedContext.hbs b/polyapi-maven-plugin/src/main/resources/templates/ResolvedContext.hbs index 9765b8fd..92eff32b 100644 --- a/polyapi-maven-plugin/src/main/resources/templates/ResolvedContext.hbs +++ b/polyapi-maven-plugin/src/main/resources/templates/ResolvedContext.hbs @@ -8,68 +8,74 @@ import io.polyapi.client.api.model.PolyEntity; import io.polyapi.client.api.AuthTokenOptions; import io.polyapi.commons.api.model.PolyGeneratedClass; {{~#each this.imports}} +{{~#unless (eq (lastSegment this) ../className)}} import {{{this}}}; +{{~/unless}} {{~/each}} @PolyGeneratedClass public class {{className}} extends PolyContext { {{~#each functionSpecifications}} - private final {{this.className}} {{this.name}}; + private final {{typeRef (classFqn this) ../className}} {{this.name}}; {{~/each}} {{~#each standardAuthFunctionSpecifications}} - private final {{this.className}} {{this.name}}; + private final {{typeRef (classFqn this) ../className}} {{this.name}}; {{~/each}} {{~#each subresourceAuthFunctionSpecifications}} - private final {{this.className}} {{this.name}}; + private final {{typeRef (classFqn this) ../className}} {{this.name}}; {{~/each}} {{~#each serverVariableSpecifications}} - public final {{this.className}} {{this.name}}; + private final {{typeRef (classFqn this) ../className}} {{this.name}}; {{~/each}} {{~#each webhookHandlerSpecifications}} - private final {{this.className}} {{this.name}}; + private final {{typeRef (classFqn this) ../className}} {{this.name}}; {{~/each}} {{#each subcontexts}} - public final {{this.className}} {{this.name}}; + private final {{typeRef (classFqn this) ../className}} {{this.name}}; {{~/each}} - public {{className}}(PolyProxyFactory proxyFactory, WebSocketClient webSocketClient) { - super(proxyFactory, webSocketClient); +public {{className}}(PolyProxyFactory proxyFactory, WebSocketClient webSocketClient) { +super(proxyFactory, webSocketClient); {{~#each serverFunctionSpecifications}} - this.{{this.name}} = createServerFunctionProxy({{this.className}}.class); + this.{{this.name}} = + createServerFunctionProxy({{classFqn this}}.class); {{~/each}} {{~#each customFunctionSpecifications}} - this.{{this.name}} = createCustomFunctionProxy({{this.className}}.class); + this.{{this.name}} = + createCustomFunctionProxy({{classFqn this}}.class); {{~/each}} {{~#each apiFunctionSpecifications}} - this.{{this.name}} = createApiFunctionProxy({{this.className}}.class); + this.{{this.name}} = + createApiFunctionProxy({{classFqn this}}.class); {{~/each}} {{~#each subresourceAuthFunctionSpecifications}} - this.{{this.name}} = createSubresourceAuthFunction({{this.className}}.class); + this.{{this.name}} = + createSubresourceAuthFunction({{classFqn this}}.class); {{~/each}} {{~#each standardAuthFunctionSpecifications}} - this.{{this.name}} = create{{#if audienceRequired}}Audience{{/if}}TokenAuthFunction({{this.className}}.class); + this.{{this.name}} = + create{{#if audienceRequired}}Audience{{/if}}TokenAuthFunction({{classFqn this}}.class); {{~/each}} {{~#each serverVariableSpecifications}} - this.{{this.name}} = createServerVariableHandler({{this.className}}.class); + this.{{this.name}} = + createServerVariableHandler({{classFqn this}}.class); {{~/each}} {{~#each webhookHandlerSpecifications}} - this.{{this.name}} = createPolyTriggerProxy({{this.className}}.class); + this.{{this.name}} = + createPolyTriggerProxy({{classFqn this}}.class); {{~/each}} {{#each subcontexts}} - this.{{this.name}} = new {{this.className}}(proxyFactory, webSocketClient); + this.{{this.name}} = new {{typeRef (classFqn this) ../className}}(proxyFactory, webSocketClient); {{~/each}} } {{~#each functionSpecifications}} public {{{this.returnType}}} {{{this.methodSignature}}} { - {{~#if this.returnsValue}} - return - {{~else}} - {{~/if}} this.{{this.name}}.{{this.name}}({{this.paramVariableNames}}); + {{#if this.returnsValue}}return {{/if}}this.{{this.name}}.{{this.name}}({{this.paramVariableNames}}); } - public {{{this.className}}} get{{{this.className}}}Function() { - return this.{{{this.name}}}; + public {{typeRef (classFqn this) ../className}} get{{this.className}}Function() { + return this.{{this.name}}; } {{~/each}} @@ -110,6 +116,9 @@ public class {{className}} extends PolyContext { {{~#each specifications}} {{~#ifIsType this "AuthFunctionSpecification"}} + public {{typeRef (classFqn this) ../className}} get{{this.className}}AuthFunction() { + return this.{{this.name}}; + } {{~#if subResource}} public void {{name}}(String token) { this.{{name}}.{{name}}(token); @@ -127,8 +136,8 @@ public class {{className}} extends PolyContext { } {{~/if}} - public {{{this.className}}} get{{{this.className}}}AuthFunction() { - return this.{{{this.name}}}; + public {{typeRef (classFqn this) ../className}} get{{this.className}}AuthFunction() { + return this.{{this.name}}; } {{~/ifIsType}} {{~/each}} From 0657473e32b917555addcd62f63e6a9de7562f65 Mon Sep 17 00:00:00 2001 From: "eric.neumann" Date: Wed, 4 Jun 2025 08:14:28 -0700 Subject: [PATCH 20/60] EN #4386 update changelog --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b903e2ba..64ee4ccc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## +## [0.15.5] - 2025-06-04 + +### Added + +- `classFqn` helper to compute fully-qualified names +- import-filter to drop any illegal import strings +- `typeRef` helper to pick simple name or FQN and avoid duplicates +- `lastSegment` helper to filter out a context’s own class from imports + +### Changed + +- Updated `ResolvedContext.hbs` so that all generated-type references go through `typeRef` (simple names only when safe) +- Updated constructor loops in `ResolvedContext.hbs` to call proxy methods with `classFqn` (true FQNs) + +### Fixed + +- “already defined in this compilation unit” compile errors—SDK now builds without name collisions + +## ## [0.15.4] - 2024-11-15 ### Added From 0636d2ddbde69b1d0511d713e33f1989119be087 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 4 Jun 2025 13:39:56 -0700 Subject: [PATCH 21/60] Update maven-publish.yml --- .github/workflows/maven-publish.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 5b3f8d40..9d66c4cd 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -58,7 +58,6 @@ jobs: java-version: '17' distribution: 'temurin' cache: 'maven' - server-id: github settings-path: ${{ github.workspace }} - id: server-setup @@ -115,7 +114,6 @@ jobs: java-version: '17' distribution: 'temurin' cache: 'maven' - server-id: github settings-path: ${{ github.workspace }} - id: server-setup From 8a50b91bca60bac1c91f93fc7a94309eb2d57cc4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:01:58 +0000 Subject: [PATCH 22/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 539fcfd0..6ce31f1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eca445a0..eaa6bd12 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 32862ca7..393b9e2b 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 8ee5cb6a..04f45ef0 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index f69e2965..14ea0884 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From 5b437a5b9d4dbfea3378df11dd8f183e5ee2a682 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:02:00 +0000 Subject: [PATCH 23/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 6ce31f1e..cf28ce1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eaa6bd12..75472332 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 393b9e2b..a5816f63 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 04f45ef0..93cf2165 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 14ea0884..160b655b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From 4ebd55bb2f07494fcb42312ab0ce17341d7948da Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:02:16 +0000 Subject: [PATCH 24/60] [maven-release-plugin] rollback the release of polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 6 ++++-- polyapi-maven-plugin/pom.xml | 5 +++-- pom.xml | 6 ++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index cf28ce1e..539fcfd0 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index 75472332..eca445a0 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index a5816f63..32862ca7 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 93cf2165..8ee5cb6a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 160b655b..f69e2965 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom From cebca265b413214c89af77dd1d3ea91261b2c00b Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 4 Jun 2025 14:14:24 -0700 Subject: [PATCH 25/60] adding gpg key name --- .github/workflows/maven-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 9d66c4cd..a279979b 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -96,6 +96,7 @@ jobs: cat <(echo -e "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}") | gpg --batch --import # Verify gpg secret key gpg --list-secret-keys --keyid-format LONG + echo "MAVEN_GPG_KEY=${{ secrets.GPG_KEY_NAME }}" >> $GITHUB_ENV - id: ssh-setup name: Set SSH key From 52b5e1b278e8751338773044d50b881592fa27e4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:15:15 +0000 Subject: [PATCH 26/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 539fcfd0..6ce31f1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eca445a0..eaa6bd12 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 32862ca7..393b9e2b 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 8ee5cb6a..04f45ef0 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index f69e2965..14ea0884 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From 423ca3ebcc722f847aefbd26650eda8f54496e40 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:15:17 +0000 Subject: [PATCH 27/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 6ce31f1e..cf28ce1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eaa6bd12..75472332 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 393b9e2b..a5816f63 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 04f45ef0..93cf2165 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 14ea0884..160b655b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From 5e61de3099241e477868a53914f1dd2b4272e950 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:15:29 +0000 Subject: [PATCH 28/60] [maven-release-plugin] rollback the release of polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 6 ++++-- polyapi-maven-plugin/pom.xml | 5 +++-- pom.xml | 6 ++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index cf28ce1e..539fcfd0 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index 75472332..eca445a0 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index a5816f63..32862ca7 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 93cf2165..8ee5cb6a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 160b655b..f69e2965 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom From a594080795c02618113baffe989816767fc810cd Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 4 Jun 2025 14:33:01 -0700 Subject: [PATCH 29/60] logging gpg version --- .github/workflows/maven-publish.yml | 5 +++-- polyapi-maven-plugin/pom.xml | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index a279979b..3c412062 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -36,6 +36,7 @@ jobs: - id: gpg-install name: Install gpg secret key run: | + gpg --version # Install gpg secret key cat <(echo -e "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}") | gpg --batch --import # Verify gpg secret key @@ -92,11 +93,11 @@ jobs: - id: gpg-install name: Install gpg secret key run: | + gpg --version # Install gpg secret key cat <(echo -e "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}") | gpg --batch --import # Verify gpg secret key gpg --list-secret-keys --keyid-format LONG - echo "MAVEN_GPG_KEY=${{ secrets.GPG_KEY_NAME }}" >> $GITHUB_ENV - id: ssh-setup name: Set SSH key @@ -132,7 +133,7 @@ jobs: - id: release name: Release to production - run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install + run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -DpreparationGoals=install # run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -X -DpreparationGoals=install - id: rollback diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 8ee5cb6a..f60c0ade 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -127,9 +127,6 @@ false - - MAVEN_GPG_KEY - From 9bd0b543fcf009149e913f3ab5101e1aa9198cbe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:33:55 +0000 Subject: [PATCH 30/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 539fcfd0..6ce31f1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eca445a0..eaa6bd12 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 32862ca7..393b9e2b 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index f60c0ade..deb17f84 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index f69e2965..14ea0884 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From d309b3331833143a2ba1cc328a86f86cec752670 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:33:56 +0000 Subject: [PATCH 31/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 6ce31f1e..cf28ce1e 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index eaa6bd12..75472332 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 393b9e2b..a5816f63 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index deb17f84..46229749 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 14ea0884..160b655b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From 24a4604bad5a3300d6e719513481db08096211e5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:34:08 +0000 Subject: [PATCH 32/60] [maven-release-plugin] rollback the release of polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 6 ++++-- polyapi-maven-plugin/pom.xml | 5 +++-- pom.xml | 6 ++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index cf28ce1e..539fcfd0 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index 75472332..eca445a0 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index a5816f63..32862ca7 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 46229749..f60c0ade 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 160b655b..f69e2965 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom From 767fd97a94b5f4d28ec73cdc69d140acbc446e9d Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 4 Jun 2025 14:38:13 -0700 Subject: [PATCH 33/60] gpg arguments for loopback mode --- commons/pom.xml | 6 ++++++ library/pom.xml | 6 ++++++ parent-pom/pom.xml | 6 ++++++ polyapi-maven-plugin/pom.xml | 6 ++++++ pom.xml | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/commons/pom.xml b/commons/pom.xml index 539fcfd0..a1418b33 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -154,6 +154,12 @@ + + + --pinentry-mode + loopback + + org.sonatype.central diff --git a/library/pom.xml b/library/pom.xml index eca445a0..c13bc43d 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -104,6 +104,12 @@ + + + --pinentry-mode + loopback + + org.sonatype.central diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 32862ca7..0358f144 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -130,6 +130,12 @@ + + + --pinentry-mode + loopback + + org.sonatype.central diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index f60c0ade..6b8b82cd 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -142,6 +142,12 @@ + + + --pinentry-mode + loopback + + org.sonatype.central diff --git a/pom.xml b/pom.xml index f69e2965..61fc4387 100644 --- a/pom.xml +++ b/pom.xml @@ -193,6 +193,12 @@ + + + --pinentry-mode + loopback + + org.sonatype.central From b5e7bde634224ad7d01e1a637561862fecd8aabb Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 4 Jun 2025 14:42:04 -0700 Subject: [PATCH 34/60] bump --- .github/workflows/maven-publish.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 3c412062..9d66c4cd 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -36,7 +36,6 @@ jobs: - id: gpg-install name: Install gpg secret key run: | - gpg --version # Install gpg secret key cat <(echo -e "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}") | gpg --batch --import # Verify gpg secret key @@ -93,7 +92,6 @@ jobs: - id: gpg-install name: Install gpg secret key run: | - gpg --version # Install gpg secret key cat <(echo -e "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}") | gpg --batch --import # Verify gpg secret key @@ -133,7 +131,7 @@ jobs: - id: release name: Release to production - run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -DpreparationGoals=install + run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install # run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -X -DpreparationGoals=install - id: rollback From 566d7c67bc85095d375b3abbb171ae4a5de26eb6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:42:52 +0000 Subject: [PATCH 35/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a1418b33..a808fb4f 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index c13bc43d..cac3c344 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 0358f144..5ffd09fb 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 6b8b82cd..38e0ef0a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 61fc4387..2a5504fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From 0128091e93eb7740dbb711ef564ce320dc153584 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:42:53 +0000 Subject: [PATCH 36/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a808fb4f..75cf2819 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index cac3c344..f02dd9a3 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 5ffd09fb..b2ae77e0 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 38e0ef0a..56871939 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 2a5504fa..4a5ee6c7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From 0190254d9820c9ecedf7ffcb97bf9edd16904b25 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:43:05 +0000 Subject: [PATCH 37/60] [maven-release-plugin] rollback the release of polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 6 ++++-- polyapi-maven-plugin/pom.xml | 5 +++-- pom.xml | 6 ++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 75cf2819..a1418b33 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index f02dd9a3..c13bc43d 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index b2ae77e0..0358f144 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 56871939..6b8b82cd 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 4a5ee6c7..61fc4387 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom From 2c7ebac8544a06daf586d1cd976bf7c38fddae9e Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 4 Jun 2025 15:06:00 -0700 Subject: [PATCH 38/60] trying to fix final git push during deploy... --- .github/workflows/maven-publish.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 9d66c4cd..e1a0f556 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -88,6 +88,9 @@ jobs: - id: checkout name: Checkout uses: actions/checkout@v4 + with: + fetch-depth: 0 # Required for Maven Release Plugin + persist-credentials: false - id: gpg-install name: Install gpg secret key From d536678b3f301e508ba2a3a454cb69cdf1fb65d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:06:59 +0000 Subject: [PATCH 39/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a1418b33..a808fb4f 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index c13bc43d..cac3c344 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 0358f144..5ffd09fb 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 6b8b82cd..38e0ef0a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 61fc4387..2a5504fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From 02814251522b2afcdb5109b54fee9f10d60006cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:07:02 +0000 Subject: [PATCH 40/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a808fb4f..75cf2819 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index cac3c344..f02dd9a3 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 5ffd09fb..b2ae77e0 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 38e0ef0a..56871939 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 2a5504fa..4a5ee6c7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From fd83d7c88f4bb08a35a2aaa00523996251369c2d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:07:16 +0000 Subject: [PATCH 41/60] [maven-release-plugin] rollback the release of polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 6 ++++-- polyapi-maven-plugin/pom.xml | 5 +++-- pom.xml | 6 ++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 75cf2819..a1418b33 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index f02dd9a3..c13bc43d 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index b2ae77e0..0358f144 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 56871939..6b8b82cd 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 4a5ee6c7..61fc4387 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom From be66506900cd482cac28ba0cd8b9627a2895b388 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 4 Jun 2025 15:08:45 -0700 Subject: [PATCH 42/60] Update maven-publish.yml --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index e1a0f556..1699de2a 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -134,7 +134,7 @@ jobs: - id: release name: Release to production - run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -X -DpreparationGoals=install + run: mvn clean release:clean release:prepare release:perform -B -DskipTests=true -DpreparationGoals=install # run: mvn clean release:clean release:prepare release:perform -B -Darguments="-Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -Dprod.eu1.api.key=${{ secrets.PROD_EU1_SERVER_API_KEY }} -Dprod.na1.api.key=${{ secrets.PROD_NA1_SERVER_API_KEY }}" -DskipTests=true -X -DpreparationGoals=install - id: rollback From 562a520ad9b285380a9a9b77d283ed77576b7a8b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:09:51 +0000 Subject: [PATCH 43/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a1418b33..a808fb4f 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index c13bc43d..cac3c344 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 0358f144..5ffd09fb 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 6b8b82cd..38e0ef0a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 61fc4387..2a5504fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From 1c29aaf61296c65169ff0cddd3cf6a456b29686c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:09:54 +0000 Subject: [PATCH 44/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a808fb4f..75cf2819 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index cac3c344..f02dd9a3 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 5ffd09fb..b2ae77e0 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 38e0ef0a..56871939 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 2a5504fa..4a5ee6c7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From 33918a145c1e97ce974808465b4cca17a300e042 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:10:08 +0000 Subject: [PATCH 45/60] [maven-release-plugin] rollback the release of polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 6 ++++-- polyapi-maven-plugin/pom.xml | 5 +++-- pom.xml | 6 ++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 75cf2819..a1418b33 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index f02dd9a3..c13bc43d 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index b2ae77e0..0358f144 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 56871939..6b8b82cd 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 4a5ee6c7..61fc4387 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom From 791aec61b173f1c98fb40a1cdabdb95109ec8bb5 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 4 Jun 2025 15:18:31 -0700 Subject: [PATCH 46/60] Update maven-publish.yml --- .github/workflows/maven-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 1699de2a..1682e169 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -39,7 +39,7 @@ jobs: # Install gpg secret key cat <(echo -e "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}") | gpg --batch --import # Verify gpg secret key - gpg --list-secret-keys --keyid-format LONG + gpg --list-secret-keys --keyid-format=long || echo "❌ No secret keys found" - id: ssh-setup name: Set SSH key @@ -98,7 +98,7 @@ jobs: # Install gpg secret key cat <(echo -e "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}") | gpg --batch --import # Verify gpg secret key - gpg --list-secret-keys --keyid-format LONG + gpg --list-secret-keys --keyid-format=long || echo "❌ No secret keys found" - id: ssh-setup name: Set SSH key From 2a64172f9acce8b05cd1a8e024934f29d324c831 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:19:26 +0000 Subject: [PATCH 47/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a1418b33..a808fb4f 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index c13bc43d..cac3c344 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 0358f144..5ffd09fb 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 6b8b82cd..38e0ef0a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 61fc4387..2a5504fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From 6aae159d14e76e0859b753dfd3082560b3fa21e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:19:28 +0000 Subject: [PATCH 48/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a808fb4f..75cf2819 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index cac3c344..f02dd9a3 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 5ffd09fb..b2ae77e0 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 38e0ef0a..56871939 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 2a5504fa..4a5ee6c7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From 3a56b57d92ac53faf03ad22ed3182ea316bf2b3f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:19:43 +0000 Subject: [PATCH 49/60] [maven-release-plugin] rollback the release of polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 6 ++++-- polyapi-maven-plugin/pom.xml | 5 +++-- pom.xml | 6 ++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 75cf2819..a1418b33 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index f02dd9a3..c13bc43d 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index b2ae77e0..0358f144 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 56871939..6b8b82cd 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 4a5ee6c7..61fc4387 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom From 49e7a2a7b3661b3e6bd091cba69d3783bb7bbd91 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 4 Jun 2025 15:21:16 -0700 Subject: [PATCH 50/60] Update maven-publish.yml --- .github/workflows/maven-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 1682e169..d30c2773 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -99,6 +99,7 @@ jobs: cat <(echo -e "${{ secrets.MAVEN_GPG_PRIVATE_KEY }}") | gpg --batch --import # Verify gpg secret key gpg --list-secret-keys --keyid-format=long || echo "❌ No secret keys found" + echo "Installed gpg secret key" - id: ssh-setup name: Set SSH key From 754dbfa8b4c6703af003690a87fd4d1b525eee4e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:22:11 +0000 Subject: [PATCH 51/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a1418b33..a808fb4f 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index c13bc43d..cac3c344 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 0358f144..5ffd09fb 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 6b8b82cd..38e0ef0a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 61fc4387..2a5504fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From 490ca778711314ec09db0fe4225e701edfbf0d86 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:22:12 +0000 Subject: [PATCH 52/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a808fb4f..75cf2819 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index cac3c344..f02dd9a3 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 5ffd09fb..b2ae77e0 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 38e0ef0a..56871939 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 2a5504fa..4a5ee6c7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From 0284a82e18772262fbcfe3e18ce4569916534895 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:22:23 +0000 Subject: [PATCH 53/60] [maven-release-plugin] rollback the release of polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 6 ++++-- polyapi-maven-plugin/pom.xml | 5 +++-- pom.xml | 6 ++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 75cf2819..a1418b33 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index f02dd9a3..c13bc43d 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index b2ae77e0..0358f144 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 56871939..6b8b82cd 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,10 +1,11 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 4a5ee6c7..61fc4387 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom From 8758d3a85f6a3adc1d8f7089d8904644adf0d736 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 4 Jun 2025 15:31:02 -0700 Subject: [PATCH 54/60] Checkout main --- .github/workflows/maven-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index d30c2773..1fafc176 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -89,6 +89,7 @@ jobs: name: Checkout uses: actions/checkout@v4 with: + ref: main fetch-depth: 0 # Required for Maven Release Plugin persist-credentials: false From 5fe9d500eb82af2ba3396d52bdcd950614b2b373 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:31:54 +0000 Subject: [PATCH 55/60] [maven-release-plugin] prepare release polyapi-java-0.15.4 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 8 +++----- polyapi-maven-plugin/pom.xml | 5 ++--- pom.xml | 8 +++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a1418b33..a808fb4f 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index c13bc43d..cac3c344 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 0358f144..5ffd09fb 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 pom PolyAPI Java parent POM https://polyapi.io @@ -30,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 6b8b82cd..38e0ef0a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.polyapi parent-pom - 0.15.4-SNAPSHOT + 0.15.4 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 61fc4387..2a5504fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.polyapi polyapi-java - 0.15.4-SNAPSHOT + 0.15.4 pom parent-pom @@ -37,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.4 From 5bc0cedf5eae38a3ebcdf4017c5652da5b399156 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 22:31:55 +0000 Subject: [PATCH 56/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index a808fb4f..75cf2819 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index cac3c344..f02dd9a3 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 5ffd09fb..b2ae77e0 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 38e0ef0a..56871939 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.4 + 0.15.5-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 2a5504fa..4a5ee6c7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.4 + 0.15.5-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.4 + HEAD From 58c0e96f20f18edb1288dfc7b40b2909fcc4f598 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 4 Jun 2025 15:54:57 -0700 Subject: [PATCH 57/60] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 662f2fba..6e77fed3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Java Client Library -* Latest released version 0.15.3 -* Latest snapshot version 0.15.4-SNAPSHOT +* Latest released version 0.15.4 +* Latest snapshot version 0.15.5-SNAPSHOT ## Introduction This is the PolyAPI Java client GitHub page. If you are here, then it means you're familiar with what we do at Poly. If you aren't, you can always check [here](https://github.com/polyapi/poly-alpha). From 722c5d80cd88c4451e3b1d9446d5d654841a4eae Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 1 Jul 2025 11:53:17 -0700 Subject: [PATCH 58/60] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6e77fed3..88cbc32a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Java Client Library -* Latest released version 0.15.4 -* Latest snapshot version 0.15.5-SNAPSHOT +* Latest released version 0.15.5 +* Latest snapshot version 0.15.6-SNAPSHOT ## Introduction This is the PolyAPI Java client GitHub page. If you are here, then it means you're familiar with what we do at Poly. If you aren't, you can always check [here](https://github.com/polyapi/poly-alpha). From ba8277d013f7ac1ff00352b5c2abc3dac839528a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 19:46:03 +0000 Subject: [PATCH 59/60] [maven-release-plugin] prepare release polyapi-java-0.15.5 --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 75cf2819..2f1c9fcf 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.5 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index f02dd9a3..b78ada37 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.5 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index b2ae77e0..aa50aab1 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.5 pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.5 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 56871939..1a9245fd 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5-SNAPSHOT + 0.15.5 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 4a5ee6c7..a117cb44 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.5 pom parent-pom @@ -35,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - HEAD + polyapi-java-0.15.5 From fe1b01dfd5ccfd63e4597cfb035de670a99bfe87 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 19:46:05 +0000 Subject: [PATCH 60/60] [maven-release-plugin] prepare for next development iteration --- commons/pom.xml | 2 +- library/pom.xml | 2 +- parent-pom/pom.xml | 4 ++-- polyapi-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 2f1c9fcf..141d4256 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5 + 0.15.6-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index b78ada37..17a60586 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5 + 0.15.6-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index aa50aab1..b7e6bc64 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.5 + 0.15.6-SNAPSHOT pom PolyAPI Java parent POM https://polyapi.io @@ -28,7 +28,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.5 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 1a9245fd..449bc724 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.5 + 0.15.6-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index a117cb44..60c23271 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.5 + 0.15.6-SNAPSHOT pom parent-pom @@ -35,7 +35,7 @@ scm:git:git@github.com:polyapi/polyapi-java.git scm:git:git@github.com:polyapi/polyapi-java.git https://github.com/polyapi/polyapi-java - polyapi-java-0.15.5 + HEAD