Skip to content

Commit 6f69e89

Browse files
clarkbainsclarkbains
committed
Update versioning strategy
1 parent b640042 commit 6f69e89

File tree

13 files changed

+45
-25
lines changed

13 files changed

+45
-25
lines changed

‎.github/workflows/release.yml

+25-11
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,25 @@ jobs:
6969
- name: Set Build Params
7070
run: |
7171
echo "SKIP_FLAGS_ALL_TESTS=-DskipTests=true" >> $GITHUB_ENV
72+
if echo "${{github.event.inputs.releaseVersion}}" | grep -iP 'ea|rc'; then
73+
NEXT_DEV_REVISION="\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion}"
74+
else
75+
NEXT_DEV_REVISION="\${next-revision}"
76+
fi
77+
echo "Calculated Params"
78+
echo "NEXT_DEV_REVISION=$NEXT_DEV_REVISION"
79+
echo "NEXT_DEV_REVISION=$NEXT_DEV_REVISION" >> $GITHUB_ENV
7280
7381
- name: Release Version - Prepare
74-
run: >-
75-
mvn -B -U versions:set
76-
-DnewVersion=${{ github.event.inputs.releaseVersion }}
77-
-DprocessAllModules
78-
-DgenerateBackupPoms=false
79-
82+
run: >-
83+
mvn -B -U validate
84+
versions:set-property
85+
-Dproperty=revision
86+
-DnewVersion="${{ github.event.inputs.releaseVersion }}" &&
87+
mvn validate
88+
versions:set-property
89+
-Dproperty=changelist
90+
-DnewVersion=""
8091
8192
- name: Update latest release version in docs
8293
run: |
@@ -147,11 +158,14 @@ jobs:
147158

148159
- name: Next Develoment Version - Prepare and Checkin
149160
run: >-
150-
mvn -B -U build-helper:parse-version versions:set
151-
-DnewVersion=${{github.event.inputs.releaseVersion}}-NEXT-SNAPSHOT
152-
-DprocessAllModules
153-
-DgenerateBackupPoms=false &&
154-
mvn -B validate scm:checkin
161+
mvn -B -U validate build-helper:parse-version versions:set-property
162+
-Dproperty=revision
163+
-DnewVersion='${{ env.NEXT_DEV_REVISION}}' &&
164+
mvn validate
165+
versions:set-property
166+
-Dproperty=changelist
167+
-DnewVersion="-SNAPSHOT" &&
168+
mvn validate scm:checkin -B
155169
-DscmVersion=${{ github.event.inputs.sourceBranch }}
156170
-DscmVersionType=branch
157171
-Dmessage="[ci skip] prepare for next development iteration"

‎docs/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>com.solace.quarkus</groupId>
88
<artifactId>quarkus-solace-parent</artifactId>
9-
<version>1.0.0-NEXT-SNAPSHOT</version>
9+
<version>${revision}${sha1}${changelist}</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

1313
<artifactId>quarkus-solace-docs</artifactId>
1414
<name>Quarkus Solace - Documentation</name>
15-
<version>1.0.0-NEXT-SNAPSHOT</version>
15+
<version>${revision}${sha1}${changelist}</version>
1616
<dependencies>
1717
<!-- Make sure the doc is built after the other artifacts -->
1818
<dependency>

‎integration-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.solace.quarkus</groupId>
66
<artifactId>quarkus-solace-parent</artifactId>
7-
<version>1.0.0-NEXT-SNAPSHOT</version>
7+
<version>${revision}${sha1}${changelist}</version>
88
</parent>
99
<artifactId>quarkus-solace-integration-tests-parent</artifactId>
1010
<name>Quarkus Solace - Integration Tests - Parent</name>

‎integration-tests/solace-client-integration-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.solace.quarkus</groupId>
99
<artifactId>quarkus-solace-integration-tests-parent</artifactId>
10-
<version>1.0.0-NEXT-SNAPSHOT</version>
10+
<version>${revision}${sha1}${changelist}</version>
1111
</parent>
1212

1313
<artifactId>solace-client-integration-tests</artifactId>

‎pom.xml

+8-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</parent>
1212
<groupId>com.solace.quarkus</groupId>
1313
<artifactId>quarkus-solace-parent</artifactId>
14-
<version>1.0.0-NEXT-SNAPSHOT</version>
14+
<version>${revision}${sha1}${changelist}</version>
1515
<packaging>pom</packaging>
1616
<name>Quarkus Solace - Parent</name>
1717

@@ -22,6 +22,12 @@
2222
</scm>
2323

2424
<properties>
25+
<!-- Project Versioning Properties -->
26+
<revision>1.0.1</revision>
27+
<sha1/> <!-- Doesn't actually need to be a sha1, this is just another version modifier variable -->
28+
<changelist>-SNAPSHOT</changelist>
29+
<next-revision>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}</next-revision>
30+
2531
<compiler-plugin.version>3.11.0</compiler-plugin.version>
2632
<maven.compiler.release>11</maven.compiler.release>
2733
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -210,7 +216,7 @@
210216
<configuration>
211217
<serverId>ossrh</serverId>
212218
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
213-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
219+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
214220
<useReleaseProfile>false</useReleaseProfile>
215221
</configuration>
216222
</plugin>

‎quarkus-solace-client/deployment/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.solace.quarkus</groupId>
77
<artifactId>quarkus-solace-client-parent</artifactId>
8-
<version>1.0.0-NEXT-SNAPSHOT</version>
8+
<version>${revision}${sha1}${changelist}</version>
99
</parent>
1010
<artifactId>quarkus-solace-client-deployment</artifactId>
1111
<name>Quarkus Solace Client - Deployment</name>

‎quarkus-solace-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.solace.quarkus</groupId>
88
<artifactId>quarkus-solace-parent</artifactId>
9-
<version>1.0.0-NEXT-SNAPSHOT</version>
9+
<version>${revision}${sha1}${changelist}</version>
1010
</parent>
1111
<artifactId>quarkus-solace-client-parent</artifactId>
1212
<name>Quarkus Solace Client - Parent</name>

‎quarkus-solace-client/runtime/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.solace.quarkus</groupId>
77
<artifactId>quarkus-solace-client-parent</artifactId>
8-
<version>1.0.0-NEXT-SNAPSHOT</version>
8+
<version>${revision}${sha1}${changelist}</version>
99
</parent>
1010
<artifactId>quarkus-solace-client</artifactId>
1111
<name>Quarkus Solace Client - Runtime</name>

‎quarkus-solace-messaging-connector/deployment/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.solace.quarkus</groupId>
77
<artifactId>quarkus-solace-messaging-connector-parent</artifactId>
8-
<version>1.0.0-NEXT-SNAPSHOT</version>
8+
<version>${revision}${sha1}${changelist}</version>
99
</parent>
1010
<artifactId>quarkus-solace-messaging-connector-deployment</artifactId>
1111
<name>Quarkus Solace Messaging Connector - Deployment</name>

‎quarkus-solace-messaging-connector/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.solace.quarkus</groupId>
77
<artifactId>quarkus-solace-parent</artifactId>
8-
<version>1.0.0-NEXT-SNAPSHOT</version>
8+
<version>${revision}${sha1}${changelist}</version>
99
</parent>
1010
<artifactId>quarkus-solace-messaging-connector-parent</artifactId>
1111
<name>Quarkus Solace Messaging Connector - Parent</name>

‎quarkus-solace-messaging-connector/runtime/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.solace.quarkus</groupId>
88
<artifactId>quarkus-solace-messaging-connector-parent</artifactId>
9-
<version>1.0.0-NEXT-SNAPSHOT</version>
9+
<version>${revision}${sha1}${changelist}</version>
1010
</parent>
1111
<artifactId>quarkus-solace-messaging-connector</artifactId>
1212
<name>Quarkus Solace Messaging Connector - Runtime</name>

‎samples/hello-connector-solace/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.solace.quarkus</groupId>
77
<artifactId>quarkus-solace-parent</artifactId>
8-
<version>1.0.0-NEXT-SNAPSHOT</version>
8+
<version>${revision}${sha1}${changelist}</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111
<artifactId>quarkus-solace-sample-connector-hello</artifactId>

‎samples/hello-solace/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.solace.quarkus</groupId>
77
<artifactId>quarkus-solace-parent</artifactId>
8-
<version>1.0.0-NEXT-SNAPSHOT</version>
8+
<version>${revision}${sha1}${changelist}</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111
<artifactId>quarkus-solace-sample-hello</artifactId>

0 commit comments

Comments
 (0)