chore: improve pom version check ✅

foldright · Apr 9, 2024 · a71e4e0 · a71e4e0
1 parent b764d6d
commit a71e4e0
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        java: [ 8, 11, 17, 21 ]
+        java: [ 8, 11, 17, 21, 22 ]
       fail-fast: false
       max-parallel: 64
 
@@ -27,7 +27,7 @@ jobs:
         run: ./mvnw -V --no-transfer-progress clean package
         if: matrix.java != 17
       - name: Run release mode test
-        run: ./mvnw -V --no-transfer-progress clean package spotbugs:check git-commit-id:validateRevision -DperformRelease
+        run: ./mvnw -V --no-transfer-progress clean package spotbugs:check git-commit-id:validateRevision -DperformRelease -P'!enforce-project-version-when-release'
         if: matrix.java == 17
       # https://github.com/marketplace/actions/codecov
       - uses: codecov/codecov-action@v4

diff --git a/pom.xml b/pom.xml
@@ -292,8 +292,8 @@
 								<!-- https://maven.apache.org/enforcer/enforcer-rules/requireProperty.html -->
 								<requireProperty>
 									<property>project.version</property>
-									<regex>^\d\.\d+\.\d+(-(Alpha|Beta|RC)\d+)?$|^\d(\.\d+)?\.(\d+|x)-SNAPSHOT$</regex>
-									<regexMessage>"Project version(${project.version}) format is invalid!"</regexMessage>
+									<regex>^\d(\.\d+)?\.(\d+|x)-SNAPSHOT$</regex>
+									<regexMessage>Project dev version(${project.version}) format is invalid!</regexMessage>
 								</requireProperty>
 							</rules>
 						</configuration>
@@ -690,7 +690,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>force-jdk11-when-release</id>
+			<id>enforces-when-release</id>
 			<activation>
 				<property>
 					<name>performRelease</name>
@@ -707,7 +707,7 @@
 						<artifactId>maven-enforcer-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>enforce-jdk-versions</id>
+								<id>enforces</id>
 								<goals>
 									<goal>enforce</goal>
 								</goals>
@@ -724,6 +724,43 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>enforce-project-version-when-release</id>
+			<activation>
+				<property>
+					<name>performRelease</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<!--
+						add maven-enforce-plugin to make sure the right jdk is used
+						https://stackoverflow.com/a/18420462/922688
+					-->
+					<plugin>
+						<artifactId>maven-enforcer-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>enforces</id>
+								<goals>
+									<goal>enforce</goal>
+								</goals>
+								<configuration>
+									<rules>
+										<requireProperty>
+											<property>project.version</property>
+											<regex>^\d\.\d+\.\d+(-(Alpha|Beta|RC)\d+)?$</regex>
+											<regexMessage>Project release version(${project.version}) format is invalid!</regexMessage>
+										</requireProperty>
+									</rules>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>deploy-settings</id>
 			<activation>