From bbe864d0d15a3c1ba54629dafe3d34b3dc5ecdb3 Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Thu, 29 Feb 2024 13:27:44 -0500 Subject: [PATCH 01/14] Move to solacedev --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e4676ea..bfbfe58 100644 --- a/pom.xml +++ b/pom.xml @@ -16,9 +16,9 @@ Quarkus Solace - Parent - scm:git:https://github.com/SolaceLabs/solace-quarkus.git - scm:git:https://github.com/SolaceLabs/solace-quarkus.git - https://github.com/SolaceLabs/solace-quarkus + scm:git:https://github.com/SolaceDev/solace-quarkus.git + scm:git:https://github.com/SolaceDev/solace-quarkus.git + https://github.com/SolaceDev/solace-quarkus @@ -191,11 +191,11 @@ github - https://maven.pkg.github.com/SolaceLabs/solace-quarkus + https://maven.pkg.github.com/SolaceDev/solace-quarkus github - https://maven.pkg.github.com/SolaceLabs/solace-quarkus + https://maven.pkg.github.com/SolaceDev/solace-quarkus From 3c32d688dccffe902b060bde335f8caa5e3e43a0 Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Thu, 29 Feb 2024 13:28:56 -0500 Subject: [PATCH 02/14] Set version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bfbfe58..523d96c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT pom Quarkus Solace - Parent From 208ee1fe96afe6dbdbdb9a44ae240280666252eb Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Thu, 29 Feb 2024 13:32:42 -0500 Subject: [PATCH 03/14] Set version --- docs/pom.xml | 4 ++-- integration-tests/pom.xml | 2 +- integration-tests/solace-client-integration-tests/pom.xml | 2 +- quarkus-solace-client/deployment/pom.xml | 2 +- quarkus-solace-client/pom.xml | 2 +- quarkus-solace-client/runtime/pom.xml | 2 +- quarkus-solace-messaging-connector/deployment/pom.xml | 2 +- quarkus-solace-messaging-connector/pom.xml | 2 +- quarkus-solace-messaging-connector/runtime/pom.xml | 2 +- samples/hello-connector-solace/pom.xml | 2 +- samples/hello-solace/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 8e885ea..ce52e7f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,13 +6,13 @@ com.solace.quarkus quarkus-solace-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT ../pom.xml quarkus-solace-docs Quarkus Solace - Documentation - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 08e1183..adee1a1 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT quarkus-solace-integration-tests-parent Quarkus Solace - Integration Tests - Parent diff --git a/integration-tests/solace-client-integration-tests/pom.xml b/integration-tests/solace-client-integration-tests/pom.xml index 883086e..0ccee0d 100644 --- a/integration-tests/solace-client-integration-tests/pom.xml +++ b/integration-tests/solace-client-integration-tests/pom.xml @@ -7,7 +7,7 @@ com.solace.quarkus quarkus-solace-integration-tests-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT solace-client-integration-tests diff --git a/quarkus-solace-client/deployment/pom.xml b/quarkus-solace-client/deployment/pom.xml index ba6846b..df227d5 100644 --- a/quarkus-solace-client/deployment/pom.xml +++ b/quarkus-solace-client/deployment/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-client-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT quarkus-solace-client-deployment Quarkus Solace Client - Deployment diff --git a/quarkus-solace-client/pom.xml b/quarkus-solace-client/pom.xml index 7e40561..b6aaa6d 100644 --- a/quarkus-solace-client/pom.xml +++ b/quarkus-solace-client/pom.xml @@ -6,7 +6,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT quarkus-solace-client-parent Quarkus Solace Client - Parent diff --git a/quarkus-solace-client/runtime/pom.xml b/quarkus-solace-client/runtime/pom.xml index 3645f90..d32aa6f 100644 --- a/quarkus-solace-client/runtime/pom.xml +++ b/quarkus-solace-client/runtime/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-client-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT quarkus-solace-client Quarkus Solace Client - Runtime diff --git a/quarkus-solace-messaging-connector/deployment/pom.xml b/quarkus-solace-messaging-connector/deployment/pom.xml index 0f896e0..8895a2a 100644 --- a/quarkus-solace-messaging-connector/deployment/pom.xml +++ b/quarkus-solace-messaging-connector/deployment/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-messaging-connector-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT quarkus-solace-messaging-connector-deployment Quarkus Solace Messaging Connector - Deployment diff --git a/quarkus-solace-messaging-connector/pom.xml b/quarkus-solace-messaging-connector/pom.xml index ae200f1..e387457 100644 --- a/quarkus-solace-messaging-connector/pom.xml +++ b/quarkus-solace-messaging-connector/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT quarkus-solace-messaging-connector-parent Quarkus Solace Messaging Connector - Parent diff --git a/quarkus-solace-messaging-connector/runtime/pom.xml b/quarkus-solace-messaging-connector/runtime/pom.xml index b0f94f5..2b35aa9 100644 --- a/quarkus-solace-messaging-connector/runtime/pom.xml +++ b/quarkus-solace-messaging-connector/runtime/pom.xml @@ -6,7 +6,7 @@ com.solace.quarkus quarkus-solace-messaging-connector-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT quarkus-solace-messaging-connector Quarkus Solace Messaging Connector - Runtime diff --git a/samples/hello-connector-solace/pom.xml b/samples/hello-connector-solace/pom.xml index 7147f67..d694fe5 100644 --- a/samples/hello-connector-solace/pom.xml +++ b/samples/hello-connector-solace/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT ../../pom.xml quarkus-solace-sample-connector-hello diff --git a/samples/hello-solace/pom.xml b/samples/hello-solace/pom.xml index d5373d8..e7bcb96 100644 --- a/samples/hello-solace/pom.xml +++ b/samples/hello-solace/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.1-SNAPSHOT + 1.0.0-NEXT-SNAPSHOT ../../pom.xml quarkus-solace-sample-hello From 191713c417692bdfb3f0665bb7d72af981769990 Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Thu, 29 Feb 2024 13:36:52 -0500 Subject: [PATCH 04/14] Maven batch mode --- .github/workflows/release.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ec05cc..a5a22a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,6 +73,14 @@ jobs: else echo "New version: ${{ steps.version.outputs.version }} going to be released!" fi + - name: Add SSH Key for write access for commits + uses: kielabokkie/ssh-key-and-known-hosts-action@v1 + with: + ssh-private-key: ${{ secrets.COMMIT_KEY }} + ssh-host: github.com + - name: Set Build Params + run: | + echo "SKIP_FLAGS_ALL_TESTS=-DskipTests=true" >> $GITHUB_ENV - name: Release Version - Prepare run: >- @@ -90,7 +98,7 @@ jobs: fi - name: Verify Maven - run: mvn verify + run: mvn -B verify - name: Publishing Test Results - Unit/Integration Tests Pre-Condition if: always() @@ -116,12 +124,12 @@ jobs: - name: Release Version - Checkin run: >- - mvn validate + mvn -B validate scm:checkin -DscmVersion=${{ github.event.inputs.sourceBranch }} -DscmVersionType=branch -Dmessage="[ci skip] prepare release ${{ steps.version.outputs.version }}" && - mvn scm:tag -Dtag=${{ steps.version.outputs.version }} + mvn -B scm:tag -Dtag=${{ steps.version.outputs.version }} - name: GitHub Packages - Deploy Artifacts @@ -129,7 +137,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_SECRET }} run: | - mvn deploy -Dmaven.install.skip=true -Pgithub,publish + mvn -B deploy -Dmaven.install.skip=true $SKIP_FLAGS_ALL_TESTS -Pgithub,publish - name: maven-settings-xml-action uses: whelk-io/maven-settings-xml-action@v4 @@ -140,7 +148,7 @@ jobs: env: GPG_PASSPHRASE: ${{ secrets.GPG_SECRET }} run: | - mvn deploy -Dmaven.install.skip=true -Possrh,publish + mvn -B deploy -Dmaven.install.skip=true $SKIP_FLAGS_ALL_TESTS -Possrh,publish - name: Create GitHub Release uses: ncipollo/release-action@v1 @@ -155,7 +163,7 @@ jobs: -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT -DprocessAllModules -DgenerateBackupPoms=false && - mvn validate scm:checkin + mvn -B validate scm:checkin -DscmVersion=${{ github.event.inputs.sourceBranch }} -DscmVersionType=branch -Dmessage="[ci skip] prepare for next development iteration" From 0d7897cb0c0093280f482be388b603188a424a0e Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Thu, 29 Feb 2024 13:40:25 -0500 Subject: [PATCH 05/14] ssh git transport --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 523d96c..576677f 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,8 @@ Quarkus Solace - Parent - scm:git:https://github.com/SolaceDev/solace-quarkus.git - scm:git:https://github.com/SolaceDev/solace-quarkus.git + scm:git:git@github.com:SolaceDev/solace-quarkus.git + scm:git:git@github.com:SolaceDev/solace-quarkus.git https://github.com/SolaceDev/solace-quarkus From 1633ddd8997daef3036745951b8c82246414b1f7 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 29 Feb 2024 18:47:16 +0000 Subject: [PATCH 06/14] [ci skip] prepare release 1.0.0-RC1 --- docs/pom.xml | 4 ++-- integration-tests/pom.xml | 2 +- integration-tests/solace-client-integration-tests/pom.xml | 2 +- pom.xml | 2 +- quarkus-solace-client/deployment/pom.xml | 2 +- quarkus-solace-client/pom.xml | 2 +- quarkus-solace-client/runtime/pom.xml | 2 +- quarkus-solace-messaging-connector/deployment/pom.xml | 2 +- quarkus-solace-messaging-connector/pom.xml | 2 +- quarkus-solace-messaging-connector/runtime/pom.xml | 2 +- samples/hello-connector-solace/pom.xml | 2 +- samples/hello-solace/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ce52e7f..e17858d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,13 +6,13 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 ../pom.xml quarkus-solace-docs Quarkus Solace - Documentation - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index adee1a1..e46b38d 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 quarkus-solace-integration-tests-parent Quarkus Solace - Integration Tests - Parent diff --git a/integration-tests/solace-client-integration-tests/pom.xml b/integration-tests/solace-client-integration-tests/pom.xml index 0ccee0d..a895ddf 100644 --- a/integration-tests/solace-client-integration-tests/pom.xml +++ b/integration-tests/solace-client-integration-tests/pom.xml @@ -7,7 +7,7 @@ com.solace.quarkus quarkus-solace-integration-tests-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 solace-client-integration-tests diff --git a/pom.xml b/pom.xml index 576677f..4c983b0 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 pom Quarkus Solace - Parent diff --git a/quarkus-solace-client/deployment/pom.xml b/quarkus-solace-client/deployment/pom.xml index df227d5..ab572b9 100644 --- a/quarkus-solace-client/deployment/pom.xml +++ b/quarkus-solace-client/deployment/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-client-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 quarkus-solace-client-deployment Quarkus Solace Client - Deployment diff --git a/quarkus-solace-client/pom.xml b/quarkus-solace-client/pom.xml index b6aaa6d..771a86d 100644 --- a/quarkus-solace-client/pom.xml +++ b/quarkus-solace-client/pom.xml @@ -6,7 +6,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 quarkus-solace-client-parent Quarkus Solace Client - Parent diff --git a/quarkus-solace-client/runtime/pom.xml b/quarkus-solace-client/runtime/pom.xml index d32aa6f..5301e28 100644 --- a/quarkus-solace-client/runtime/pom.xml +++ b/quarkus-solace-client/runtime/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-client-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 quarkus-solace-client Quarkus Solace Client - Runtime diff --git a/quarkus-solace-messaging-connector/deployment/pom.xml b/quarkus-solace-messaging-connector/deployment/pom.xml index 8895a2a..7fd5c61 100644 --- a/quarkus-solace-messaging-connector/deployment/pom.xml +++ b/quarkus-solace-messaging-connector/deployment/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-messaging-connector-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 quarkus-solace-messaging-connector-deployment Quarkus Solace Messaging Connector - Deployment diff --git a/quarkus-solace-messaging-connector/pom.xml b/quarkus-solace-messaging-connector/pom.xml index e387457..a9a1503 100644 --- a/quarkus-solace-messaging-connector/pom.xml +++ b/quarkus-solace-messaging-connector/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 quarkus-solace-messaging-connector-parent Quarkus Solace Messaging Connector - Parent diff --git a/quarkus-solace-messaging-connector/runtime/pom.xml b/quarkus-solace-messaging-connector/runtime/pom.xml index 2b35aa9..ea11660 100644 --- a/quarkus-solace-messaging-connector/runtime/pom.xml +++ b/quarkus-solace-messaging-connector/runtime/pom.xml @@ -6,7 +6,7 @@ com.solace.quarkus quarkus-solace-messaging-connector-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 quarkus-solace-messaging-connector Quarkus Solace Messaging Connector - Runtime diff --git a/samples/hello-connector-solace/pom.xml b/samples/hello-connector-solace/pom.xml index d694fe5..7d73971 100644 --- a/samples/hello-connector-solace/pom.xml +++ b/samples/hello-connector-solace/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 ../../pom.xml quarkus-solace-sample-connector-hello diff --git a/samples/hello-solace/pom.xml b/samples/hello-solace/pom.xml index e7bcb96..31b4465 100644 --- a/samples/hello-solace/pom.xml +++ b/samples/hello-solace/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + 1.0.0-RC1 ../../pom.xml quarkus-solace-sample-hello From cf43cbd8746d88ab46bd13198283325b9e49a7e2 Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Thu, 29 Feb 2024 13:49:04 -0500 Subject: [PATCH 07/14] Prepare to merge --- docs/pom.xml | 4 ++-- integration-tests/pom.xml | 2 +- .../solace-client-integration-tests/pom.xml | 2 +- pom.xml | 14 +++++++------- quarkus-solace-client/deployment/pom.xml | 2 +- .../deployment/DevServicesSolaceProcessor.java | 16 ++++++++-------- .../deployment/test/SolaceDevModeTest.java | 2 +- quarkus-solace-client/pom.xml | 2 +- quarkus-solace-client/runtime/pom.xml | 2 +- .../deployment/pom.xml | 2 +- quarkus-solace-messaging-connector/pom.xml | 2 +- .../runtime/pom.xml | 2 +- samples/hello-connector-solace/pom.xml | 2 +- samples/hello-solace/pom.xml | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e17858d..ce52e7f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,13 +6,13 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT ../pom.xml quarkus-solace-docs Quarkus Solace - Documentation - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index e46b38d..adee1a1 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT quarkus-solace-integration-tests-parent Quarkus Solace - Integration Tests - Parent diff --git a/integration-tests/solace-client-integration-tests/pom.xml b/integration-tests/solace-client-integration-tests/pom.xml index a895ddf..0ccee0d 100644 --- a/integration-tests/solace-client-integration-tests/pom.xml +++ b/integration-tests/solace-client-integration-tests/pom.xml @@ -7,7 +7,7 @@ com.solace.quarkus quarkus-solace-integration-tests-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT solace-client-integration-tests diff --git a/pom.xml b/pom.xml index 4c983b0..d760bae 100644 --- a/pom.xml +++ b/pom.xml @@ -11,14 +11,14 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT pom Quarkus Solace - Parent - scm:git:git@github.com:SolaceDev/solace-quarkus.git - scm:git:git@github.com:SolaceDev/solace-quarkus.git - https://github.com/SolaceDev/solace-quarkus + scm:git:git@github.com:SolaceLabs/solace-quarkus.git + scm:git:git@github.com:SolaceLabs/solace-quarkus.git + https://github.com/SolaceLabs/solace-quarkus @@ -191,11 +191,11 @@ github - https://maven.pkg.github.com/SolaceDev/solace-quarkus + https://maven.pkg.github.com/SolaceLabs/solace-quarkus github - https://maven.pkg.github.com/SolaceDev/solace-quarkus + https://maven.pkg.github.com/SolaceLabs/solace-quarkus @@ -210,7 +210,7 @@ ossrh https://s01.oss.sonatype.org/ - false + true false diff --git a/quarkus-solace-client/deployment/pom.xml b/quarkus-solace-client/deployment/pom.xml index ab572b9..df227d5 100644 --- a/quarkus-solace-client/deployment/pom.xml +++ b/quarkus-solace-client/deployment/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-client-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT quarkus-solace-client-deployment Quarkus Solace Client - Deployment diff --git a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java index 5834024..45eefdb 100644 --- a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java +++ b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java @@ -49,7 +49,7 @@ public class DevServicesSolaceProcessor { private static final ContainerLocator solaceContainerLocator = new ContainerLocator(DEV_SERVICE_LABEL, 55555); private static volatile RunningDevService running; - private static volatile SolaceDevServiceConfig cfg; + private static volatile SolaceLabsServiceConfig cfg; private static volatile boolean first = true; @BuildStep @@ -62,7 +62,7 @@ public DevServicesResultBuildItem startSolaceContainer(LaunchModeBuildItem launc LoggingSetupBuildItem loggingSetupBuildItem, GlobalDevServicesConfig devServicesConfig) { - SolaceDevServiceConfig configuration = getConfiguration(config); + SolaceLabsServiceConfig configuration = getConfiguration(config); if (running != null) { boolean shouldShutdownTheBroker = !configuration.equals(cfg); @@ -124,13 +124,13 @@ public DevServicesResultBuildItem startSolaceContainer(LaunchModeBuildItem launc } - private SolaceDevServiceConfig getConfiguration(SolaceBuildTimeConfig config) { + private SolaceLabsServiceConfig getConfiguration(SolaceBuildTimeConfig config) { SolaceBuildTimeConfig.DevServiceConfiguration cfg = config.defaultDevService(); - return new SolaceDevServiceConfig(cfg); + return new SolaceLabsServiceConfig(cfg); } private RunningDevService startContainer(DockerStatusBuildItem dockerStatusBuildItem, - SolaceDevServiceConfig devServicesConfig, LaunchMode launchMode, + SolaceLabsServiceConfig devServicesConfig, LaunchMode launchMode, boolean useSharedNetwork, Optional timeout) { if (!devServicesConfig.enabled) { // explicitly disabled @@ -272,7 +272,7 @@ private void executeCommand(String... command) { } } - private static class SolaceDevServiceConfig { + private static class SolaceLabsServiceConfig { final boolean enabled; final String serviceName; @@ -280,7 +280,7 @@ private static class SolaceDevServiceConfig { final boolean shared; final Map containerEnv; - public SolaceDevServiceConfig(SolaceBuildTimeConfig.DevServiceConfiguration cfg) { + public SolaceLabsServiceConfig(SolaceBuildTimeConfig.DevServiceConfiguration cfg) { enabled = cfg.devservices().enabled(); serviceName = cfg.devservices().serviceName(); imageName = cfg.devservices().imageName().orElse(SOLACE_IMAGE); @@ -294,7 +294,7 @@ public boolean equals(Object o) { return true; if (o == null || getClass() != o.getClass()) return false; - SolaceDevServiceConfig that = (SolaceDevServiceConfig) o; + SolaceLabsServiceConfig that = (SolaceLabsServiceConfig) o; return enabled == that.enabled && shared == that.shared && Objects.equals(serviceName, that.serviceName) && Objects.equals(imageName, that.imageName) && Objects.equals(containerEnv, that.containerEnv); } diff --git a/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java b/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java index 2edc0f9..efab2e1 100644 --- a/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java +++ b/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java @@ -8,7 +8,7 @@ import io.quarkus.test.QuarkusDevModeTest; -public class SolaceDevModeTest { +public class SolaceLabsModeTest { // Start hot reload (DevMode) test with your extension loaded @RegisterExtension diff --git a/quarkus-solace-client/pom.xml b/quarkus-solace-client/pom.xml index 771a86d..b6aaa6d 100644 --- a/quarkus-solace-client/pom.xml +++ b/quarkus-solace-client/pom.xml @@ -6,7 +6,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT quarkus-solace-client-parent Quarkus Solace Client - Parent diff --git a/quarkus-solace-client/runtime/pom.xml b/quarkus-solace-client/runtime/pom.xml index 5301e28..d32aa6f 100644 --- a/quarkus-solace-client/runtime/pom.xml +++ b/quarkus-solace-client/runtime/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-client-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT quarkus-solace-client Quarkus Solace Client - Runtime diff --git a/quarkus-solace-messaging-connector/deployment/pom.xml b/quarkus-solace-messaging-connector/deployment/pom.xml index 7fd5c61..8895a2a 100644 --- a/quarkus-solace-messaging-connector/deployment/pom.xml +++ b/quarkus-solace-messaging-connector/deployment/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-messaging-connector-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT quarkus-solace-messaging-connector-deployment Quarkus Solace Messaging Connector - Deployment diff --git a/quarkus-solace-messaging-connector/pom.xml b/quarkus-solace-messaging-connector/pom.xml index a9a1503..e387457 100644 --- a/quarkus-solace-messaging-connector/pom.xml +++ b/quarkus-solace-messaging-connector/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT quarkus-solace-messaging-connector-parent Quarkus Solace Messaging Connector - Parent diff --git a/quarkus-solace-messaging-connector/runtime/pom.xml b/quarkus-solace-messaging-connector/runtime/pom.xml index ea11660..2b35aa9 100644 --- a/quarkus-solace-messaging-connector/runtime/pom.xml +++ b/quarkus-solace-messaging-connector/runtime/pom.xml @@ -6,7 +6,7 @@ com.solace.quarkus quarkus-solace-messaging-connector-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT quarkus-solace-messaging-connector Quarkus Solace Messaging Connector - Runtime diff --git a/samples/hello-connector-solace/pom.xml b/samples/hello-connector-solace/pom.xml index 7d73971..d694fe5 100644 --- a/samples/hello-connector-solace/pom.xml +++ b/samples/hello-connector-solace/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT ../../pom.xml quarkus-solace-sample-connector-hello diff --git a/samples/hello-solace/pom.xml b/samples/hello-solace/pom.xml index 31b4465..e7bcb96 100644 --- a/samples/hello-solace/pom.xml +++ b/samples/hello-solace/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-RC1 + 1.0.0-NEXT-SNAPSHOT ../../pom.xml quarkus-solace-sample-hello From c115a4729945dc228bba5c788f8ab0d880ca058e Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Thu, 29 Feb 2024 13:53:19 -0500 Subject: [PATCH 08/14] enhance versioning --- .github/workflows/release.yml | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5a22a8..9d4d5a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: releaseVersion: description: "Version to use when preparing a release. Use `auto` to use the latest version from the pom.xml." required: true - default: "auto" + default: "1.0.0" sourceBranch: description: "Which branch contains the previous release version." default: "main" @@ -49,29 +49,17 @@ jobs: gpg-passphrase: GPG_PASSPHRASE gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - - name: Find version to use - id: version - run: | - if [[ "${{ github.event.inputs.releaseVersion }}" -eq "auto" ]]; then - echo "No release version provided, using the latest version from the pom.xml" - new_version=`mvn -B help:evaluate -Dexpression=project.version -q -DforceStdout | sed -e 's/-SNAPSHOT$//'` - echo "New version will be $new_version" - echo version=$new_version >> $GITHUB_OUTPUT - else - echo version=${{ github.event.inputs.releaseVersion }} >> $GITHUB_OUTPUT - fi - - name: Pre-Release Check - Version env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh api --method GET /repos/${{github.repository}}/releases -f sort=updated -f direction=asc > releases.json - release_version_exists=$(jq -r --arg RELEASE_VERSION ${{ steps.version.outputs.version }} '.[].name|select(.|test($RELEASE_VERSION))' releases.json) + release_version_exists=$(jq -r --arg RELEASE_VERSION ${{ github.event.inputs.releaseVersion }} '.[].name|select(.|test($RELEASE_VERSION))' releases.json) if [[ ! -z "$release_version_exists" ]]; then - echo "Version ${{ steps.version.outputs.version }} has been previously released. Please change release version." + echo "Version ${{ github.event.inputs.releaseVersion }} has been previously released. Please change release version." exit 1 else - echo "New version: ${{ steps.version.outputs.version }} going to be released!" + echo "New version: ${{ github.event.inputs.releaseVersion }} going to be released!" fi - name: Add SSH Key for write access for commits uses: kielabokkie/ssh-key-and-known-hosts-action@v1 @@ -85,7 +73,7 @@ jobs: - name: Release Version - Prepare run: >- mvn -B -U versions:set - -DnewVersion=${{ steps.version.outputs.version }} + -DnewVersion=${{ github.event.inputs.releaseVersion }} -DprocessAllModules -DgenerateBackupPoms=false @@ -128,8 +116,8 @@ jobs: scm:checkin -DscmVersion=${{ github.event.inputs.sourceBranch }} -DscmVersionType=branch - -Dmessage="[ci skip] prepare release ${{ steps.version.outputs.version }}" && - mvn -B scm:tag -Dtag=${{ steps.version.outputs.version }} + -Dmessage="[ci skip] prepare release ${{ github.event.inputs.releaseVersion }}" && + mvn -B scm:tag -Dtag=${{ github.event.inputs.releaseVersion }} - name: GitHub Packages - Deploy Artifacts @@ -153,14 +141,14 @@ jobs: - name: Create GitHub Release uses: ncipollo/release-action@v1 with: - tag: "${{ steps.version.outputs.version }}" + tag: "${{ github.event.inputs.releaseVersion }}" generateReleaseNotes: true makeLatest: true - name: Next Develoment Version - Prepare and Checkin run: >- mvn -B -U build-helper:parse-version versions:set - -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT + -DnewVersion=${{github.event.inputs.releaseVersion}}-NEXT-SNAPSHOT -DprocessAllModules -DgenerateBackupPoms=false && mvn -B validate scm:checkin From db380da807fb493407a70f024dbdacbc2bd9d75f Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Mon, 4 Mar 2024 10:41:45 -0500 Subject: [PATCH 09/14] Update SolaceDevModeTest.java --- .../com/solace/quarkus/deployment/test/SolaceDevModeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java b/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java index efab2e1..2edc0f9 100644 --- a/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java +++ b/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java @@ -8,7 +8,7 @@ import io.quarkus.test.QuarkusDevModeTest; -public class SolaceLabsModeTest { +public class SolaceDevModeTest { // Start hot reload (DevMode) test with your extension loaded @RegisterExtension From b640042d49ae93ddffcb6e59fcef2100e9ade64a Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Mon, 4 Mar 2024 10:42:35 -0500 Subject: [PATCH 10/14] Update DevServicesSolaceProcessor.java --- .../deployment/DevServicesSolaceProcessor.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java index 45eefdb..5834024 100644 --- a/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java +++ b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java @@ -49,7 +49,7 @@ public class DevServicesSolaceProcessor { private static final ContainerLocator solaceContainerLocator = new ContainerLocator(DEV_SERVICE_LABEL, 55555); private static volatile RunningDevService running; - private static volatile SolaceLabsServiceConfig cfg; + private static volatile SolaceDevServiceConfig cfg; private static volatile boolean first = true; @BuildStep @@ -62,7 +62,7 @@ public DevServicesResultBuildItem startSolaceContainer(LaunchModeBuildItem launc LoggingSetupBuildItem loggingSetupBuildItem, GlobalDevServicesConfig devServicesConfig) { - SolaceLabsServiceConfig configuration = getConfiguration(config); + SolaceDevServiceConfig configuration = getConfiguration(config); if (running != null) { boolean shouldShutdownTheBroker = !configuration.equals(cfg); @@ -124,13 +124,13 @@ public DevServicesResultBuildItem startSolaceContainer(LaunchModeBuildItem launc } - private SolaceLabsServiceConfig getConfiguration(SolaceBuildTimeConfig config) { + private SolaceDevServiceConfig getConfiguration(SolaceBuildTimeConfig config) { SolaceBuildTimeConfig.DevServiceConfiguration cfg = config.defaultDevService(); - return new SolaceLabsServiceConfig(cfg); + return new SolaceDevServiceConfig(cfg); } private RunningDevService startContainer(DockerStatusBuildItem dockerStatusBuildItem, - SolaceLabsServiceConfig devServicesConfig, LaunchMode launchMode, + SolaceDevServiceConfig devServicesConfig, LaunchMode launchMode, boolean useSharedNetwork, Optional timeout) { if (!devServicesConfig.enabled) { // explicitly disabled @@ -272,7 +272,7 @@ private void executeCommand(String... command) { } } - private static class SolaceLabsServiceConfig { + private static class SolaceDevServiceConfig { final boolean enabled; final String serviceName; @@ -280,7 +280,7 @@ private static class SolaceLabsServiceConfig { final boolean shared; final Map containerEnv; - public SolaceLabsServiceConfig(SolaceBuildTimeConfig.DevServiceConfiguration cfg) { + public SolaceDevServiceConfig(SolaceBuildTimeConfig.DevServiceConfiguration cfg) { enabled = cfg.devservices().enabled(); serviceName = cfg.devservices().serviceName(); imageName = cfg.devservices().imageName().orElse(SOLACE_IMAGE); @@ -294,7 +294,7 @@ public boolean equals(Object o) { return true; if (o == null || getClass() != o.getClass()) return false; - SolaceLabsServiceConfig that = (SolaceLabsServiceConfig) o; + SolaceDevServiceConfig that = (SolaceDevServiceConfig) o; return enabled == that.enabled && shared == that.shared && Objects.equals(serviceName, that.serviceName) && Objects.equals(imageName, that.imageName) && Objects.equals(containerEnv, that.containerEnv); } From 6f69e8962adf91b5a61af127bdd880cee5ed3184 Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Thu, 14 Mar 2024 10:13:14 -0400 Subject: [PATCH 11/14] Update versioning strategy --- .github/workflows/release.yml | 36 +++++++++++++------ docs/pom.xml | 4 +-- integration-tests/pom.xml | 2 +- .../solace-client-integration-tests/pom.xml | 2 +- pom.xml | 10 ++++-- quarkus-solace-client/deployment/pom.xml | 2 +- quarkus-solace-client/pom.xml | 2 +- quarkus-solace-client/runtime/pom.xml | 2 +- .../deployment/pom.xml | 2 +- quarkus-solace-messaging-connector/pom.xml | 2 +- .../runtime/pom.xml | 2 +- samples/hello-connector-solace/pom.xml | 2 +- samples/hello-solace/pom.xml | 2 +- 13 files changed, 45 insertions(+), 25 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d4d5a4..c38988e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,14 +69,25 @@ jobs: - name: Set Build Params run: | echo "SKIP_FLAGS_ALL_TESTS=-DskipTests=true" >> $GITHUB_ENV + if echo "${{github.event.inputs.releaseVersion}}" | grep -iP 'ea|rc'; then + NEXT_DEV_REVISION="\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion}" + else + NEXT_DEV_REVISION="\${next-revision}" + fi + echo "Calculated Params" + echo "NEXT_DEV_REVISION=$NEXT_DEV_REVISION" + echo "NEXT_DEV_REVISION=$NEXT_DEV_REVISION" >> $GITHUB_ENV - name: Release Version - Prepare - run: >- - mvn -B -U versions:set - -DnewVersion=${{ github.event.inputs.releaseVersion }} - -DprocessAllModules - -DgenerateBackupPoms=false - + run: >- + mvn -B -U validate + versions:set-property + -Dproperty=revision + -DnewVersion="${{ github.event.inputs.releaseVersion }}" && + mvn validate + versions:set-property + -Dproperty=changelist + -DnewVersion="" - name: Update latest release version in docs run: | @@ -147,11 +158,14 @@ jobs: - name: Next Develoment Version - Prepare and Checkin run: >- - mvn -B -U build-helper:parse-version versions:set - -DnewVersion=${{github.event.inputs.releaseVersion}}-NEXT-SNAPSHOT - -DprocessAllModules - -DgenerateBackupPoms=false && - mvn -B validate scm:checkin + mvn -B -U validate build-helper:parse-version versions:set-property + -Dproperty=revision + -DnewVersion='${{ env.NEXT_DEV_REVISION}}' && + mvn validate + versions:set-property + -Dproperty=changelist + -DnewVersion="-SNAPSHOT" && + mvn validate scm:checkin -B -DscmVersion=${{ github.event.inputs.sourceBranch }} -DscmVersionType=branch -Dmessage="[ci skip] prepare for next development iteration" diff --git a/docs/pom.xml b/docs/pom.xml index ce52e7f..6cce8c9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,13 +6,13 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} ../pom.xml quarkus-solace-docs Quarkus Solace - Documentation - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index adee1a1..1cefd8a 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} quarkus-solace-integration-tests-parent Quarkus Solace - Integration Tests - Parent diff --git a/integration-tests/solace-client-integration-tests/pom.xml b/integration-tests/solace-client-integration-tests/pom.xml index 0ccee0d..7075982 100644 --- a/integration-tests/solace-client-integration-tests/pom.xml +++ b/integration-tests/solace-client-integration-tests/pom.xml @@ -7,7 +7,7 @@ com.solace.quarkus quarkus-solace-integration-tests-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} solace-client-integration-tests diff --git a/pom.xml b/pom.xml index d760bae..cf5b270 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} pom Quarkus Solace - Parent @@ -22,6 +22,12 @@ + + 1.0.1 + + -SNAPSHOT + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion} + 3.11.0 11 UTF-8 @@ -210,7 +216,7 @@ ossrh https://s01.oss.sonatype.org/ - true + false false diff --git a/quarkus-solace-client/deployment/pom.xml b/quarkus-solace-client/deployment/pom.xml index df227d5..b7158cb 100644 --- a/quarkus-solace-client/deployment/pom.xml +++ b/quarkus-solace-client/deployment/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-client-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} quarkus-solace-client-deployment Quarkus Solace Client - Deployment diff --git a/quarkus-solace-client/pom.xml b/quarkus-solace-client/pom.xml index b6aaa6d..e1f7382 100644 --- a/quarkus-solace-client/pom.xml +++ b/quarkus-solace-client/pom.xml @@ -6,7 +6,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} quarkus-solace-client-parent Quarkus Solace Client - Parent diff --git a/quarkus-solace-client/runtime/pom.xml b/quarkus-solace-client/runtime/pom.xml index d32aa6f..5e1155b 100644 --- a/quarkus-solace-client/runtime/pom.xml +++ b/quarkus-solace-client/runtime/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-client-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} quarkus-solace-client Quarkus Solace Client - Runtime diff --git a/quarkus-solace-messaging-connector/deployment/pom.xml b/quarkus-solace-messaging-connector/deployment/pom.xml index 8895a2a..4109f5f 100644 --- a/quarkus-solace-messaging-connector/deployment/pom.xml +++ b/quarkus-solace-messaging-connector/deployment/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-messaging-connector-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} quarkus-solace-messaging-connector-deployment Quarkus Solace Messaging Connector - Deployment diff --git a/quarkus-solace-messaging-connector/pom.xml b/quarkus-solace-messaging-connector/pom.xml index e387457..ac57612 100644 --- a/quarkus-solace-messaging-connector/pom.xml +++ b/quarkus-solace-messaging-connector/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} quarkus-solace-messaging-connector-parent Quarkus Solace Messaging Connector - Parent diff --git a/quarkus-solace-messaging-connector/runtime/pom.xml b/quarkus-solace-messaging-connector/runtime/pom.xml index 2b35aa9..3d295a1 100644 --- a/quarkus-solace-messaging-connector/runtime/pom.xml +++ b/quarkus-solace-messaging-connector/runtime/pom.xml @@ -6,7 +6,7 @@ com.solace.quarkus quarkus-solace-messaging-connector-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} quarkus-solace-messaging-connector Quarkus Solace Messaging Connector - Runtime diff --git a/samples/hello-connector-solace/pom.xml b/samples/hello-connector-solace/pom.xml index d694fe5..1b89e75 100644 --- a/samples/hello-connector-solace/pom.xml +++ b/samples/hello-connector-solace/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} ../../pom.xml quarkus-solace-sample-connector-hello diff --git a/samples/hello-solace/pom.xml b/samples/hello-solace/pom.xml index e7bcb96..53817e9 100644 --- a/samples/hello-solace/pom.xml +++ b/samples/hello-solace/pom.xml @@ -5,7 +5,7 @@ com.solace.quarkus quarkus-solace-parent - 1.0.0-NEXT-SNAPSHOT + ${revision}${sha1}${changelist} ../../pom.xml quarkus-solace-sample-hello From 189c3ad91536ceb540cf5ae763a0de22a9ac4ac4 Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Thu, 14 Mar 2024 11:21:00 -0400 Subject: [PATCH 12/14] fix exact matches --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c38988e..1931ecc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,7 +54,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh api --method GET /repos/${{github.repository}}/releases -f sort=updated -f direction=asc > releases.json - release_version_exists=$(jq -r --arg RELEASE_VERSION ${{ github.event.inputs.releaseVersion }} '.[].name|select(.|test($RELEASE_VERSION))' releases.json) + release_version_exists=$(jq -r --arg RELEASE_VERSION ${{ github.event.inputs.releaseVersion }} '.[].name|select(. == $RELEASE_VERSION))' releases.json) if [[ ! -z "$release_version_exists" ]]; then echo "Version ${{ github.event.inputs.releaseVersion }} has been previously released. Please change release version." exit 1 From e3952400f402e63d518b8c33a8b245642ff40eff Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Thu, 14 Mar 2024 11:25:22 -0400 Subject: [PATCH 13/14] typo --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1931ecc..59ffeff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,7 +54,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh api --method GET /repos/${{github.repository}}/releases -f sort=updated -f direction=asc > releases.json - release_version_exists=$(jq -r --arg RELEASE_VERSION ${{ github.event.inputs.releaseVersion }} '.[].name|select(. == $RELEASE_VERSION))' releases.json) + release_version_exists=$(jq -r --arg RELEASE_VERSION ${{ github.event.inputs.releaseVersion }} '.[].name|select(. == $RELEASE_VERSION)' releases.json) if [[ ! -z "$release_version_exists" ]]; then echo "Version ${{ github.event.inputs.releaseVersion }} has been previously released. Please change release version." exit 1 From 901a1e5b6797942dcf764d02e16715dd0f38edc7 Mon Sep 17 00:00:00 2001 From: Clark Bains Date: Thu, 14 Mar 2024 13:07:31 -0400 Subject: [PATCH 14/14] Fix description --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59ffeff..8168ffe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: releaseVersion: - description: "Version to use when preparing a release. Use `auto` to use the latest version from the pom.xml." + description: "Version to use when preparing a release. Ex 1.0.0, 1.0.1-RC1, 1.0.2-EA3" required: true default: "1.0.0" sourceBranch: