From b6a10f74707aea095a68c1effef949676d969976 Mon Sep 17 00:00:00 2001 From: Krystof Stekovic Date: Fri, 9 Aug 2024 14:45:20 +0200 Subject: [PATCH] [WFLY-19629] set bootableJarName in bootable-jar profile --- .github/workflows/quickstart_ci.yml | 4 ++-- micrometer/README.adoc | 1 + microprofile-config/README.adoc | 1 + microprofile-config/pom.xml | 1 + microprofile-fault-tolerance/README.adoc | 1 + microprofile-fault-tolerance/pom.xml | 2 +- microprofile-health/README.adoc | 1 + microprofile-health/pom.xml | 2 +- microprofile-jwt/README.adoc | 1 + microprofile-jwt/pom.xml | 1 + microprofile-lra/README.adoc | 1 + microprofile-lra/pom.xml | 2 +- microprofile-openapi/README.adoc | 1 + microprofile-openapi/pom.xml | 2 +- microprofile-reactive-messaging-kafka/README.adoc | 1 + microprofile-reactive-messaging-kafka/pom.xml | 2 +- microprofile-rest-client/README.adoc | 1 + microprofile-rest-client/pom.xml | 2 +- opentelemetry-tracing/README.adoc | 1 + opentelemetry-tracing/pom.xml | 2 +- .../build-and-run-the-quickstart-with-bootable-jar.adoc | 1 + shared-doc/run-integration-tests-with-bootable-jar.adoc | 2 +- 22 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml index f5553ac4a7..f3b12a1dfa 100644 --- a/.github/workflows/quickstart_ci.yml +++ b/.github/workflows/quickstart_ci.yml @@ -134,7 +134,7 @@ jobs: echo "Building bootable jar..." mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pbootable-jar 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 -Dbootable-jar-name=${{ inputs.QUICKSTART_PATH }}-bootable.jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} echo "Testing bootable jar..." mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing echo "Shutting down bootable jar..." @@ -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 -Dbootable-jar-name=${{ inputs.QUICKSTART_PATH }}-bootable.jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} 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/README.adoc b/micrometer/README.adoc index 8586cfb201..7df6410741 100644 --- a/micrometer/README.adoc +++ b/micrometer/README.adoc @@ -1204,6 +1204,7 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar ... diff --git a/microprofile-config/README.adoc b/microprofile-config/README.adoc index 9f1a917b78..dffdded6bd 100644 --- a/microprofile-config/README.adoc +++ b/microprofile-config/README.adoc @@ -1393,6 +1393,7 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar ... diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml index eaaf82e1b1..31e56e321f 100644 --- a/microprofile-config/pom.xml +++ b/microprofile-config/pom.xml @@ -186,6 +186,7 @@ application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar diff --git a/microprofile-fault-tolerance/README.adoc b/microprofile-fault-tolerance/README.adoc index 4ae03e25f4..9885c123ce 100644 --- a/microprofile-fault-tolerance/README.adoc +++ b/microprofile-fault-tolerance/README.adoc @@ -1224,6 +1224,7 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar ... diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml index f362cd3ed1..623520236d 100644 --- a/microprofile-fault-tolerance/pom.xml +++ b/microprofile-fault-tolerance/pom.xml @@ -229,7 +229,7 @@ Rename the output war to ROOT.war before adding it to the server, so that the application is deployed in the root web context. --> - ROOT.war + ${project.artifactId}-bootable.jar diff --git a/microprofile-health/README.adoc b/microprofile-health/README.adoc index f742a3d37f..c25928f319 100644 --- a/microprofile-health/README.adoc +++ b/microprofile-health/README.adoc @@ -1073,6 +1073,7 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar ... diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml index 7fa3ab0ff6..f41c75691f 100644 --- a/microprofile-health/pom.xml +++ b/microprofile-health/pom.xml @@ -189,7 +189,7 @@ Rename the output war to ROOT.war before adding it to the server, so that the application is deployed in the root web context. --> - ROOT.war + ${project.artifactId}-bootable.jar diff --git a/microprofile-jwt/README.adoc b/microprofile-jwt/README.adoc index 110657d19f..be2e290a19 100644 --- a/microprofile-jwt/README.adoc +++ b/microprofile-jwt/README.adoc @@ -1155,6 +1155,7 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar ... diff --git a/microprofile-jwt/pom.xml b/microprofile-jwt/pom.xml index aba1f46c61..357e824166 100644 --- a/microprofile-jwt/pom.xml +++ b/microprofile-jwt/pom.xml @@ -246,6 +246,7 @@ application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar diff --git a/microprofile-lra/README.adoc b/microprofile-lra/README.adoc index 68ad9899b6..ed30de26e8 100644 --- a/microprofile-lra/README.adoc +++ b/microprofile-lra/README.adoc @@ -883,6 +883,7 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar ... diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml index b5d125bde1..618e304a97 100644 --- a/microprofile-lra/pom.xml +++ b/microprofile-lra/pom.xml @@ -190,7 +190,7 @@ Rename the output war to ROOT.war before adding it to the server, so that the application is deployed in the root web context. --> - ROOT.war + ${project.artifactId}-bootable.jar diff --git a/microprofile-openapi/README.adoc b/microprofile-openapi/README.adoc index 4aefcc818b..c4a75be8af 100644 --- a/microprofile-openapi/README.adoc +++ b/microprofile-openapi/README.adoc @@ -670,6 +670,7 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar ... diff --git a/microprofile-openapi/pom.xml b/microprofile-openapi/pom.xml index 55757b5229..7a2e2e8353 100644 --- a/microprofile-openapi/pom.xml +++ b/microprofile-openapi/pom.xml @@ -156,7 +156,7 @@ Rename the output war to ROOT.war before adding it to the server, so that the application is deployed in the root web context. --> - ROOT.war + ${project.artifactId}-bootable.jar diff --git a/microprofile-reactive-messaging-kafka/README.adoc b/microprofile-reactive-messaging-kafka/README.adoc index de9631207a..a198e1a069 100644 --- a/microprofile-reactive-messaging-kafka/README.adoc +++ b/microprofile-reactive-messaging-kafka/README.adoc @@ -1587,6 +1587,7 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar ... diff --git a/microprofile-reactive-messaging-kafka/pom.xml b/microprofile-reactive-messaging-kafka/pom.xml index 105dab870d..8665081470 100644 --- a/microprofile-reactive-messaging-kafka/pom.xml +++ b/microprofile-reactive-messaging-kafka/pom.xml @@ -281,7 +281,7 @@ Rename the output war to ROOT.war before adding it to the server, so that the application is deployed in the root web context. --> - ROOT.war + ${project.artifactId}-bootable.jar diff --git a/microprofile-rest-client/README.adoc b/microprofile-rest-client/README.adoc index 26ff20a4cb..113c9f792d 100644 --- a/microprofile-rest-client/README.adoc +++ b/microprofile-rest-client/README.adoc @@ -703,6 +703,7 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar ... diff --git a/microprofile-rest-client/pom.xml b/microprofile-rest-client/pom.xml index e47f64c96a..074cbec5d6 100644 --- a/microprofile-rest-client/pom.xml +++ b/microprofile-rest-client/pom.xml @@ -209,7 +209,7 @@ Rename the output war to ROOT.war before adding it to the server, so that the application is deployed in the root web context. --> - ROOT.war + ${project.artifactId}-bootable.jar diff --git a/opentelemetry-tracing/README.adoc b/opentelemetry-tracing/README.adoc index 7eed7716b4..c290a4c46b 100644 --- a/opentelemetry-tracing/README.adoc +++ b/opentelemetry-tracing/README.adoc @@ -1224,6 +1224,7 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar ... diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml index ff93423aa3..8496886304 100644 --- a/opentelemetry-tracing/pom.xml +++ b/opentelemetry-tracing/pom.xml @@ -220,7 +220,7 @@ true - ROOT.war + ${project.artifactId}-bootable.jar diff --git a/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc b/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc index 1ac1fc6c5d..642de55fd5 100644 --- a/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc +++ b/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc @@ -24,6 +24,7 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic application is deployed in the root web context. --> ROOT.war + ${project.artifactId}-bootable.jar ... diff --git a/shared-doc/run-integration-tests-with-bootable-jar.adoc b/shared-doc/run-integration-tests-with-bootable-jar.adoc index 7342e728a3..adb7b8079f 100644 --- a/shared-doc/run-integration-tests-with-bootable-jar.adoc +++ b/shared-doc/run-integration-tests-with-bootable-jar.adoc @@ -19,7 +19,7 @@ $ mvn clean package -Pbootable-jar + [source,subs="attributes+",options="nowrap"] ---- -$ mvn wildfly:start-jar +$ mvn wildfly:start-jar -Dbootable-jar-name={artifactId}-bootable.jar ---- . Type the following command to run the `verify` goal with the `integration-testing` profile activated, and specifying the quickstart's URL using the `server.host` system property, which for a bootable jar by default is `{server_provisioning_server_host}`.