From a18dbd0e45b796d28352bc7b4817994be149071e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gast=C3=B3n=20Ortiz?= Date: Mon, 26 Aug 2024 15:27:41 -0300 Subject: [PATCH 01/75] Made HttpClientConfiguration with TokenProvider public. (#59) --- README.md | 7 ++++--- .../commons/internal/http/HttpClientConfiguration.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 97f39489..e874fc58 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Java Client Library -* Latest released version 0.15.2 -* Latest snapshot version 0.15.3-SNAPSHOT +* Latest released version 0.15.3 +* Latest snapshot version 0.15.4-SNAPSHOT ## Introduction Welcome my friends! 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). @@ -55,7 +55,7 @@ Nice to have some customers looking around here! So, you'll need to run the foll 2. **Update the project.** Add the following to your project's `pom.xml`: ```xml - 0.15.0 + 0.15.3 @@ -359,5 +359,6 @@ Comparing to its Typescript counterpart, the Java library is still missing the f These features will be added in the future releases. + ## Changelog See the Changelog **[here](https://github.com/polyapi/polyapi-java/releases)**. \ No newline at end of file diff --git a/commons/src/main/java/io/polyapi/commons/internal/http/HttpClientConfiguration.java b/commons/src/main/java/io/polyapi/commons/internal/http/HttpClientConfiguration.java index 23cf45b5..e8adc812 100644 --- a/commons/src/main/java/io/polyapi/commons/internal/http/HttpClientConfiguration.java +++ b/commons/src/main/java/io/polyapi/commons/internal/http/HttpClientConfiguration.java @@ -35,7 +35,7 @@ public HttpClientConfiguration(String hardcodedApiKey) { this(new HardcodedTokenProvider(hardcodedApiKey)); } - private HttpClientConfiguration(TokenProvider tokenProvider) { + public HttpClientConfiguration(TokenProvider tokenProvider) { this.tokenProvider = tokenProvider; } From f6cdbc561548354ed394579f85030559e4131983 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 18:32:49 +0000 Subject: [PATCH 02/75] [maven-release-plugin] prepare release polyapi-java-0.15.3 --- 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 fb7ef3a6..e5ddf321 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.3-SNAPSHOT + 0.15.3 ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index 8c7b2073..42773286 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.3-SNAPSHOT + 0.15.3 ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 09fb3342..42d870f4 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.3-SNAPSHOT + 0.15.3 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.3 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index c1c35f2c..6d3fd737 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.3-SNAPSHOT + 0.15.3 ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index 953f6be4..d77e2769 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.3-SNAPSHOT + 0.15.3 pom parent-pom @@ -34,7 +34,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.3 From f6cc0d098d578c6a31b7c5833b5cd8d5b4097fa8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 18:32:50 +0000 Subject: [PATCH 03/75] [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 e5ddf321..50f775e1 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.3 + 0.15.4-SNAPSHOT ../parent-pom diff --git a/library/pom.xml b/library/pom.xml index 42773286..2700a956 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.3 + 0.15.4-SNAPSHOT ../parent-pom library diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 42d870f4..de00371e 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi parent-pom - 0.15.3 + 0.15.4-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.3 + HEAD 17 diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index 6d3fd737..1b4b0d90 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.polyapi parent-pom - 0.15.3 + 0.15.4-SNAPSHOT ../parent-pom polyapi-maven-plugin diff --git a/pom.xml b/pom.xml index d77e2769..430978c2 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.3 + 0.15.4-SNAPSHOT pom parent-pom @@ -34,7 +34,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.3 + HEAD From f18702dc807e9a3bda7f9acdd9eee7034b0f3eda Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 13 May 2025 16:06:44 -0700 Subject: [PATCH 04/75] some cleanup and fixings for client --- CHANGELOG.md | 19 +-------- README.md | 6 +-- commons/pom.xml | 36 ++++++++++++++++- .../commons/api/model/LifecycleState.java | 5 +++ library/pom.xml | 17 +++++++- parent-pom/pom.xml | 2 +- polyapi-maven-plugin/pom.xml | 17 +++++++- .../plugin/model/function/PolyFunction.java | 15 ++++--- .../model/function/PolyFunctionArgument.java | 4 ++ .../function/RequirementsDeserializer.java | 39 ------------------- .../plugin/model/function/ReturnType.java | 14 +++++++ .../plugin/model/specification/SchemaRef.java | 11 ++++++ .../plugin/service/DeploymentServiceImpl.java | 1 + pom.xml | 4 +- 14 files changed, 116 insertions(+), 74 deletions(-) create mode 100644 commons/src/main/java/io/polyapi/commons/api/model/LifecycleState.java delete mode 100644 polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/RequirementsDeserializer.java create mode 100644 polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/ReturnType.java create mode 100644 polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/specification/SchemaRef.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b59cdd1..1ae09a0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,27 +1,10 @@ # Changelog ---- - -## [0.15.5] - 2024-11-20 - -### Added - -- - -### Changed - -- - -### Fixed - -- Command `mvn clean compile polyapi:deploy-functions` failed issue resolved ---- - ## [0.15.4] - 2024-11-15 ### Added -- Only source code pass to the poly function with a separate `sourceSode` field +- Passing unaltered sourceCode to PolyAPI for display within Canopy application ### Changed diff --git a/README.md b/README.md index 2b931986..619bf1e5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Java Client Library -* Latest released version 0.15.5 -* Latest snapshot version 0.15.5-SNAPSHOT +* Latest released version 0.15.3 +* Latest snapshot version 0.15.4-SNAPSHOT ## Introduction Welcome my friends! 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). @@ -55,7 +55,7 @@ Nice to have some customers looking around here! So, you'll need to run the foll 2. **Update the project.** Add the following to your project's `pom.xml`: ```xml - 0.15.5 + 0.15.4 diff --git a/commons/pom.xml b/commons/pom.xml index a769195b..36e4b902 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 @@ -76,7 +76,8 @@ org.projectlombok lombok - 1.18.30 + 1.18.38 + provided com.kjetland @@ -136,6 +137,24 @@ test + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + 1.18.38 + + + + + + @@ -146,6 +165,19 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + 1.18.38 + + + + org.apache.maven.plugins maven-gpg-plugin diff --git a/commons/src/main/java/io/polyapi/commons/api/model/LifecycleState.java b/commons/src/main/java/io/polyapi/commons/api/model/LifecycleState.java new file mode 100644 index 00000000..9f707c80 --- /dev/null +++ b/commons/src/main/java/io/polyapi/commons/api/model/LifecycleState.java @@ -0,0 +1,5 @@ +package io.polyapi.commons.api.model; + +public enum LifecycleState { + ALPHA, BETA, STABLE, DEPRECATED, DISABLED +} \ No newline at end of file diff --git a/library/pom.xml b/library/pom.xml index 983cbb06..b1dd8fc3 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 @@ -60,7 +60,7 @@ org.projectlombok lombok - 1.18.30 + 1.18.38 provided @@ -71,6 +71,19 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + 1.18.38 + + + + org.apache.maven.plugins maven-plugin-plugin diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index 2de2484b..de00371e 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.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 6f35072a..f0de94cd 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.4-SNAPSHOT ../parent-pom polyapi-maven-plugin @@ -71,7 +71,7 @@ org.projectlombok lombok - 1.18.30 + 1.18.38 provided @@ -103,6 +103,19 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + 1.18.38 + + + + org.apache.maven.plugins maven-plugin-plugin diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunction.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunction.java index 95950b07..ff5b33be 100644 --- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunction.java +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunction.java @@ -1,8 +1,8 @@ package io.polyapi.plugin.model.function; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.polyapi.commons.api.model.LifecycleState; import io.polyapi.commons.api.model.Visibility; +import io.polyapi.plugin.model.specification.SchemaRef; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -20,21 +20,26 @@ @ToString public class PolyFunction { private String id; + private String context; private String name; + private String contextName; private String description; - private String context; + private String sourceCode; // Only used when deploying a function private String code; - private String sourceCode; private String language = "java"; private String returnType; private Visibility visibility; + private LifecycleState state; private Boolean logsEnabled; - @JsonDeserialize(using = RequirementsDeserializer.class) private List requirements; + private String ownerUserId; private Map returnTypeSchema; private List arguments; + private List otherReturnTypes; + private List unresolvedReturnTypePolySchemaRefs; + /** * Gets the signature of this function in the form of functionName(ArgClass, ArgClass2...). * diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunctionArgument.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunctionArgument.java index bf1f2953..f328b8d4 100644 --- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunctionArgument.java +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/PolyFunctionArgument.java @@ -1,5 +1,7 @@ package io.polyapi.plugin.model.function; +import io.polyapi.plugin.model.specification.SchemaRef; +import java.util.List; import lombok.Getter; import lombok.Setter; @@ -8,8 +10,10 @@ public class PolyFunctionArgument { private String key; private String name; + private String description; private String type; private String typeSchema; private Boolean required; private Boolean secure; + private List unresolvedPolySchemaRefs; } diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/RequirementsDeserializer.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/RequirementsDeserializer.java deleted file mode 100644 index 0a2ca47e..00000000 --- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/RequirementsDeserializer.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.polyapi.plugin.model.function; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class RequirementsDeserializer extends JsonDeserializer> { - - @Override - public List deserialize(JsonParser jsonParser, DeserializationContext context) throws IOException { - JsonNode node = jsonParser.getCodec().readTree(jsonParser); - - if (node.isArray() && node.isEmpty()) { - return Collections.emptyList(); - } - - if (node.isArray()) { - List requirements = new ArrayList<>(); - for (JsonNode item : node) { - if (item.isTextual()) { - requirements.add(item.asText()); - } - } - return requirements; - } - - if (node.isTextual() && "[]".equals(node.asText())) { - return Collections.emptyList(); - } - - return Collections.emptyList(); - } -} diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/ReturnType.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/ReturnType.java new file mode 100644 index 00000000..fc58e6dd --- /dev/null +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/function/ReturnType.java @@ -0,0 +1,14 @@ +package io.polyapi.plugin.model.function; + +import java.util.Map; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ReturnType { + private Integer statusCode; + private String type; + private Map schema; +} diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/specification/SchemaRef.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/specification/SchemaRef.java new file mode 100644 index 00000000..9a7cb313 --- /dev/null +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/model/specification/SchemaRef.java @@ -0,0 +1,11 @@ +package io.polyapi.plugin.model.specification; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class SchemaRef { + private String publicNamespace = ""; + private String path; +} diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java index 67d6b17b..878b5c72 100644 --- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/DeploymentServiceImpl.java @@ -87,6 +87,7 @@ public List deployFunctions(List functionFilters, boolean try (FileInputStream fileInputStream = new FileInputStream(sourceCodePath)) { String code = IOUtils.toString(fileInputStream, defaultCharset()); codeObject.setCode(code); + polyFunction.setSourceCode(code); if (annotation.contextAwareness().equals(PolyServerFunction.AUTO_DETECT_CONTEXT)) { Set matches = Pattern.compile("(Vari|Poly)\\.[.a-zA-Z0-9_\\s]+[^.a-zA-Z0-9_\\s]") .matcher(code) diff --git a/pom.xml b/pom.xml index 1611ed06..805bcf55 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.polyapi polyapi-java - 0.15.5-SNAPSHOT + 0.15.4-SNAPSHOT pom parent-pom @@ -79,7 +79,7 @@ ${project.build.directory}/it/develop - https://develop-k8s.polyapi.io + https://dev.polyapi.io ${develop.api.key} 443 From 0769b45651d5c54064c53cd6cd7a828b5ed305c7 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 14 May 2025 14:05:04 -0700 Subject: [PATCH 05/75] moving snapshot publishing to Maven Central Repository, and updating READMEs --- .github/workflows/ci.yaml | 4 + .github/workflows/maven-publish.yml | 79 ++++- .../polyapi-update-pre-built-java-image.yml | 2 +- CHANGELOG.md | 2 +- README.md | 274 +++++++++--------- README_INTERNAL.md | 76 +++++ commons/pom.xml | 13 +- library/pom.xml | 12 +- parent-pom/pom.xml | 21 +- polyapi-maven-plugin/pom.xml | 12 +- pom.xml | 24 +- src/it/deploy-function-it/pom.xml | 2 +- 12 files changed, 345 insertions(+), 176 deletions(-) create mode 100644 README_INTERNAL.md diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d2d9762e..548e5055 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,6 +3,9 @@ on: pull_request: branches: - develop + paths-ignore: + - '**README.md' + - '**README_INTERNAL.md' jobs: develop: @@ -17,5 +20,6 @@ jobs: java-version: '17' distribution: 'temurin' architecture: x64 + - name: run maven tests run: mvn clean verify \ No newline at end of file diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index d3fbcea8..e6b9e303 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -3,14 +3,83 @@ name: Release on: push: branches: - - 'main' + - develop + - main paths-ignore: - '**pom.xml' - + - '**README.md' + - '**README_INTERNAL.md' jobs: - build: + develop_release: + runs-on: ubuntu-latest + if: ${{ github.ref == 'refs/heads/develop' }} + environment: dev + permissions: + contents: read + packages: write + + steps: + - id: checkout + name: Checkout + uses: actions/checkout@v4 + + - name: Verify SNAPSHOT version + run: | + VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + echo "Detected version: $VERSION" + if [[ "$VERSION" != *-SNAPSHOT ]]; then + echo "ERROR: Version is not a SNAPSHOT version! Aborting deploy." + exit 1 + fi + + - id: gpg-install + name: Install gpg secret key + run: | + # 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 + + - 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: jdk-setup + name: Setup JDK + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: 'maven' + settings-path: ${{ github.workspace }} + + - id: server-setup + name: Setup deployment server + uses: s4u/maven-settings-action@v3.0.0 + with: + servers: | + [{ + "id": "central", + "username": "${{ secrets.DISTRIBUTION_REPOSITORY_RELEASE_USERNAME }}", + "password": "${{ secrets.DISTRIBUTION_REPOSITORY_RELEASE_PASSWORD }}" + }] + properties: '[{"distribution.repository.snapshot.id": "central"}, {"distribution.repository.snapshot.url": "https://central.sonatype.com"}]' + + - name: Deploy SNAPSHOT to Maven Repo + run: mvn clean deploy -DskipTests=true -Prelease -Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} + + + production_release: runs-on: ubuntu-latest + if: ${{ github.ref == 'refs/heads/main' }} + environment: dev permissions: contents: read packages: write @@ -53,11 +122,11 @@ jobs: with: servers: | [{ - "id": "ossrh", + "id": "central", "username": "${{ secrets.DISTRIBUTION_REPOSITORY_RELEASE_USERNAME }}", "password": "${{ secrets.DISTRIBUTION_REPOSITORY_RELEASE_PASSWORD }}" }] - properties: '[{"distribution.repository.release.id": "ossrh"}, {"distribution.repository.release.url": "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"}]' + properties: '[{"distribution.repository.release.id": "central"}, {"distribution.repository.release.url": "https://central.sonatype.com"}]' - id: release diff --git a/.github/workflows/polyapi-update-pre-built-java-image.yml b/.github/workflows/polyapi-update-pre-built-java-image.yml index 21aad9cf..673910c9 100644 --- a/.github/workflows/polyapi-update-pre-built-java-image.yml +++ b/.github/workflows/polyapi-update-pre-built-java-image.yml @@ -21,7 +21,7 @@ jobs: - name: Hit endpoint and build Java server function pre-built image from scratch run: | curl -X POST \ - https://develop-k8s.polyapi.io/functions/server/prebuilt-base-image \ + https://dev.polyapi.io/functions/server/prebuilt-base-image \ -H "Authorization: Bearer ${{ secrets.POLY_SUPER_ADMIN_USER_KEY }}" \ -H "Content-Type: application/json" \ -d '{"language": "java"}' diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ae09a0e..ee081f41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Added -- Passing unaltered sourceCode to PolyAPI for display within Canopy application +- Passing unaltered sourceCode to PolyAPI for display within Canopy application. ### Changed diff --git a/README.md b/README.md index 619bf1e5..cfa0a6e5 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ * Latest snapshot version 0.15.4-SNAPSHOT ## Introduction -Welcome my friends! 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). +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). In here you'll find instructions for both developers and customers to work with Poly through our Java clients and maven plugin. We hope that you find this documentation useful and easy to understand. If you don't please let us know. @@ -14,7 +14,7 @@ Here you'll find the minimum requirements of software that you'll need to work w 2. [Project setup:](#project-setup) This section will get you the steps you need to do to setup this Poly client. 3. [Project description:](#project-description) -This is the boring section that describes the structure of this project and its components. +This section describes the structure of this project and its components. 4. [Usage:](#usage) In here you will find common usages of this client. 5. [Changelog:](#changelog) @@ -25,144 +25,160 @@ This last (but not least) section shows the list of changes per version of this This is the list of requirements for the usage of this client: - Java 17+ - Maven 3.6.3+ (or Gradle 7.2+) -- PolyAPI key +- PolyAPI API Key +- PolyAPI Host URL (ex. `https://na1.polyapi.io`) ## Setting up project -### I'm looking to dive into the source code! -Welcome fellow Poly dev! As you will be modifying the code here (and maybe even this documentation), you'll need to download and make sure that this project compiles for you. -So, the steps to follow are these: -1. **Setup an SSH key in your computer.** -To do so, follow [this GitHub tutorial](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account). -2. **Clone this beautiful project.** To do so, run wherever you want to set the project.: -``` -git clone git@github.com:polyapi/polyapi-java.git -``` - -3. **Install the project.** For this you'll run: -``` -mvn clean install -``` -From the folder of the project. -**There! You got the project running my dear, go make things better!** +1. **Create a new Java Maven project.** + + There are many ways to achieve this. Most likely you already have a project where you want to run this. If you don't, you can follow [this tutorial](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html). Just have in mind to update the Java version to 17. + +2. **Add extension for project-specific settings.** + + **NOTE: If you're using Maven v4.0.0 or higher then you do not need to use an extension in order to have a project-specific settings and can skip this step.** + + Maven versions below v4.0.0 only support global and user-account specific `settings.xml` file, but this extension will allow you to have a `settings.xml` file just for this PolyAPI project which will give you a good place to keep your PolyAPI credentials securely out of your project's `pom.xml` file. + + Create or update your `PROJECT/.mvn/extensions.xml` file to enable setting up project-specific settings for maven: + ```xml + + + com.github.gzm55.maven + project-settings-extension + 0.3.5 + + + ``` + +3. **Create or update your project settings.xml file.** + + Update your `PROJECT/.mvn/settings.xml` file if you already have one, or create one and paste in the following (be sure to replace the `POLYAPI_HOST_URL` and `POLYAPI_API_KEY` with the actual values): + ```xml + + + + my-profile + + POLYAPI_HOST_URL + POLYAPI_API_KEY + + + + + my-profile + + + ``` + + **WARNING: If you're using a git repository for development, be sure to add `.mvn/settings.xml` file to your `.gitignore` file. Otherwise you could leak your PolyAPI credentials by commiting this file!** + +4. **Update the project pom.xml file.** + + Add the following to your project's `pom.xml` (be sure to replace `POLYAPI_VERSION` with the actual version you wish to use): + ```xml + + POLYAPI_VERSION + + + + io.polyapi + library + ${poly.version} + + + + + + target/generated-resources + + + + + io.polyapi + polyapi-maven-plugin + ${poly.version} + + ${poly.hostUrl} + 443 + ${poly.apiKey} + + + + generate-sources + + generate-sources + + + ${poly.hostUrl} + 443 + ${poly.apiKey} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + true + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + add-source + generate-sources + + add-source + + + + target/generated-sources + + + + + + + + ``` + Make sure you replace `{API_KEY}` with valid API key to access PolyAPI. + If you work on Windows, remember to replace the '/' bar in the resources for '\'. + +5. **Compile the project.** + + To generate the Poly functions and compile the project (this needs to be done everytime you update your Poly functions) run this command: + ``` + mvn clean compile + ``` + +6. **And Poly is ready to use in your Java project!** -If you want to run the project functionalities, follow the steps for customer. Just bear in mind to update the version to your local ones below. - -### I'm looking to use Poly to simplify my life! -Nice to have some customers looking around here! So, you'll need to run the following steps: -1. **Create a new Java Maven project.** There are many ways to achieve this. Most likely you already have a project where you want to run this. If you don't, you can follow [this tutorial](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html). Just have in mind to update the Java version to 17. -2. **Update the project.** Add the following to your project's `pom.xml`: -```xml - - 0.15.4 - - - - io.polyapi - library - ${poly.version} - - - - - - target/generated-resources - - - - - io.polyapi - polyapi-maven-plugin - ${poly.version} - - https://na1.polyapi.io - 443 - {API_KEY} - - - - generate-sources - - generate-sources - - - https://na1.polyapi.io - 443 - {API_KEY} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - true - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - add-source - generate-sources - - add-source - - - - target/generated-sources - - - - - - - -``` -Make sure you replace `{API_KEY}` with valid API key to access PolyAPI. -If you work on Windows, remember to replace the '/' bar in the resources for '\'. + +## Project description -3. **Compile the project.** To generate the Poly functions and compile the project (this needs to be done everytime you update your Poly functions) run this beautiful command: -``` -mvn clean compile -``` +This a multimodule project containing several packages to make development easier: -**And Poly is ready to use in your Java project!** +- parent-pom +- commons +- library +- polyapi-maven-plugin - -## Project description -This is the boring section that describes this project. If you are not into the technical details, you'll are likely to find this boring and not very useful. - -You have been warned. - -This project has the following components: -1. **Multimodule project** -This is the core multimodule project that will wrap every project here and compile them together. -2. **Parent pom** -This provides the common maven configuration for to the rest of the Java projects. -3. **Commons library** -This library is one containing all objects that are common to all Java libraries used, such as the HttpClient or common model classes. -4. **The Library** -This library is the one that is injected into the customer's project and contains the basic functionality used by all the generated code. -5. **Maven plugin** -This plugin contains the goals to add functions to the Poly server as well as downloading and generating the Poly code to run the Poly functions. - -### Multimodule project -This project works both as a multimodule project and as a parent pom. The purpose of this project is to unify the development of all common Java client components in one. - -### Parent pom +### Parent pom (/parent-pom) This project, a single POM file, works as a parent pom and provides the basic Maven configuration for all projects that inherit it. At this time it provides the common test libraries, as well as the logging ones. It also provids the versioning for all children projects. -### Commons library +### Commons library (/commons) This library is used by both the Maven plugin as well as the client library as it serves common functionality to both. -It provides 3 main functionalities: + +It provides several functionalities: #### The HTTP client The HTTP client provides a generic interface to execute HTTP requests. It is used by the internal services. It uses [OkHttp](https://square.github.io/okhttp/) as a client by default, but by implementing the interface and using a different client in the back (such as [Jersey](https://eclipse-ee4j.github.io/jersey/)) requires to just implement the interface and use instead. @@ -178,7 +194,7 @@ This basic functionality is used to write files into the FileSystem. There isn't This parser uses [Jackson](https://github.com/FasterXML/jackson) as default client, but provides an interface [JsonParser](https://github.com/polyapi/polyapi-java/blob/develop/commons/src/main/java/io/polyapi/commons/api/json/JsonParser.java). To use different clients, you just need to replace the implementation but implement the interface. -### The Library +### The Library (/library) This library is the PolyAPI client itself. It provides the common functionality for the usage of Poly functions in Java. It relies in the existence of generated code using the Maven plugin to provide the interface. Normally you wouldn't have to access it's contents, as they work through the generated classes. @@ -186,7 +202,7 @@ It relies in the existence of generated code using the Maven plugin to provide t #### Proxy factory One of the key classes in this library is the proxy factory. As most of the generated code is interfaces, the implementation by default is proxied to channel all of them through the API calls. This hides the implementation from the developers so this works in a black box kind of way. -### Maven plugin +### Maven plugin (/polyapi-maven-plugin) This maven plugin provides the following MOJOs: #### generate-sources diff --git a/README_INTERNAL.md b/README_INTERNAL.md new file mode 100644 index 00000000..aac19e25 --- /dev/null +++ b/README_INTERNAL.md @@ -0,0 +1,76 @@ +# Java Client Library (INTERNAL) + +This is the README for developers of PolyAPI or contributors to this project. + +## Testing SNAPSHOT versions + +You can test the development releases of the Java Client by either: + +A. pulling this repo and building/installing locally to get the version in your local maven repository + +OR + +B. you can update your testing project's pom.xml to allow you to install SNAPSHOT versions that have already been published to the Maven Central Repository. + +### A. Using a local build + +Once you've cloned the repository locally: run `mvn clean install` from the project directory to install all dependencies, build the project and put it into your local repository. + +At this point you can use it within local projects in order to test it by setting the built version within the `` property in your `pom.xml` + +### B. Using published SNAPSHOT versions + +Within your local Java project where you want to use the PolyAPI java client: update your project's `pom.xml` to enable pulling a released SNAPSHOT version from the Maven Central Repository: +```xml + + + Central Portal Snapshots + central-portal-snapshots + https://central.sonatype.com/repository/maven-snapshots/ + + false + + + true + + + +``` + +You should now be able to use SNAPSHOT versions within the `` property in your `pom.xml` + +## Versioning + +Maven uses SNAPSHOT versions to indicate development versions. So a version like `0.13.5-SNAPSHOT` is considered a development version. SNAPSHOT versions can be modified and redeployed under the same version number multiple times in order to update it without needing to increment a version number. + + +## How to deploy development versions + +We've setup a github workflow which should automatically publish the SNAPSHOT version of the client to the Maven Central Repository whenever code changes are pushed to the `develop` branch. + +1. Branch off of `develop` and make your changes as normal. Test locally until you are satisfied with the changeset. + +2. Make sure there's changelog entries for your snapshot version. Remember that as we develop we don't need to increment version numbers, so if there's already a changelong entry for the current snapshot version then modify it, else make a new entry. + +3. Push your changes and open a PR against `develop`. + +4. After approval of your changes: merge into `develop` to trigger the Release workflow in Github which should build and deploy the SNAPSHOT version release. Make sure it succeeds! + + +## How to release to production + +1. Checkout `develop` and bump the minor version within the README.md: + ``` + - * 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 + ```` + +2. Commit and push. + +3. Open a Release PR from `develop` into `main`. + +4. After approval of the release: merge into `main` to trigger the Release workflow in Github which should build and deploy the production version release. Make sure it succeeds! You should see two commits from the `[maven-release-plugin]`, the first which prepares the release by removing the "-SNAPSHOT" part of the client version and then releasing that version, and then the second which prepares the next "-SNAPSHOT" version and updates all the pom.xml files accordingly. + +5. Merge `main` back into `develop`. \ No newline at end of file diff --git a/commons/pom.xml b/commons/pom.xml index 36e4b902..13ffe8d2 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -143,6 +143,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.14.0 @@ -168,6 +169,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.14.0 @@ -193,14 +195,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - true + central + true diff --git a/library/pom.xml b/library/pom.xml index b1dd8fc3..7cb819bd 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -74,6 +74,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.14.0 @@ -125,14 +126,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - true + central + true diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index de00371e..f6414b55 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 io.polyapi parent-pom @@ -28,8 +30,8 @@ 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 - + HEAD + 17 17 @@ -123,14 +125,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - true + central + true @@ -175,4 +176,4 @@ - + \ No newline at end of file diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index f0de94cd..e8865130 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -106,6 +106,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.14.0 @@ -160,14 +161,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - true + central + true diff --git a/pom.xml b/pom.xml index 805bcf55..9c1162fb 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,8 @@ - + + 4.0.0 io.polyapi polyapi-java @@ -34,8 +37,8 @@ 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 - + HEAD + @@ -169,7 +172,7 @@ - + release @@ -192,14 +195,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - true + central + true @@ -244,4 +246,4 @@ - + \ No newline at end of file diff --git a/src/it/deploy-function-it/pom.xml b/src/it/deploy-function-it/pom.xml index f01d7c9e..72f9b682 100644 --- a/src/it/deploy-function-it/pom.xml +++ b/src/it/deploy-function-it/pom.xml @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.14.0 true From 586c60134e0b1ddc025bc083ac503ddd58f6c22f Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 14 May 2025 14:14:02 -0700 Subject: [PATCH 06/75] more verbose logging for deploys to help debug --- .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 e6b9e303..b8e0af13 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -73,7 +73,7 @@ jobs: properties: '[{"distribution.repository.snapshot.id": "central"}, {"distribution.repository.snapshot.url": "https://central.sonatype.com"}]' - name: Deploy SNAPSHOT to Maven Repo - run: mvn clean deploy -DskipTests=true -Prelease -Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} + run: mvn clean deploy -DskipTests=true -Prelease -Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -X production_release: From b1d84b1d3f0006df8aaffa8654e183fb233de85b Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 14 May 2025 15:01:00 -0700 Subject: [PATCH 07/75] skip verify script for now --- .github/workflows/maven-publish.yml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index b8e0af13..e6b9e303 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -73,7 +73,7 @@ jobs: properties: '[{"distribution.repository.snapshot.id": "central"}, {"distribution.repository.snapshot.url": "https://central.sonatype.com"}]' - name: Deploy SNAPSHOT to Maven Repo - run: mvn clean deploy -DskipTests=true -Prelease -Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} -X + run: mvn clean deploy -DskipTests=true -Prelease -Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} production_release: diff --git a/pom.xml b/pom.xml index 9c1162fb..f69e2965 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ maven-invoker-plugin 3.7.0 - verify + true true @@ -107,7 +107,7 @@ maven-invoker-plugin 3.7.0 - verify + true true @@ -146,7 +146,7 @@ maven-invoker-plugin 3.7.0 - verify + true true From f3026f07fd08c0f551da737eedc6b2e7f11709c1 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 14 May 2025 15:06:40 -0700 Subject: [PATCH 08/75] what if we skip develop IT 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 e6b9e303..df32704b 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -73,7 +73,7 @@ jobs: properties: '[{"distribution.repository.snapshot.id": "central"}, {"distribution.repository.snapshot.url": "https://central.sonatype.com"}]' - name: Deploy SNAPSHOT to Maven Repo - run: mvn clean deploy -DskipTests=true -Prelease -Ddevelop.api.key=${{ secrets.DEVELOP_SERVER_API_KEY }} + run: mvn clean deploy -DskipTests=true -Prelease production_release: From 11750e7d8f159b0f3ef53e13e1cf6dca7262d4ab Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 14 May 2025 15:09:29 -0700 Subject: [PATCH 09/75] more debugging info --- .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 df32704b..54e62739 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -73,7 +73,7 @@ jobs: properties: '[{"distribution.repository.snapshot.id": "central"}, {"distribution.repository.snapshot.url": "https://central.sonatype.com"}]' - name: Deploy SNAPSHOT to Maven Repo - run: mvn clean deploy -DskipTests=true -Prelease + run: mvn clean deploy -DskipTests=true -Prelease -X production_release: From 0fc26e26f1c30563902de3d0675e26d5acfd3abe Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 14 May 2025 15:22:38 -0700 Subject: [PATCH 10/75] different snapshot url --- .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 54e62739..21fb368b 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -70,7 +70,7 @@ jobs: "username": "${{ secrets.DISTRIBUTION_REPOSITORY_RELEASE_USERNAME }}", "password": "${{ secrets.DISTRIBUTION_REPOSITORY_RELEASE_PASSWORD }}" }] - properties: '[{"distribution.repository.snapshot.id": "central"}, {"distribution.repository.snapshot.url": "https://central.sonatype.com"}]' + properties: '[{"distribution.repository.snapshot.id": "central"}, {"distribution.repository.snapshot.url": "https://central.sonatype.com/repository/maven-snapshots/"}]' - name: Deploy SNAPSHOT to Maven Repo run: mvn clean deploy -DskipTests=true -Prelease -X From 94d4d97c8461a89a3c43f6863d55db7854215749 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Wed, 14 May 2025 15:43:14 -0700 Subject: [PATCH 11/75] updating README's now that we have SNAPSHOT publishing working again! --- .github/workflows/maven-publish.yml | 2 +- README.md | 202 ++++++++++++++-------------- README_INTERNAL.md | 12 ++ 3 files changed, 114 insertions(+), 102 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 21fb368b..5f0fc09a 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -73,7 +73,7 @@ jobs: properties: '[{"distribution.repository.snapshot.id": "central"}, {"distribution.repository.snapshot.url": "https://central.sonatype.com/repository/maven-snapshots/"}]' - name: Deploy SNAPSHOT to Maven Repo - run: mvn clean deploy -DskipTests=true -Prelease -X + run: mvn clean deploy -DskipTests=true -Prelease production_release: diff --git a/README.md b/README.md index cfa0a6e5..662f2fba 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ We hope that you find this documentation useful and easy to understand. If you d Here you'll find the minimum requirements of software that you'll need to work with this Java client. 2. [Project setup:](#project-setup) This section will get you the steps you need to do to setup this Poly client. -3. [Project description:](#project-description) -This section describes the structure of this project and its components. -4. [Usage:](#usage) +3. [Usage:](#usage) In here you will find common usages of this client. +4. [Project description:](#project-description) +This section describes the structure of this project and its components. 5. [Changelog:](#changelog) This last (but not least) section shows the list of changes per version of this client. @@ -160,6 +160,104 @@ This is the list of requirements for the usage of this client: 6. **And Poly is ready to use in your Java project!** + +## Usage + +### Poly Functions +To use the Poly functions you can import `import io.polyapi.Poly;` and traverse through it to find the function you want to use. For example: +```java +var result = Poly.yourApi.context.reallyCoolPolyFunction("https://really.cool.polyfunction.net", "param"); + +System.out.println(result); +``` + +### Webhook handlers +```java +Poly.myWebhooks.onCoolEvent((event, headers, params) -> { + System.out.println(event.getPrice()); +}); +``` + +### Error handlers +```java +Poly.onError("poly.context", errorEvent -> { + System.out.println(errorEvent.getMessage()); +}); +``` + +### Auth functions +```java +var clientId = "..."; +var clientSecret = "..."; +var scopes = new String[]{"offline_access"}; + +Poly.auth0.getToken(clientId, clientSecret, scopes, (token, url, error) -> { + System.out.println(token); + System.out.println(url); + System.out.println(error); + + if (token != null) { + ... + // revoke token (optional, if you want to revoke the token after you are done with it) + Poly.auth0.revokeToken(token); + } +}); +``` + +### Poly Variables +To use Poly variables you can import `import io.polyapi.Vari;` and traverse through it to find the variable you want to use. For example: +```java +var clientId = Vari.auth.clientId.get(); +System.out.println(clientId); +``` +You can update variable using the following code: +```java +Vari.auth.clientId.update("newClientId"); +``` +You can listen for update events: +```java +Vari.auth.clientId.onUpdate((event) -> { + System.out.println("Previous value: " + event.getPreviousValue()+", currentValue: " + event.getCurrentValue()); +}); +``` + +### Poly server functions +It is possible to deploy server functions that can be used in Poly. To do so, you need to create a class with desired function. For example: +```java +public class CustomFunction { + public String sayHello(String name) { + return "Hello " + name; + } +} +``` +Then, it is required that you have a setup project. In this project, you need to have the PolyAPI commons library installed as a dependency. +```xml + + io.polyapi + commons + ${poly.version} + +``` +Then, annotate the function you want to upload with `@PolyServerFunction`. +And finally, just run: +```bash +mvn polyapi:deploy-functions +``` +### Poly client functions +To create a Poly client Function you need to follow the same steps as with a server function, but instead using the `@PolyClientFunction` annotation. +### Vari server variables +To create a Poly server variable you need to just run the following command: +``` bash +mvn polyapi:create-server-variable -Dname=myVariable -Dvalue=myValue -Dcontext=myContext +``` + +## Limitations +Comparing to its Typescript counterpart, the Java library is still missing the following features: +- Error handlers +- Fetching multiple Poly Variables from context + +These features will be added in the future releases. + ## Project description @@ -282,104 +380,6 @@ Here's the list of parameters: - **secret:** Whether or not the variable contents will be revealed. - **type:** The type of the variable being set. This field is case insensitive. Valid inputs are `string`, `java.lang.String`, `integer`, `int`, `java.lang.Integer`, `double`, `java.lang.Double`, `long`, `java.lang.Long`, `float`, `java.lang.Float`, `byte`, `java.lang.Byte`, `short`, `java.lang.Short`, `boolean`, `java.lang.Boolean`. The content of the `value` field will be cast to this type before upload. If not set, the type will be auto-detected from the `value` content. - -## Usage - -### Poly Functions -To use the Poly functions you can import `import io.polyapi.Poly;` and traverse through it to find the function you want to use. For example: -```java -var result = Poly.yourApi.context.reallyCoolPolyFunction("https://really.cool.polyfunction.net", "param"); - -System.out.println(result); -``` - -### Webhook handlers -```java -Poly.myWebhooks.onCoolEvent((event, headers, params) -> { - System.out.println(event.getPrice()); -}); -``` - -### Error handlers -```java -Poly.onError("poly.context", errorEvent -> { - System.out.println(errorEvent.getMessage()); -}); -``` - -### Auth functions -```java -var clientId = "..."; -var clientSecret = "..."; -var scopes = new String[]{"offline_access"}; - -Poly.auth0.getToken(clientId, clientSecret, scopes, (token, url, error) -> { - System.out.println(token); - System.out.println(url); - System.out.println(error); - - if (token != null) { - ... - // revoke token (optional, if you want to revoke the token after you are done with it) - Poly.auth0.revokeToken(token); - } -}); -``` - -### Poly Variables -To use Poly variables you can import `import io.polyapi.Vari;` and traverse through it to find the variable you want to use. For example: -```java -var clientId = Vari.auth.clientId.get(); -System.out.println(clientId); -``` -You can update variable using the following code: -```java -Vari.auth.clientId.update("newClientId"); -``` -You can listen for update events: -```java -Vari.auth.clientId.onUpdate((event) -> { - System.out.println("Previous value: " + event.getPreviousValue()+", currentValue: " + event.getCurrentValue()); -}); -``` - -### Poly server functions -It is possible to deploy server functions that can be used in Poly. To do so, you need to create a class with desired function. For example: -```java -public class CustomFunction { - public String sayHello(String name) { - return "Hello " + name; - } -} -``` -Then, it is required that you have a setup project. In this project, you need to have the PolyAPI commons library installed as a dependency. -```xml - - io.polyapi - commons - ${poly.version} - -``` -Then, annotate the function you want to upload with `@PolyServerFunction`. -And finally, just run: -```bash -mvn polyapi:deploy-functions -``` -### Poly client functions -To create a Poly client Function you need to follow the same steps as with a server function, but instead using the `@PolyClientFunction` annotation. -### Vari server variables -To create a Poly server variable you need to just run the following command: -``` bash -mvn polyapi:create-server-variable -Dname=myVariable -Dvalue=myValue -Dcontext=myContext -``` - -## Limitations -Comparing to its Typescript counterpart, the Java library is still missing the following features: -- Error handlers -- Fetching multiple Poly Variables from context - -These features will be added in the future releases. - ## Changelog See the Changelog **[here](https://github.com/polyapi/polyapi-java/releases)**. \ No newline at end of file diff --git a/README_INTERNAL.md b/README_INTERNAL.md index aac19e25..37991d21 100644 --- a/README_INTERNAL.md +++ b/README_INTERNAL.md @@ -35,6 +35,18 @@ Within your local Java project where you want to use the PolyAPI java client: up + + + central-portal-snapshots + https://central.sonatype.com/repository/maven-snapshots/ + + false + + + true + + + ``` You should now be able to use SNAPSHOT versions within the `` property in your `pom.xml` From 8b3e3ee7beba6011b4ae5e8ad8885434523f3185 Mon Sep 17 00:00:00 2001 From: "eric.neumann" Date: Tue, 20 May 2025 15:54:35 -0700 Subject: [PATCH 12/75] EN #4304 cleanup: move lombok dep and plugin to parent-pom --- commons/pom.xml | 39 ------------------------------------ library/pom.xml | 20 ------------------ parent-pom/pom.xml | 21 +++++++++++++++++++ polyapi-maven-plugin/pom.xml | 20 ------------------ 4 files changed, 21 insertions(+), 79 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 13ffe8d2..539fcfd0 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -73,12 +73,6 @@ commons-text 1.10.0 - - org.projectlombok - lombok - 1.18.38 - provided - com.kjetland mbknor-jackson-jsonschema_2.12 @@ -137,25 +131,6 @@ test - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - - - org.projectlombok - lombok - 1.18.38 - - - - - - @@ -166,20 +141,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - - - org.projectlombok - lombok - 1.18.38 - - - - org.apache.maven.plugins maven-gpg-plugin diff --git a/library/pom.xml b/library/pom.xml index 7cb819bd..eca445a0 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -57,12 +57,6 @@ 3.9.0 provided - - org.projectlombok - lombok - 1.18.38 - provided - com.google.code.gson gson @@ -71,20 +65,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - - - org.projectlombok - lombok - 1.18.38 - - - - org.apache.maven.plugins maven-plugin-plugin diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index f6414b55..32862ca7 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -39,6 +39,7 @@ 5.10.0 2.0.9 2.0.9 + 1.18.38 @@ -99,6 +100,12 @@ ${slf4j.version} test + + org.projectlombok + lombok + ${lombok.version} + provided + @@ -162,6 +169,20 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.14.0 + + + + org.projectlombok + lombok + ${lombok.version} + + + + diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index e8865130..df7d8be3 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -68,12 +68,6 @@ jsonschema2pojo-core 1.2.1 - - org.projectlombok - lombok - 1.18.38 - provided - io.socket socket.io-client @@ -103,20 +97,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - - - org.projectlombok - lombok - 1.18.38 - - - - org.apache.maven.plugins maven-plugin-plugin From 6e0e35c4c72fe7d49eaf1dd00f7df03f7f025c16 Mon Sep 17 00:00:00 2001 From: "eric.neumann" Date: Tue, 20 May 2025 16:00:14 -0700 Subject: [PATCH 13/75] EN #4304 added error preview logging and updated changelog --- CHANGELOG.md | 4 +- .../commons/api/service/PolyApiService.java | 149 +++++++++++++----- 2 files changed, 113 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee081f41..8a3a0337 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,9 @@ ### Changed -- +- PolyApiService.java: Replaced full-body buffering and Commons-IO parsing with a single BufferedInputStream using mark/reset for unified JSON/text/stream parsing and 1 KB error-preview logging. + +- Added limbok dependency and plugin to parent-pom ### Fixed diff --git a/commons/src/main/java/io/polyapi/commons/api/service/PolyApiService.java b/commons/src/main/java/io/polyapi/commons/api/service/PolyApiService.java index 228730fe..7d09b969 100644 --- a/commons/src/main/java/io/polyapi/commons/api/service/PolyApiService.java +++ b/commons/src/main/java/io/polyapi/commons/api/service/PolyApiService.java @@ -8,8 +8,7 @@ import io.polyapi.commons.api.http.Response; import io.polyapi.commons.api.json.JsonParser; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.IOUtils; - +import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Type; @@ -24,7 +23,7 @@ import static java.util.function.Predicate.not; /** - * Parent implementation class for all services that connec to the PolyAPI service. + * Parent implementation class for all services that connect to the PolyAPI service. */ @Slf4j public class PolyApiService { @@ -44,7 +43,10 @@ public O get(String relativePath, Type expectedResponseType) { return get(relativePath, new HashMap<>(), new HashMap<>(), expectedResponseType); } - public O get(String relativePath, Map> headers, Map> queryParams, Type expectedResponseType) { + public O get(String relativePath, + Map> headers, + Map> queryParams, + Type expectedResponseType) { return parsedCall(GET, relativePath, headers, queryParams, null, expectedResponseType); } @@ -52,7 +54,11 @@ public O post(String relativePath, I body, Type expectedResponseType) { return post(relativePath, new HashMap<>(), new HashMap<>(), body, expectedResponseType); } - public O post(String relativePath, Map> headers, Map> queryParams, I body, Type expectedResponseType) { + public O post(String relativePath, + Map> headers, + Map> queryParams, + I body, + Type expectedResponseType) { return parsedCall(POST, relativePath, headers, queryParams, body, expectedResponseType); } @@ -60,7 +66,10 @@ public void patch(String relativePath, I body) { parsedCall(PATCH, relativePath, new HashMap<>(), new HashMap<>(), body, Void.TYPE); } - public void patch(String relativePath, Map> headers, Map> queryParams, I body) { + public void patch(String relativePath, + Map> headers, + Map> queryParams, + I body) { parsedCall(PATCH, relativePath, headers, queryParams, body, Void.TYPE); } @@ -68,62 +77,124 @@ public void delete(String relativePath) { delete(relativePath, new HashMap<>(), new HashMap<>(), null); } - - public void delete(String relativePath, Map> headers, Map> queryParams, I body) { + public void delete(String relativePath, + Map> headers, + Map> queryParams, + I body) { parsedCall(DELETE, relativePath, headers, queryParams, body, Void.TYPE); } - private O parsedCall(HttpMethod method, String relativePath, Map> headers, Map> queryParams, I body, Type expectedResponseType) { + private O parsedCall(HttpMethod method, + String relativePath, + Map> headers, + Map> queryParams, + I body, + Type expectedResponseType) { + Map> allHeaders = new HashMap<>(); - //allHeaders.put("Accept", List.of("application/json")); allHeaders.put("Content-type", List.of("application/json")); headers.forEach((key, value) -> allHeaders.put(key, value.stream().toList())); - Response response = callApi(method, relativePath, allHeaders, queryParams, jsonParser.toJsonInputStream(body)); + Response response = callApi( + method, + relativePath, + allHeaders, + queryParams, + jsonParser.toJsonInputStream(body) + ); + log.debug("Response is successful. Status code is {}.", response.statusCode()); log.debug("Parsing response."); - O result = Optional.of(expectedResponseType) - .filter(not(Void.TYPE::equals)) - .map(type ->{ - String contentType = response.headers().get("Content-type").stream().findFirst().orElseThrow(); - O parsedResult; - log.debug("Content type is {}.", contentType); - log.debug("Type class is {}.", type.getClass()); - log.debug("Type is {}.", type); - if (contentType.startsWith("application/json")) { - parsedResult = jsonParser.parseInputStream(response.body(), TypeVariable.class.isAssignableFrom(type.getClass()) ? Object.class : type); - } else { + + final int PREVIEW = 1024; + byte[] previewBuf = new byte[PREVIEW]; + int previewLen = 0; + BufferedInputStream bodyStream = new BufferedInputStream(response.body()); + + // mark & read first PREVIEW bytes for potential error logging + bodyStream.mark(PREVIEW); + try { + previewLen = bodyStream.read(previewBuf); + } catch (IOException ignored) { + } + try { + bodyStream.reset(); + } catch (IOException ignored) { + } + + try { + O parsed = Optional.of(expectedResponseType) + .filter(not(Void.TYPE::equals)) + .map(type -> { + String contentType = response.headers() + .get("Content-type") + .stream() + .findFirst() + .orElse("application/json"); + + if (contentType.startsWith("application/json")) { + return jsonParser.parseInputStream( + bodyStream, + TypeVariable.class.isAssignableFrom(type.getClass()) + ? Object.class + : type + ); + } + if (checkType(type, String.class) && contentType.startsWith("text/")) { try { - parsedResult = (O)IOUtils.toString(response.body(), defaultCharset()); - } catch (IOException e) { - throw new ParsingException("An error occurred while parsing the response.", e); - } - } else { - if (checkType(type, InputStream.class)) { - parsedResult = (O)response.body(); - } else { - throw new UnsupportedContentTypeException(contentType, type); + @SuppressWarnings("unchecked") + O result = (O) new String( + bodyStream.readAllBytes(), + defaultCharset() + ); + return result; + } catch (IOException ioe) { + throw new ParsingException("Could not read text response", ioe); } } - } - return parsedResult; - }) - .orElse(null); - log.debug("Response parsed successfully."); - return result; + + if (checkType(type, InputStream.class)) { + @SuppressWarnings("unchecked") + O result = (O) bodyStream; + return result; + } + + throw new UnsupportedContentTypeException(contentType, type); + }) + .orElse(null); + + log.debug("Response parsed successfully."); + return parsed; + + } catch (RuntimeException ex) { + String snippet = previewLen > 0 + ? new String(previewBuf, 0, previewLen, defaultCharset()) + : ""; + log.error("Failed to parse response from {} {} (first {} bytes):\n{}", + method, relativePath, previewLen, snippet); + throw ex; + } } private boolean checkType(Type type, Class expectedClass) { - return (type.getClass().isAssignableFrom(Class.class) && Class.class.cast(type).isAssignableFrom(expectedClass)) || TypeVariable.class.isAssignableFrom(type.getClass()); + return (type.getClass().isAssignableFrom(Class.class) + && ((Class) type).isAssignableFrom(expectedClass)) + || TypeVariable.class.isAssignableFrom(type.getClass()); } - private Response callApi(HttpMethod method, String relativePath, Map> headers, Map> queryParams, InputStream body) { + private Response callApi(HttpMethod method, + String relativePath, + Map> headers, + Map> queryParams, + InputStream body) { + Request request = client.prepareAuthenticatedRequest(host, port, method, relativePath) .withHeaders(headers) .withQueryParams(queryParams) .withBody(body) .build(); + log.debug("Executing authenticated {} request with target {}", method, request.getUrl()); return client.send(request); } From 018cbb9f6ea283676a98d2c9dbdcdd3c1ecdf27e Mon Sep 17 00:00:00 2001 From: "eric.neumann" Date: Wed, 21 May 2025 14:01:48 -0700 Subject: [PATCH 14/75] EN #4289 prevent name collisions --- CHANGELOG.md | 2 + polyapi-maven-plugin/pom.xml | 8 +- .../service/schema/JsonSchemaNameHelper.java | 40 +++++- .../service/schema/JsonSchemaParser.java | 121 ++++++++++++++---- .../plugin/service/JsonSchemaParserTest.java | 37 ++++-- .../service/schema/cases/Case 17.schema.json | 17 +++ 6 files changed, 190 insertions(+), 35 deletions(-) create mode 100644 polyapi-maven-plugin/src/test/resources/io/polyapi/plugin/service/schema/cases/Case 17.schema.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a3a0337..ca024019 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ - Passing unaltered sourceCode to PolyAPI for display within Canopy application. +- Fixed duplicate-field collisions by preprocessing JSON schemas to inject suffixed properties (e.g. order_id_1) into both properties and required before code generation, and enhanced NameHelper to preserve suffixes and special‐character mappings, eliminating “path not present” and “same field twice” errors. + ### Changed - PolyApiService.java: Replaced full-body buffering and Commons-IO parsing with a single BufferedInputStream using mark/reset for unified JSON/text/stream parsing and 1 KB error-preview logging. diff --git a/polyapi-maven-plugin/pom.xml b/polyapi-maven-plugin/pom.xml index df7d8be3..8ee5cb6a 100644 --- a/polyapi-maven-plugin/pom.xml +++ b/polyapi-maven-plugin/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.polyapi @@ -94,6 +95,11 @@ json 20231013 + + com.github.erosb + everit-json-schema + 1.14.6 + diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/schema/JsonSchemaNameHelper.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/schema/JsonSchemaNameHelper.java index 31dac47c..2c5de797 100644 --- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/schema/JsonSchemaNameHelper.java +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/schema/JsonSchemaNameHelper.java @@ -1,15 +1,49 @@ package io.polyapi.plugin.service.schema; +import com.fasterxml.jackson.databind.JsonNode; import org.jsonschema2pojo.GenerationConfig; import org.jsonschema2pojo.util.NameHelper; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +/** + * A NameHelper that preserves trailing numeric suffixes on JSON property names + * and maps '+' to 'Plus' and '-' to 'Minus'. + */ public class JsonSchemaNameHelper extends NameHelper { - public JsonSchemaNameHelper(GenerationConfig generationConfig) { - super(generationConfig); + + private static final Pattern SUFFIX_PATTERN = Pattern.compile("^(.*?)(_\\d+)$"); + + public JsonSchemaNameHelper(GenerationConfig config) { + super(config); } @Override public String replaceIllegalCharacters(String name) { - return super.replaceIllegalCharacters(name.replace("+", "Plus").replace("-", "Minus")); + String mapped = name.replace("+", "Plus").replace("-", "Minus"); + return super.replaceIllegalCharacters(mapped); + } + + @Override + public String getPropertyName(String jsonName, JsonNode node) { + String mapped = jsonName.replace("+", "Plus").replace("-", "Minus"); + Matcher m = SUFFIX_PATTERN.matcher(mapped); + String base = mapped; + String suffix = ""; + if (m.matches()) { + base = m.group(1); + suffix = m.group(2).replaceAll("[^0-9]", ""); + } + String javaBase = super.getPropertyName(base, node); + if (!suffix.isEmpty()) { + javaBase = javaBase + suffix; + } + return javaBase; + } + + @Override + public String getClassName(String raw, JsonNode node) { + String mapped = raw.replace("+", "Plus").replace("-", "Minus"); + return super.getClassName(mapped, node); } } diff --git a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/schema/JsonSchemaParser.java b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/schema/JsonSchemaParser.java index fa2a11a1..e1a52774 100644 --- a/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/schema/JsonSchemaParser.java +++ b/polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/schema/JsonSchemaParser.java @@ -2,6 +2,11 @@ import com.sun.codemodel.JClass; import com.sun.codemodel.JCodeModel; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; import io.polyapi.plugin.error.PolyApiMavenPluginException; import io.polyapi.plugin.model.ParsedType; import io.polyapi.plugin.model.generation.CustomType; @@ -12,60 +17,132 @@ import org.jsonschema2pojo.SchemaMapper; import java.io.IOException; -import java.net.URLEncoder; -import java.nio.charset.Charset; import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; import java.util.List; +import java.util.Locale; import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; @Slf4j public class JsonSchemaParser { - // FIXME: This whole JSON schema parsing needs: - // FIXME: 1. More automated testing. - // FIXME: 2. A refactor. public List parse(String defaultName, String packageName, String schema) { try { - var codeModel = new JCodeModel(); - log.trace("Generating Java code from JSON schema {}.", schema); + ObjectMapper om = new ObjectMapper(); + JsonNode root = om.readTree(Optional.ofNullable(schema).orElse("")); - // This cannot be put as an attribute of this class as it does not take well when being reused and has many errors. + int dupCount = patchDuplicates(root); + if (dupCount > 0) { + log.warn("⚠️ [{}] injected {} duplicate-field suffix(es)", defaultName, dupCount); + } + + String patched = om.writeValueAsString(root); + + // generate Java code from the patched schema + JCodeModel codeModel = new JCodeModel(); new SchemaMapper(new PolyRuleFactory(new PolyGenerationConfig()), new SchemaGenerator()) - .generate(codeModel, defaultName, packageName, Optional.ofNullable(schema).orElse("")); + .generate(codeModel, defaultName, packageName, patched); + log.debug("Code generated. Writing to string."); try (var codeWriter = new PolyCodeWriter()) { codeModel.build(codeWriter); var result = codeWriter.getClasses(); if (log.isTraceEnabled()) { - result.forEach((String name, String code) -> log.trace("Generated code for {} is: {}", name, code)); + result.forEach((name, code) -> log.trace("Generated code for {} is: {}", name, code)); } return result.entrySet().stream() .map(entry -> new CustomType(packageName, entry.getKey(), entry.getValue())) - .toList(); + .collect(Collectors.toList()); } } catch (IOException e) { - //FIXME: Throw the appropriate exception throw new PolyApiMavenPluginException(e); } } public ParsedType getType(String defaultName, String packageName, String schema) { - // This cannot be put as an attribute of this class as it does not take well when being reused and has many errors. try { - return getType(new SchemaMapper(new PolyRuleFactory(new PolyGenerationConfig()), new SchemaGenerator()) - .generate(new JCodeModel(), defaultName, packageName, Optional.ofNullable(schema).orElse("")) - .boxify()); + ObjectMapper om = new ObjectMapper(); + JsonNode root = om.readTree(Optional.ofNullable(schema).orElse("")); + patchDuplicates(root); + String patched = om.writeValueAsString(root); + + JClass jClass = new SchemaMapper(new PolyRuleFactory(new PolyGenerationConfig()), new SchemaGenerator()) + .generate(new JCodeModel(), defaultName, packageName, patched) + .boxify(); + return getType(jClass); } catch (IOException e) { - //FIXME: Throw the appropriate exception throw new PolyApiMavenPluginException(e); } } private ParsedType getType(JClass jClass) { - return new ParsedType(jClass.erasure().fullName(), Optional.ofNullable(jClass.getTypeParameters()) - .orElseGet(ArrayList::new) - .stream() - .map(this::getType) - .toList()); + return new ParsedType( + jClass.erasure().fullName(), + Optional.ofNullable(jClass.getTypeParameters()).orElseGet(ArrayList::new).stream() + .map(this::getType) + .collect(Collectors.toList()) + ); + } + + /** + * Recursively mutates the JSON schema tree, injecting any properties whose + * JSON names collapse to the same Java identifier under a suffix, + * into both "properties" and "required". + */ + private int patchDuplicates(JsonNode root) { + if (!root.isObject()) return 0; + int injectedCount = 0; + ObjectNode obj = (ObjectNode) root; + + if (obj.has("properties")) { + ObjectNode props = (ObjectNode) obj.get("properties"); + ArrayNode reqs = obj.has("required") + ? (ArrayNode) obj.get("required") + : new ArrayNode(JsonNodeFactory.instance); + + Set seen = new HashSet<>(); + List collisions = new ArrayList<>(); + Iterator it = props.fieldNames(); + while (it.hasNext()) { + String jsonName = it.next(); + String normalized = jsonName.replaceAll("[^A-Za-z0-9]+","") + .toLowerCase(Locale.ROOT); + log.trace(" – jsonName='{}' → normalized='{}'", jsonName, normalized); + if (!seen.add(normalized)) { + collisions.add(jsonName); + } + } + + int suffix = 1; + for (String dup : collisions) { + injectedCount++; + String injected = dup + "_" + suffix++; + JsonNode originalNode = props.get(dup); + props.remove(dup); + + // re-insert under the suffixed name + props.set(injected, originalNode); + + // now fix up "required": swap dup -> injected + if (obj.has("required")) { + ArrayNode reqsArray = (ArrayNode) obj.get("required"); + for (int i = 0; i < reqsArray.size(); i++) { + if (reqsArray.get(i).asText().equals(dup)) { + reqsArray.set(i, JsonNodeFactory.instance.textNode(injected)); + } + } + } + } + } + + Iterator fieldsIt = obj.fieldNames(); + while (fieldsIt.hasNext()) { + patchDuplicates(obj.get(fieldsIt.next())); + } + + return injectedCount; } } diff --git a/polyapi-maven-plugin/src/test/java/io/polyapi/plugin/service/JsonSchemaParserTest.java b/polyapi-maven-plugin/src/test/java/io/polyapi/plugin/service/JsonSchemaParserTest.java index c0a73ffa..c29fe997 100644 --- a/polyapi-maven-plugin/src/test/java/io/polyapi/plugin/service/JsonSchemaParserTest.java +++ b/polyapi-maven-plugin/src/test/java/io/polyapi/plugin/service/JsonSchemaParserTest.java @@ -40,24 +40,31 @@ public static Stream generateSource() { createArguments(13, "Schema with different types that have the same enum.", "Identifier", DEFAULT_RESPONSE_NAME, "Data"), createArguments(14, "Schema that is an Integer."), createArguments(15, "Schema with multiple enums with the same name and properties.", DEFAULT_RESPONSE_NAME, "DashMinusstyle", "DashMinusstyle_", "Other"), - createArguments(16, "Schema with json property yhat has a space in it.", "Data", DEFAULT_RESPONSE_NAME)); + createArguments(16, "Schema with json property yhat has a space in it.", "Data", DEFAULT_RESPONSE_NAME), + createArguments(17, "Schema with both order_id and orderId to force a collision", "Case17SchemaWithDuplicateFields")); } public static Stream getTypeSource() { - return Stream.of(Arguments.of(1, "Simple recursive schema with no base type.", createClassName(DEFAULT_RESPONSE_NAME)), + return Stream.of( + Arguments.of(1, "Simple recursive schema with no base type.", createClassName(DEFAULT_RESPONSE_NAME)), Arguments.of(2, "Recursive schema with base type.", createClassName(DEFAULT_RESPONSE_NAME)), - Arguments.of(3, "Schema that has a text value evaluated to null.", createClassName(DEFAULT_RESPONSE_NAME)), + Arguments.of(3, "Schema that has a text value evaluated to null.", + createClassName(DEFAULT_RESPONSE_NAME)), Arguments.of(4, "Schema with base type and no definitions.", createClassName(DEFAULT_RESPONSE_NAME)), Arguments.of(5, "Schema for array of numbers.", createListClassName(Double.class.getName())), Arguments.of(6, "Schema for array of integers.", createListClassName(Long.class.getName())), Arguments.of(7, "Simple schema with attribute.", createClassName(DEFAULT_RESPONSE_NAME)), - Arguments.of(8, "Schema with duplicate fields.", createListClassName(createClassName("ResponseTypeElement"))), + Arguments.of(8, "Schema with duplicate fields.", + createListClassName(createClassName("ResponseTypeElement"))), Arguments.of(9, "Schema with enum.", createClassName(DEFAULT_RESPONSE_NAME)), Arguments.of(10, "Schema that is a String.", String.class.getName()), Arguments.of(11, "Schema that uses allof.", Object.class.getName()), - Arguments.of(12, "Schema with enum with '-' in one of the options.", createClassName(DEFAULT_RESPONSE_NAME)), - Arguments.of(13, "Schema with different types that have the same enum.", createClassName(DEFAULT_RESPONSE_NAME)), - Arguments.of(14, "Schema that is an integer.", Long.class.getName())); + Arguments.of(12, "Schema with enum with '-' in one of the options.", + createClassName(DEFAULT_RESPONSE_NAME)), + Arguments.of(13, "Schema with different types that have the same enum.", + createClassName(DEFAULT_RESPONSE_NAME)), + Arguments.of(14, "Schema that is an integer.", Long.class.getName()), + Arguments.of(17, "Schema with both order_id and orderId to force a collision", createClassName("Case17SchemaWithDuplicateFields"))); } private static String createClassName(String className) { @@ -81,6 +88,12 @@ public void generateTest(Integer caseNumber, String description, List ex var customTypes = jsonSchemaParser.parse("TestResponse", specification.getPackageName(), getSchema(caseNumber)); assertThat(customTypes, notNullValue()); assertThat(customTypes.size(), equalTo(expectedNames.size())); + if (caseNumber.equals(17)) { + CustomType ct = customTypes.get(0); + String code = ct.getCode(); + // check that we injected the suffixed field into the class + assertTrue(code.contains("orderId1"), "Expected generated code to contain field 'orderId1'"); + } var customTypeNames = customTypes.stream().map(CustomType::getName).toList(); expectedNames.forEach(expectedName -> assertTrue(customTypeNames.contains(expectedName), format("Result should contain object with name %s. Result contains %s.", expectedName, customTypeNames))); customTypes.forEach(customType -> assertTrue(customType.getCode().contains(format("public class %s {", customType.getName())) || customType.getCode().contains(format("public enum %s {", customType.getName())))); @@ -89,12 +102,18 @@ public void generateTest(Integer caseNumber, String description, List ex @ParameterizedTest(name = "Case {0}: {1}") @MethodSource("getTypeSource") public void getTypeTest(Integer caseNumber, String description, String expectedType) { - assertThat(jsonSchemaParser.getType(DEFAULT_RESPONSE_NAME, JsonSchemaParserTest.class.getPackageName(), getSchema(caseNumber)).getFullName(), equalTo(expectedType)); + assertThat(jsonSchemaParser + .getType(DEFAULT_RESPONSE_NAME, JsonSchemaParserTest.class.getPackageName(), getSchema(caseNumber)) + .getFullName(), equalTo(expectedType)); } private String getSchema(Integer caseNumber) { try { - return IOUtils.toString(JsonSchemaParser.class.getResourceAsStream(format("/%s/cases/Case %s.schema.json", JsonSchemaParser.class.getPackageName().replace(".", "/"), caseNumber)), defaultCharset()); + return IOUtils + .toString( + JsonSchemaParser.class.getResourceAsStream(format("/%s/cases/Case %s.schema.json", + JsonSchemaParser.class.getPackageName().replace(".", "/"), caseNumber)), + defaultCharset()); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/polyapi-maven-plugin/src/test/resources/io/polyapi/plugin/service/schema/cases/Case 17.schema.json b/polyapi-maven-plugin/src/test/resources/io/polyapi/plugin/service/schema/cases/Case 17.schema.json new file mode 100644 index 00000000..3180c84b --- /dev/null +++ b/polyapi-maven-plugin/src/test/resources/io/polyapi/plugin/service/schema/cases/Case 17.schema.json @@ -0,0 +1,17 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "Case 17: Schema with duplicate fields", + "type": "object", + "properties": { + "order_id": { + "type": "string" + }, + "orderId": { + "type": "string" + } + }, + "required": [ + "order_id", + "orderId" + ] +} \ No newline at end of file From 61b3907e2a919f44fadd4a4f66be99e8b25cdbe7 Mon Sep 17 00:00:00 2001 From: "eric.neumann" Date: Fri, 23 May 2025 08:27:21 -0700 Subject: [PATCH 15/75] EN #4304 fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca024019..b903e2ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ - PolyApiService.java: Replaced full-body buffering and Commons-IO parsing with a single BufferedInputStream using mark/reset for unified JSON/text/stream parsing and 1 KB error-preview logging. -- Added limbok dependency and plugin to parent-pom +- Added lombok dependency and plugin to parent-pom ### Fixed From e884a22c5fe282a3905cd7b6af1795241931a838 Mon Sep 17 00:00:00 2001 From: Aaron Goin Date: Tue, 3 Jun 2025 11:19:08 -0700 Subject: [PATCH 16/75] 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 17/75] 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 18/75] 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 19/75] 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 20/75] 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 21/75] [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 22/75] [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 23/75] [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 24/75] 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 25/75] [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 26/75] [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 27/75] [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 28/75] 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 29/75] 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 30/75] [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 31/75] [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 32/75] [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 33/75] 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 34/75] 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 35/75] 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 36/75] 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 37/75] [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 38/75] [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 39/75] [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 40/75] 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 41/75] [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 42/75] [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 43/75] [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 44/75] 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 45/75] [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 46/75] [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 47/75] [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 48/75] 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 49/75] 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 50/75] [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 51/75] [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 52/75] [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 53/75] 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 54/75] [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 55/75] [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 56/75] [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 57/75] 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 58/75] [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 59/75] [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 60/75] [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 61/75] 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 62/75] [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 63/75] [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 64/75] [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 65/75] 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 66/75] [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 67/75] [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 68/75] [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 69/75] 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 70/75] [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 71/75] [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 72/75] 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 73/75] 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 74/75] [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 75/75] [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