From 7051e6fd08817eb0ce10bfc6c1ab17904efdd6e2 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/project_ci.yml | 2 +- .github/workflows/quickstart_ci.yml | 4 ++-- micrometer/pom.xml | 6 +++--- microprofile-config/README-source.adoc | 6 +++--- microprofile-config/pom.xml | 10 +++++----- microprofile-fault-tolerance/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 +++--- 18 files changed, 65 insertions(+), 65 deletions(-) diff --git a/.github/workflows/project_ci.yml b/.github/workflows/project_ci.yml index 3594e675c2..de213c6905 100644 --- a/.github/workflows/project_ci.yml +++ b/.github/workflows/project_ci.yml @@ -76,7 +76,7 @@ jobs: - name: Build Quickstarts Release with Server and BOMs Versions run: | cd quickstarts - mvn -U -B -fae clean install -Drelease -Dversion.server.bom=${{ needs.wildfly-build.outputs.wildfly-version }} -Dversion.microprofile.bom=${{ needs.wildfly-build.outputs.wildfly-version }} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -U -B -fae clean install -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} shell: bash - uses: actions/upload-artifact@v4 if: failure() diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml index f5553ac4a7..1df07a830f 100644 --- a/.github/workflows/quickstart_ci.yml +++ b/.github/workflows/quickstart_ci.yml @@ -227,7 +227,7 @@ 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 echo "Shutting down provisioned server..." @@ -241,7 +241,7 @@ 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 echo "Shutting down bootable jar..." 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