[WFLY-19629] set bootableJarName in bootable-jar profile

wildfly · Aug 16, 2024 · b6a10f7 · b6a10f7
1 parent 5270502
commit b6a10f7
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 10 deletions.
diff --git 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
@@ -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.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                           <add-ons>...</add-ons>
                       </configuration>
                       <executions>

diff --git 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.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                           <add-ons>...</add-ons>
                       </configuration>
                       <executions>

diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml
@@ -186,6 +186,7 @@
                             application is deployed in the root web context.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                       </configuration>
                       <executions>
                           <execution>

diff --git 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.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                           <add-ons>...</add-ons>
                       </configuration>
                       <executions>

diff --git 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.
                             -->
-                            <name>ROOT.war</name>
+                            <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                         </configuration>
                         <executions>
                             <execution>

diff --git 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.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                           <add-ons>...</add-ons>
                       </configuration>
                       <executions>

diff --git 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.
                             -->
-                            <name>ROOT.war</name>
+                            <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                         </configuration>
                         <executions>
                             <execution>

diff --git 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.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                           <add-ons>...</add-ons>
                       </configuration>
                       <executions>

diff --git a/microprofile-jwt/pom.xml b/microprofile-jwt/pom.xml
@@ -246,6 +246,7 @@
                             application is deployed in the root web context.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                       </configuration>
                       <executions>
                           <execution>

diff --git 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.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                           <add-ons>...</add-ons>
                       </configuration>
                       <executions>

diff --git 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.
                             -->
-                            <name>ROOT.war</name>
+                            <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                         </configuration>
                         <executions>
                             <execution>

diff --git 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.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                           <add-ons>...</add-ons>
                       </configuration>
                       <executions>

diff --git 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.
                             -->
-                            <name>ROOT.war</name>
+                            <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                         </configuration>
                         <executions>
                           <execution>

diff --git 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.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                           <add-ons>...</add-ons>
                       </configuration>
                       <executions>

diff --git 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.
                             -->
-                            <name>ROOT.war</name>
+                            <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                         </configuration>
                         <executions>
                             <execution>

diff --git 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.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                           <add-ons>...</add-ons>
                       </configuration>
                       <executions>

diff --git 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.
                             -->
-                            <name>ROOT.war</name>
+                            <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                         </configuration>
                         <executions>
                             <execution>

diff --git 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.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                           <add-ons>...</add-ons>
                       </configuration>
                       <executions>

diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml
@@ -220,7 +220,7 @@
                             </discover-provisioning-info>
                             <bootable-jar>true</bootable-jar>
                             <!-- deploys the quickstart on root web context -->
-                            <name>ROOT.war</name>
+                            <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                             <packaging-scripts>
                                 <packaging-script>
                                     <scripts>

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
@@ -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.
                           -->
                           <name>ROOT.war</name>
+                          <bootableJarName>${project.artifactId}-bootable.jar</bootableJarName>
                           <add-ons>...</add-ons>
                       </configuration>
                       <executions>

diff --git 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}`.