From 90a56d0ff84fe354f897a4cd2e14c49403fceee7 Mon Sep 17 00:00:00 2001 From: Eduardo Martins Date: Tue, 24 Sep 2024 17:34:42 +0100 Subject: [PATCH] [WFLY-19464] Aligns user BOMs with WildFly distributions --- .github/workflows/quickstart_ci.yml | 12 ++++++------ .../quickstart_ejb-txn-remote-call_ci.yml | 18 +++++++++--------- helloworld-mutual-ssl-secured/pom.xml | 7 ++++++- helloworld-mutual-ssl/pom.xml | 6 ++++++ jaxrs-client/pom.xml | 6 ++++++ jaxrs-jwt/pom.xml | 6 ++++++ logging/pom.xml | 6 ++++++ micrometer/pom.xml | 6 +++--- microprofile-config/README-source.adoc | 6 +++--- microprofile-config/pom.xml | 10 +++++----- .../README-source.adoc | 8 ++++---- microprofile-fault-tolerance/pom.xml | 10 +++++----- microprofile-health/README-source.adoc | 6 +++--- microprofile-health/pom.xml | 10 +++++----- microprofile-jwt/README-source.adoc | 6 +++--- microprofile-jwt/pom.xml | 10 +++++----- microprofile-lra/README-source.adoc | 6 +++--- microprofile-lra/pom.xml | 8 ++++---- microprofile-openapi/pom.xml | 8 ++++---- .../README-source.adoc | 6 +++--- microprofile-reactive-messaging-kafka/pom.xml | 10 +++++----- microprofile-rest-client/pom.xml | 8 ++++---- opentelemetry-tracing/pom.xml | 6 +++--- 23 files changed, 107 insertions(+), 78 deletions(-) diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml index f5553ac4a7..f99012b488 100644 --- 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 index a2cadfe223..088cb3e202 100644 --- 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 index a5b0f331b5..8d82b3c665 100644 --- a/helloworld-mutual-ssl-secured/pom.xml +++ b/helloworld-mutual-ssl-secured/pom.xml @@ -101,7 +101,12 @@ httpclient test - + + + org.jboss.logging + commons-logging-jboss-logging + test + diff --git a/helloworld-mutual-ssl/pom.xml b/helloworld-mutual-ssl/pom.xml index 4a57252e57..f5a94c386c 100644 --- a/helloworld-mutual-ssl/pom.xml +++ b/helloworld-mutual-ssl/pom.xml @@ -102,6 +102,12 @@ httpclient test + + + org.jboss.logging + commons-logging-jboss-logging + test + diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index ed9def2cec..2619c0d137 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -128,6 +128,12 @@ parsson test + + + org.jboss.logging + commons-logging-jboss-logging + test + diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml index 80751f9d16..c65dab7ad0 100644 --- a/jaxrs-jwt/pom.xml +++ b/jaxrs-jwt/pom.xml @@ -130,6 +130,12 @@ parsson test + + + org.jboss.logging + commons-logging-jboss-logging + test + diff --git a/logging/pom.xml b/logging/pom.xml index 3986de2c18..27a549e4e0 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -134,6 +134,12 @@ parsson test + + + org.jboss.logging + commons-logging-jboss-logging + test + diff --git a/micrometer/pom.xml b/micrometer/pom.xml index 02570c45ef..4b8c31d4e7 100644 --- a/micrometer/pom.xml +++ b/micrometer/pom.xml @@ -25,7 +25,7 @@ 33.0.0.Final ${version.server} - ${version.server} + ${version.server} 5.0.0.Final @@ -42,8 +42,8 @@ org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import diff --git a/microprofile-config/README-source.adoc b/microprofile-config/README-source.adoc index 2bdd6aeda1..59a0fa7f8c 100644 --- 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 ---- - + org.wildfly.bom - wildfly-microprofile - {versionMicroprofileBom} + wildfly-expansion + {versionExpansionBom} pom import diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml index 61a669146f..8f7077dc54 100644 --- a/microprofile-config/pom.xml +++ b/microprofile-config/pom.xml @@ -23,17 +23,17 @@ 33.0.0.Final ${version.server} - ${version.server} + ${version.server} 5.0.0.Final - + org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import @@ -106,7 +106,7 @@ - ${version.bom.microprofile} + ${version.bom.expansion} diff --git a/microprofile-fault-tolerance/README-source.adoc b/microprofile-fault-tolerance/README-source.adoc index d512d6a705..087443ef85 100644 --- 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+"] ---- -{versionMicroprofileBom} +{versionExpansionBom} {versionServerBom} ---- @@ -104,11 +104,11 @@ Before the dependencies are defined add the following boms: pom import - + org.wildfly.bom - wildfly-microprofile - {versionMicroprofileBom} + wildfly-expansion + {versionExpansionBom} pom import diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml index d1f79c45b8..fff85eb33c 100644 --- a/microprofile-fault-tolerance/pom.xml +++ b/microprofile-fault-tolerance/pom.xml @@ -56,7 +56,7 @@ 33.0.0.Final ${version.server} - ${version.server} + ${version.server} 5.0.0.Final 4.3.1 @@ -64,11 +64,11 @@ - + org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import @@ -149,7 +149,7 @@ ${version.bom.ee} - ${version.bom.microprofile} + ${version.bom.expansion} diff --git a/microprofile-health/README-source.adoc b/microprofile-health/README-source.adoc index 7885a711f2..5a64680b2b 100644 --- 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 ---- - + org.wildfly.bom - wildfly-microprofile - {versionMicroprofileBom} + wildfly-expansion + {versionExpansionBom} pom import diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml index 48d9d00b94..3a8523c641 100644 --- a/microprofile-health/pom.xml +++ b/microprofile-health/pom.xml @@ -22,13 +22,13 @@ 33.0.0.Final ${version.server} - ${version.server} + ${version.server} 5.0.0.Final - + org.wildfly.bom wildfly-ee-with-tools @@ -38,8 +38,8 @@ org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import @@ -110,7 +110,7 @@ - ${version.bom.microprofile} + ${version.bom.expansion} diff --git a/microprofile-jwt/README-source.adoc b/microprofile-jwt/README-source.adoc index de33d490af..d1050d7937 100644 --- a/microprofile-jwt/README-source.adoc +++ b/microprofile-jwt/README-source.adoc @@ -168,7 +168,7 @@ Add the following properties to the `pom.xml`. ---- {versionComNimbusdsJoseJwt} {versionGlassfishJson} -{versionMicroprofileBom} +{versionExpansionBom} {versionServerBom} ---- @@ -195,8 +195,8 @@ Before the dependencies are defined add the following boms. org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import diff --git a/microprofile-jwt/pom.xml b/microprofile-jwt/pom.xml index c46d858015..8075cfef3e 100644 --- a/microprofile-jwt/pom.xml +++ b/microprofile-jwt/pom.xml @@ -47,7 +47,7 @@ 33.0.0.Final ${version.server} - ${version.server} + ${version.server} 5.0.0.Final 9.24.4.redhat-00001 @@ -63,11 +63,11 @@ pom import - + org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import @@ -164,7 +164,7 @@ ${version.bom.ee} - ${version.bom.microprofile} + ${version.bom.expansion} ${version.org.glassfish.jakarta.json} ${version.com.nimbusds.jose-jwt} diff --git a/microprofile-lra/README-source.adoc b/microprofile-lra/README-source.adoc index 24fa0be8a5..97067b60b1 100644 --- a/microprofile-lra/README-source.adoc +++ b/microprofile-lra/README-source.adoc @@ -197,7 +197,7 @@ The first thing to do is to change the minimum JDK to Java 11 and set the other {versionServer} {versionBomEE} -{versionBomMicroprofile} +{versionBomMicroprofile} {versionPluginWildfly} {versionPluginWildflyJar} ---- @@ -218,8 +218,8 @@ Next we need to setup our dependencies. Add the following section to your org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml index 8ea210d32f..1abdb99070 100644 --- a/microprofile-lra/pom.xml +++ b/microprofile-lra/pom.xml @@ -22,7 +22,7 @@ 33.0.0.Final ${version.server} - ${version.server} + ${version.server} 5.0.0.Final @@ -37,8 +37,8 @@ org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import @@ -106,7 +106,7 @@ ${version.server} ${version.bom.ee} - ${version.bom.microprofile} + ${version.bom.expansion} ${version.plugin.wildfly} ${version.plugin.wildfly-jar} diff --git a/microprofile-openapi/pom.xml b/microprofile-openapi/pom.xml index 6845c50d05..ded1616b95 100644 --- a/microprofile-openapi/pom.xml +++ b/microprofile-openapi/pom.xml @@ -24,13 +24,13 @@ 33.0.0.Final ${version.server} - ${version.server} + ${version.server} 5.0.0.Final - + org.wildfly.bom wildfly-ee-with-tools @@ -40,8 +40,8 @@ org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import diff --git a/microprofile-reactive-messaging-kafka/README-source.adoc b/microprofile-reactive-messaging-kafka/README-source.adoc index 2bbabab273..2006360a46 100644 --- a/microprofile-reactive-messaging-kafka/README-source.adoc +++ b/microprofile-reactive-messaging-kafka/README-source.adoc @@ -100,11 +100,11 @@ Next set up our dependencies. Add the following section to your import - + org.wildfly.bom - wildfly-microprofile - {versionMicroprofileBom} + wildfly-expansion + {versionExpansionBom} pom import diff --git a/microprofile-reactive-messaging-kafka/pom.xml b/microprofile-reactive-messaging-kafka/pom.xml index 6428933eac..08d7cf8ee9 100644 --- a/microprofile-reactive-messaging-kafka/pom.xml +++ b/microprofile-reactive-messaging-kafka/pom.xml @@ -39,7 +39,7 @@ 33.0.0.Final ${version.server} - ${version.server} + ${version.server} 5.0.0.Final 3.0.0 @@ -48,11 +48,11 @@ - + org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import @@ -202,7 +202,7 @@ ${version.bom.ee} - ${version.bom.microprofile} + ${version.bom.expansion} diff --git a/microprofile-rest-client/pom.xml b/microprofile-rest-client/pom.xml index 4ca27d08a4..7a2a4a6f51 100644 --- a/microprofile-rest-client/pom.xml +++ b/microprofile-rest-client/pom.xml @@ -45,7 +45,7 @@ 33.0.0.Final ${version.server} - ${version.server} + ${version.server} 5.0.0.Final 6.2.6.Final @@ -62,11 +62,11 @@ - + org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml index b62fa12a0c..11890526f0 100644 --- a/opentelemetry-tracing/pom.xml +++ b/opentelemetry-tracing/pom.xml @@ -23,7 +23,7 @@ 33.0.0.Final ${version.server} - ${version.server} + ${version.server} 5.0.0.Final @@ -40,8 +40,8 @@ org.wildfly.bom - wildfly-microprofile - ${version.bom.microprofile} + wildfly-expansion + ${version.bom.expansion} pom import