[WFLY-19464] Aligns user BOMs with WildFly distributions

wildfly · Sep 24, 2024 · 90a56d0 · 90a56d0
1 parent 7c6915c
commit 90a56d0
Show file tree

Hide file tree

Showing 23 changed files with 107 additions and 78 deletions.
diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml
@@ -227,11 +227,11 @@ jobs:
             ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
           fi
           echo "Starting provisioned server..."
-          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -DjbossHome=${{ inputs.DEPLOYMENT_DIR }}/target/server -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }}
+          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -DjbossHome=${{ inputs.DEPLOYMENT_DIR }}/target/server -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Testing provisioned server..."
-          mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing
+          mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Shutting down provisioned server..."
-          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown
+          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
         shell: bash
       - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with bootable-jar profile, and built Server version
         if: ${{ inputs.TEST_BOOTABLE_JAR }}
@@ -241,11 +241,11 @@ jobs:
           echo "Building bootable jar..."
           mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Starting bootable jar..."
-          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }}
+          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Testing bootable jar..."
-          mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing
+          mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Shutting down bootable jar..."
-          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown
+          mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
         shell: bash
       - name: Build ${{ inputs.QUICKSTART_PATH }} Quickstart with openshift profile, and built Server version
         if: ${{ inputs.TEST_OPENSHIFT }}

diff --git a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml
@@ -184,7 +184,7 @@ jobs:
           cd ${{ env.QUICKSTART_PATH }}/client
           echo "Building 'client' provisioned server..."
           mvn -fae clean package -Pprovisioned-server -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
-          mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}}
+          mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           cd ../server
           echo "Building 'server' provisioned server..."
           mvn -fae clean package -Pprovisioned-server -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
@@ -196,20 +196,20 @@ jobs:
           ./target/server2/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
           ./target/server3/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
           echo "Starting provisioned server..."
-          mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server2 -Dwildfly.port=10090 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}}
-          mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server3 -Dwildfly.port=10190 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}}
+          mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server2 -Dwildfly.port=10090 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
+          mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server3 -Dwildfly.port=10190 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Testing provisioned server..."
           cd ../client
-          mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8080/client -Pintegration-testing
+          mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8080/client -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           cd ../server
-          mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180/server -Pintegration-testing
-          mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280/server -Pintegration-testing
+          mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180/server -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
+          mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280/server -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Shutting down provisioned server..."
           cd ../client
-          mvn wildfly:shutdown
+          mvn wildfly:shutdown -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           cd ../server
-          mvn wildfly:shutdown -Dwildfly.port=10090
-          mvn wildfly:shutdown -Dwildfly.port=10190
+          mvn wildfly:shutdown -Dwildfly.port=10090 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
+          mvn wildfly:shutdown -Dwildfly.port=10190 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
         shell: bash
       - name: Build ${{ env.QUICKSTART_PATH }} Quickstart with openshift profile, and built Server version
         if: ${{ env.TEST_OPENSHIFT }}

diff --git a/helloworld-mutual-ssl-secured/pom.xml b/helloworld-mutual-ssl-secured/pom.xml
@@ -101,7 +101,12 @@
             <artifactId>httpclient</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <!-- the server uses this instead of commons-logging, to be fully compatible we need to add this dependency whenever commons-logging is needed -->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/helloworld-mutual-ssl/pom.xml b/helloworld-mutual-ssl/pom.xml
@@ -102,6 +102,12 @@
             <artifactId>httpclient</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- the server uses this instead of commons-logging, to be fully compatible we need to add this dependency whenever commons-logging is needed -->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml
@@ -128,6 +128,12 @@
             <artifactId>parsson</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- the server uses this instead of commons-logging, to be fully compatible we need to add this dependency whenever commons-logging is needed -->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml
@@ -130,6 +130,12 @@
             <artifactId>parsson</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- the server uses this instead of commons-logging, to be fully compatible we need to add this dependency whenever commons-logging is needed -->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/logging/pom.xml b/logging/pom.xml
@@ -134,6 +134,12 @@
             <artifactId>parsson</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- the server uses this instead of commons-logging, to be fully compatible we need to add this dependency whenever commons-logging is needed -->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/micrometer/pom.xml b/micrometer/pom.xml
@@ -25,7 +25,7 @@
         <version.server>33.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.bom.microprofile>${version.server}</version.bom.microprofile>
+        <version.bom.expansion>${version.server}</version.bom.expansion>
         <version.plugin.wildfly>5.0.0.Final</version.plugin.wildfly>
     </properties>
 
@@ -42,8 +42,8 @@
             <!-- Import micrometer dependency information -->
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
-                <artifactId>wildfly-microprofile</artifactId>
-                <version>${version.bom.microprofile}</version>
+                <artifactId>wildfly-expansion</artifactId>
+                <version>${version.bom.expansion}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/microprofile-config/README-source.adoc b/microprofile-config/README-source.adoc
@@ -78,11 +78,11 @@ The first thing to do is to setup our dependencies. Add the following section to
 ----
 <dependencyManagement>
   <dependencies>
-    <!-- importing the microprofile BOM adds MicroProfile specs -->
+    <!-- importing the Expansion BOM adds MicroProfile specs -->
     <dependency>
         <groupId>org.wildfly.bom</groupId>
-        <artifactId>wildfly-microprofile</artifactId>
-        <version>{versionMicroprofileBom}</version>
+        <artifactId>wildfly-expansion</artifactId>
+        <version>{versionExpansionBom}</version>
         <type>pom</type>
         <scope>import</scope>
     </dependency>

diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml
@@ -23,17 +23,17 @@
         <version.server>33.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.bom.microprofile>${version.server}</version.bom.microprofile>
+        <version.bom.expansion>${version.server}</version.bom.expansion>
         <version.plugin.wildfly>5.0.0.Final</version.plugin.wildfly>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-            <!-- importing the microprofile BOM adds MicroProfile specs -->
+            <!-- importing the Expansion BOM adds MicroProfile specs -->
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
-                <artifactId>wildfly-microprofile</artifactId>
-                <version>${version.bom.microprofile}</version>
+                <artifactId>wildfly-expansion</artifactId>
+                <version>${version.bom.expansion}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -106,7 +106,7 @@
                 <configuration>
                     <!-- adds versions properties as attributes for substitutions in README.adoc source blocks -->
                     <attributes>
-                        <versionMicroprofileBom>${version.bom.microprofile}</versionMicroprofileBom>
+                        <versionExpansionBom>${version.bom.expansion}</versionExpansionBom>
                     </attributes>
                 </configuration>
             </plugin>

diff --git a/microprofile-fault-tolerance/README-source.adoc b/microprofile-fault-tolerance/README-source.adoc
@@ -78,7 +78,7 @@ Add the following properties to the `pom.xml`:
 
 [source,options="nowrap",subs="attributes+"]
 ----
-<version.bom.microprofile>{versionMicroprofileBom}</version.bom.microprofile>
+<version.bom.expansion>{versionExpansionBom}</version.bom.expansion>
 <version.bom.ee>{versionServerBom}</version.bom.ee>
 ----
 
@@ -104,11 +104,11 @@ Before the dependencies are defined add the following boms:
             <type>pom</type>
             <scope>import</scope>
         </dependency>
-        <!-- importing the microprofile BOM adds MicroProfile specs -->
+        <!-- importing the Expansion BOM adds MicroProfile specs -->
         <dependency>
             <groupId>org.wildfly.bom</groupId>
-            <artifactId>wildfly-microprofile</artifactId>
-            <version>{versionMicroprofileBom}</version>
+            <artifactId>wildfly-expansion</artifactId>
+            <version>{versionExpansionBom}</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml
@@ -56,19 +56,19 @@
         <version.server>33.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.bom.microprofile>${version.server}</version.bom.microprofile>
+        <version.bom.expansion>${version.server}</version.bom.expansion>
         <version.plugin.wildfly>5.0.0.Final</version.plugin.wildfly>
         <!-- The versions for other dependencies and plugin -->
         <version.io.rest-assured>4.3.1</version.io.rest-assured>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-            <!-- importing the microprofile BOM adds MicroProfile specs -->
+            <!-- importing the Expansion BOM adds MicroProfile specs -->
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
-                <artifactId>wildfly-microprofile</artifactId>
-                <version>${version.bom.microprofile}</version>
+                <artifactId>wildfly-expansion</artifactId>
+                <version>${version.bom.expansion}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -149,7 +149,7 @@
                         <!-- adds versions properties as attributes for substitutions in README.adoc source blocks -->
                         <attributes>
                             <versionServerBom>${version.bom.ee}</versionServerBom>
-                            <versionMicroprofileBom>${version.bom.microprofile}</versionMicroprofileBom>
+                            <versionExpansionBom>${version.bom.expansion}</versionExpansionBom>
                         </attributes>
                     </configuration>
                 </plugin>

diff --git a/microprofile-health/README-source.adoc b/microprofile-health/README-source.adoc
@@ -130,11 +130,11 @@ Next we need to setup our dependencies. Add the following section to your
 ----
 <dependencyManagement>
   <dependencies>
-    <!-- importing the microprofile BOM adds MicroProfile specs -->
+    <!-- importing the Expansion BOM adds MicroProfile specs -->
     <dependency>
       <groupId>org.wildfly.bom</groupId>
-      <artifactId>wildfly-microprofile</artifactId>
-      <version>{versionMicroprofileBom}</version>
+      <artifactId>wildfly-expansion</artifactId>
+      <version>{versionExpansionBom}</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>

diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml
@@ -22,13 +22,13 @@
         <version.server>33.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.bom.microprofile>${version.server}</version.bom.microprofile>
+        <version.bom.expansion>${version.server}</version.bom.expansion>
         <version.plugin.wildfly>5.0.0.Final</version.plugin.wildfly>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-            <!-- importing the microprofile BOM adds MicroProfile specs -->
+            <!-- importing the Expansion BOM adds MicroProfile specs -->
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
                 <artifactId>wildfly-ee-with-tools</artifactId>
@@ -38,8 +38,8 @@
             </dependency>
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
-                <artifactId>wildfly-microprofile</artifactId>
-                <version>${version.bom.microprofile}</version>
+                <artifactId>wildfly-expansion</artifactId>
+                <version>${version.bom.expansion}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -110,7 +110,7 @@
                 <configuration>
                     <!-- adds versions properties as attributes for substitutions in README.adoc source blocks -->
                     <attributes>
-                        <versionMicroprofileBom>${version.bom.microprofile}</versionMicroprofileBom>
+                        <versionExpansionBom>${version.bom.expansion}</versionExpansionBom>
                     </attributes>
                 </configuration>
             </plugin>

diff --git a/microprofile-jwt/README-source.adoc b/microprofile-jwt/README-source.adoc
@@ -168,7 +168,7 @@ Add the following properties to the `pom.xml`.
 ----
 <version.com.nimbusds.jose.jwt>{versionComNimbusdsJoseJwt}</version.com.nimbusds.jose.jwt>
 <version.glassfish.json>{versionGlassfishJson}</version.glassfish.json>
-<version.bom.microprofile>{versionMicroprofileBom}</version.bom.microprofile>
+<version.bom.expansion>{versionExpansionBom}</version.bom.expansion>
 <version.bom.ee>{versionServerBom}</version.bom.ee>
 ----
 
@@ -195,8 +195,8 @@ Before the dependencies are defined add the following boms.
     </dependency>
     <dependency>
       <groupId>org.wildfly.bom</groupId>
-      <artifactId>wildfly-microprofile</artifactId>
-      <version>${version.bom.microprofile}</version>
+      <artifactId>wildfly-expansion</artifactId>
+      <version>${version.bom.expansion}</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>