Replace Per-Module Version with Single Property

Jenkinsfile

@@ -23,7 +23,7 @@ pipeline {
                     pom = readMavenPom file: 'pom.xml'
                     payaraBuildNumber = "PR${env.ghprbPullId}#${currentBuild.number}"
                     DOMAIN_NAME = "test-domain"
-                    echo "Payara pom version is ${pom.version}"
+                    echo "Payara pom version is ${pom.properties['revision']}"
                     echo "Build number is ${payaraBuildNumber}"
                     echo "Domain name is ${DOMAIN_NAME}"
               }
@@ -130,7 +130,7 @@ pipeline {
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out MP TCK Runners  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh """mvn -B -V -ff -e clean verify --strict-checksums \
@@ -167,7 +167,7 @@ pipeline {
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out MP TCK Runners  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh """mvn -B -V -ff -e clean verify --strict-checksums \
@@ -204,7 +204,7 @@ pipeline {
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out MP TCK Runners  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh """mvn -B -V -ff -e clean verify --strict-checksums \
@@ -241,7 +241,7 @@ pipeline {
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out MP TCK Runners  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh """mvn -B -V -ff -e clean verify --strict-checksums \
@@ -278,7 +278,7 @@ pipeline {
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out MP TCK Runners  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh """mvn -B -V -ff -e clean verify --strict-checksums \
@@ -315,7 +315,7 @@ pipeline {
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out MP TCK Runners  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh """mvn -B -V -ff -e clean verify --strict-checksums \
@@ -352,7 +352,7 @@ pipeline {
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out MP TCK Runners  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh """mvn -B -V -ff -e clean verify --strict-checksums \
@@ -389,7 +389,7 @@ pipeline {
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out MP TCK Runners  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh """mvn -B -V -ff -e clean verify --strict-checksums \
@@ -426,7 +426,7 @@ pipeline {
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out MP TCK Runners  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh """mvn -B -V -ff -e clean verify --strict-checksums \
@@ -463,7 +463,7 @@ pipeline {
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out EE8 tests  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh "mvn -B -V -ff -e clean install --strict-checksums -Dsurefire.useFile=false \
@@ -498,7 +498,7 @@ pipeline {
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out cargoTracker tests  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Cleaning CargoTracker Database in /tmp  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh "rm -rf /tmp/cargo*"
@@ -531,12 +531,12 @@ pipeline {
                     steps{
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checking out EE7 tests  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         checkout changelog: false, poll: false, scm: [$class: 'GitSCM',
-                            branches: [[name: "*/Payara7"]],
-                            userRemoteConfigs: [[url: "https://github.com/payara/patched-src-javaee7-samples.git"]]]
+                            branches: [[name: "*/Simplify-Project-Versions"]],
+                            userRemoteConfigs: [[url: "https://github.com/Pandrex247/patched-src-javaee7-samples.git"]]]
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out EE7 tests  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
-                        updatePomPayaraVersion("${pom.version}")
+                        updatePomPayaraVersion("${pom.properties['revision']}")
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh """mvn -B -V -ff -e clean install --strict-checksums \
@@ -576,6 +576,7 @@ pipeline {
                         -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/lib/security/cacerts \
                         -Djavax.xml.accessExternalSchema=all \
                         -DskipTests \
+                        -Drevision=${pom.properties['revision']} \
                         -f appserver/tests/payara-samples -pl fish.payara.samples:payara-samples \
                         -pl fish.payara.samples:samples-test-utils -pl fish.payara.samples:test-domain-setup \
                         -pl fish.payara.samples:payara-samples-profiled-tests"""
@@ -584,19 +585,22 @@ pipeline {
                         sh """mvn -V -B -ff clean install --strict-checksums -Ppayara-micro-managed,install-deps \
                         -Dsurefire.rerunFailingTestsCount=2 \
                         -Dfailsafe.rerunFailingTestsCount=2 \
+                        -Drevision=${pom.properties['revision']} \
                         -f appserver/tests/functional/payara-micro """
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test with Payara Embedded  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         sh """mvn -V -B -ff clean verify --strict-checksums -PFullProfile \
-                        -Dversion=${pom.version} \
+                        -Dversion=${pom.properties['revision']} \
                         -Dsurefire.rerunFailingTestsCount=2 \
                         -Dfailsafe.rerunFailingTestsCount=2 \
+                        -Drevision=${pom.properties['revision']} \
                         -f appserver/tests/functional/embeddedtest """
 
                         sh """mvn -V -B -ff clean verify --strict-checksums -PWebProfile \
-                        -Dversion=${pom.version} \
+                        -Dversion=${pom.properties['revision']} \
                         -Dsurefire.rerunFailingTestsCount=2 \
                         -Dfailsafe.rerunFailingTestsCount=2 \
+                        -Drevision=${pom.properties['revision']} \
                         -f appserver/tests/functional/embeddedtest """
 
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running asadmin tests  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
@@ -672,5 +676,5 @@ void saveLogsAndCleanup(String logArchiveName) {
 
 void updatePomPayaraVersion(String payaraVersion) {
     echo '*#*#*#*#*#*#*#*#*#*#*#*#  Updating pom.xml payara.version property for Shrinkwrap resolver  *#*#*#*#*#*#*#*#*#*#*#*#'
-    sh script: "sed -i \"s/payara\\.version>.*<\\/payara\\.version>/payara\\.version>${payaraVersion}<\\/payara\\.version>/g\" pom.xml", label: "Update pom.xml payara.version property"
+    sh script: "mvn versions:set-property -DnewVersion=${payaraVersion} -DgenerateBackupPoms=false -Dproperty=payara.version -N", label: "Update pom.xml payara.version property"
 }

api/payara-api/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>fish.payara.api</groupId>
         <artifactId>api-parent</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <groupId>fish.payara.api</groupId>
     <artifactId>payara-api</artifactId>

api/payara-bom/pom.xml

@@ -44,7 +44,7 @@
     <parent>
         <groupId>fish.payara.api</groupId>
         <artifactId>api-parent</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>payara-bom</artifactId>

api/pom.xml

@@ -43,7 +43,7 @@
     <parent>
         <groupId>fish.payara.server</groupId>
         <artifactId>payara-aggregator</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <groupId>fish.payara.api</groupId>

appserver/admin/admin-core/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>admin-core</artifactId>

appserver/admin/backup-l10n/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>backup-l10n</artifactId>

appserver/admin/backup/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>backup</artifactId>

appserver/admin/cli-optional-l10n/pom.xml

@@ -47,7 +47,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>cli-optional-l10n</artifactId>
 

appserver/admin/cli-optional/pom.xml

@@ -47,7 +47,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>cli-optional</artifactId>
     <packaging>glassfish-jar</packaging>

appserver/admin/cli/pom.xml

@@ -47,7 +47,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>appserver-cli</artifactId>
     <packaging>glassfish-jar</packaging>

appserver/admin/gf_template/pom.xml

@@ -47,7 +47,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>appserver-domain</artifactId>

appserver/admin/gf_template_web/pom.xml

@@ -48,7 +48,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>appserver-domain-web</artifactId>

appserver/admin/pom.xml

@@ -48,7 +48,7 @@
     <parent>
         <groupId>fish.payara.server</groupId>
         <artifactId>payara-parent</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <groupId>fish.payara.server.internal.admin</groupId>
     <artifactId>admin</artifactId>

appserver/admingui/cdieventbus-notifier-console-plugin-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>cdieventbus-notifier-console-plugin-l10n</artifactId>

appserver/admingui/cdieventbus-notifier-console-plugin/pom.xml

@@ -43,7 +43,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>cdieventbus-notifier-console-plugin</artifactId>
     <packaging>glassfish-jar</packaging>

appserver/admingui/cluster-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>console-cluster-plugin-l10n</artifactId>
 

appserver/admingui/cluster/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>console-cluster-plugin</artifactId>
     <packaging>glassfish-jar</packaging>

appserver/admingui/common-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>console-common-l10n</artifactId>

appserver/admingui/common/pom.xml

@@ -47,7 +47,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>console-common</artifactId>
     <packaging>glassfish-jar</packaging>

appserver/admingui/concurrent-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>console-concurrent-plugin-l10n</artifactId>
 

appserver/admingui/concurrent/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>console-concurrent-plugin</artifactId>
     <packaging>glassfish-jar</packaging>

appserver/admingui/corba-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>console-corba-plugin-l10n</artifactId>
 

appserver/admingui/corba/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>console-corba-plugin</artifactId>
     <packaging>glassfish-jar</packaging>

appserver/admingui/core-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>console-core-l10n</artifactId>
 

appserver/admingui/core/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>console-core</artifactId>
     <packaging>glassfish-jar</packaging>

appserver/admingui/dataprovider/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>dataprovider</artifactId>
     <name>DataProvider</name>

appserver/admingui/devtests/pom.xml

@@ -49,7 +49,7 @@
     <parent>
         <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>7.2026.2-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>console-devtests</artifactId>