Merge pull request #944 from emmartins/WFLY-19616

[WFLY-19616] Removes openshift profile, fixes provisioned-server prof…
wildfly · Oct 11, 2024 · bc6d75d · bc6d75d
2 parents 92028f5 + 57370cc
commit bc6d75d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 53 deletions.
diff --git a/helloworld-jms/README-source.adoc b/helloworld-jms/README-source.adoc
@@ -155,4 +155,8 @@ This script removes the `test` queue from the `messaging` subsystem in the serve
 The batch executed successfully
 ----
 
+// Build and run sections for other environments/builds
+ifndef::ProductRelease,EAPXPRelease[]
+include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
+endif::[]
 include::../shared-doc/openshift-incompatibility.adoc[leveloffset=+1]
diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml
@@ -47,6 +47,7 @@
         <version.server>34.0.0.Beta1</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
+        <version.pack.cloud>7.0.1.Final</version.pack.cloud>
         <version.plugin.wildfly>5.0.0.Final</version.plugin.wildfly>
         <version.junit-jupiter-engine>5.10.0</version.junit-jupiter-engine>
     </properties>
@@ -110,59 +111,19 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <discover-provisioning-info>
-                                <version>${version.server}</version>
-                                <add-ons>
-                                    <add-on>embedded-activemq</add-on>
-                                    <add-on>wildfly-cli</add-on>
-                                </add-ons>
-                            </discover-provisioning-info>
-                            <!--
-                                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>
-                            <packaging-scripts>
-                                <packaging-script>
-                                    <scripts>
-                                        <script>${project.build.scriptSourceDirectory}/configure-jms.cli</script>
-                                    </scripts>
-                                    <!-- Expressions resolved during server execution -->
-                                    <resolve-expressions>false</resolve-expressions>
-                                </packaging-script>
-                            </packaging-scripts>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>package</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>openshift</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.wildfly.plugins</groupId>
-                        <artifactId>wildfly-maven-plugin</artifactId>
-                        <configuration>
-                            <discover-provisioning-info>
-                                <version>${version.server}</version>
-                                <context>cloud</context>
-                                <add-ons>
-                                    <add-on>embedded-activemq</add-on>
-                                </add-ons>
-                            </discover-provisioning-info>
-                            <!--
-                                The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
-                                application is deployed in the root web context. Add ROOT.war to the server.
-                            -->
-                            <filename>ROOT.war</filename>
+                            <feature-packs>
+                                <feature-pack>
+                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
+                                </feature-pack>
+                                <feature-pack>
+                                    <location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud}</location>
+                                </feature-pack>
+                            </feature-packs>
+                            <layers>
+                                <layer>cloud-server</layer>
+                                <layer>ejb</layer>
+                                <layer>embedded-activemq</layer>
+                            </layers>
                             <packaging-scripts>
                                 <packaging-script>
                                     <scripts>
@@ -172,6 +133,7 @@
                                     <resolve-expressions>false</resolve-expressions>
                                 </packaging-script>
                             </packaging-scripts>
+                            <skipDeployment>true</skipDeployment>
                         </configuration>
                         <executions>
                             <execution>