Merge pull request #877 from emmartins/wfly-plugin-5.0.0.Beta3

move to WildFly Maven Plugin 5.0.0.Beta3
wildfly · Mar 1, 2024 · d02e0c7 · d02e0c7
2 parents f416edf + 011c272
commit d02e0c7
Show file tree

Hide file tree

Showing 49 changed files with 94 additions and 86 deletions.
diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
@@ -49,7 +49,7 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
 

diff --git a/bmt/pom.xml b/bmt/pom.xml
@@ -49,7 +49,7 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/cmt/pom.xml b/cmt/pom.xml
@@ -48,7 +48,7 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/ee-security/pom.xml b/ee-security/pom.xml
@@ -49,7 +49,7 @@
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/ejb-multi-server/pom.xml b/ejb-multi-server/pom.xml
@@ -50,7 +50,7 @@
         <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml
@@ -48,7 +48,7 @@
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/ejb-security-context-propagation/pom.xml b/ejb-security-context-propagation/pom.xml
@@ -48,7 +48,7 @@
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/ejb-security-programmatic-auth/pom.xml b/ejb-security-programmatic-auth/pom.xml
@@ -48,7 +48,7 @@
       <!-- The versions for BOMs, Packs and Plugins -->
       <version.bom.ee>${version.server}</version.bom.ee>
       <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-      <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+      <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
   </properties>
 
     <repositories>

diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml
@@ -55,7 +55,7 @@
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>
@@ -163,6 +163,7 @@
                 <plugin>
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
+                    <version>${version.plugin.wildfly}</version>
                     <configuration>
                         <skip>true</skip>
                     </configuration>

diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml
@@ -47,7 +47,7 @@
         <version.server>31.0.0.Final</version.server>
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml
@@ -40,7 +40,7 @@
         <version.server>31.0.0.Final</version.server>
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.plugin.wildfly>4.2.0.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
         <version.postgresql>42.7.0</version.postgresql>
         <version.wildfly-cloud-galleon-pack>5.0.2.Final</version.wildfly-cloud-galleon-pack>
         <version.wildfly-datasources-galleon-pack>6.0.0.Final</version.wildfly-datasources-galleon-pack>

diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml
@@ -41,7 +41,7 @@
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.narayana>7.0.0.Final</version.narayana>
-        <version.plugin.wildfly>4.2.0.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
         <version.wildfly-cloud-galleon-pack>5.0.2.Final</version.wildfly-cloud-galleon-pack>
         <version.wildfly-datasources-galleon-pack>6.0.0.Final</version.wildfly-datasources-galleon-pack>
     </properties>

diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml
@@ -48,7 +48,7 @@
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
         <version.junit-jupiter-engine>5.10.0</version.junit-jupiter-engine>
     </properties>
 

diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml
@@ -49,7 +49,7 @@
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>      
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
         <version.junit-jupiter-engine>5.10.0</version.junit-jupiter-engine>
     </properties>
 

diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml
@@ -49,7 +49,7 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
         <!-- the versions for test dependencies -->
         <version.org.junit.jupiter>5.9.1</version.org.junit.jupiter>
     </properties>

diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml
@@ -48,7 +48,7 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
 
     </properties>
 

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
@@ -48,7 +48,7 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/hibernate/pom.xml b/hibernate/pom.xml
@@ -50,7 +50,7 @@
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
         <version.pack.datasources>7.0.0.Final</version.pack.datasources>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
         <!-- the versions for test dependencies -->
         <version.org.junit.jupiter>5.9.1</version.org.junit.jupiter>
     </properties>

diff --git a/http-custom-mechanism/pom.xml b/http-custom-mechanism/pom.xml
@@ -54,7 +54,7 @@
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml
@@ -49,7 +49,7 @@
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
 
         <version.com.nimbusds.jose.jwt>9.37.1</version.com.nimbusds.jose.jwt>
         <version.org.junit>5.10.1</version.org.junit>

diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml
@@ -48,7 +48,7 @@
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
 
         <version.com.nimbusds.jose.jwt>9.37.1</version.com.nimbusds.jose.jwt>
         <version.org.junit>5.10.1</version.org.junit>

diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml
@@ -48,7 +48,7 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
 
     </properties>
 

diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml
@@ -47,7 +47,7 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.jaxws-tools-maven-plugin>1.3.0.Final</version.jaxws-tools-maven-plugin>
 

diff --git a/jsonp/pom.xml b/jsonp/pom.xml
@@ -48,7 +48,7 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/jts/pom.xml b/jts/pom.xml
@@ -54,7 +54,7 @@
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.server>31.0.0.Final</version.server>
         <version.bom.ee>${version.server}</version.bom.ee>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml
@@ -48,7 +48,7 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
     </properties>
 
     <repositories>

diff --git a/logging/pom.xml b/logging/pom.xml
@@ -48,7 +48,7 @@
         <!-- The versions for BOMs, Dependencies and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
 
         <version.org.junit>5.10.1</version.org.junit>
 
@@ -138,28 +138,15 @@
     </dependencies>
 
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
-                <configuration>
-                    <jboss-home>${jboss.home}</jboss-home>
-                    <feature-packs>
-                        <feature-pack>
-                            <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
-                        </feature-pack>
-                    </feature-packs>
-                    <layers>
-                        <layer>ee-core-profile-server</layer>
-                        <layer>core-tools</layer>
-                    </layers>
-                    <fail-on-error>false</fail-on-error>
-                    <scripts>
-                        <script>${project.basedir}${file.separator}configure-logging.cli</script>
-                    </scripts>
-                </configuration>
-            </plugin>
-        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.wildfly.plugins</groupId>
+                    <artifactId>wildfly-maven-plugin</artifactId>
+                    <version>${version.plugin.wildfly}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <profiles>
@@ -171,8 +158,11 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <!-- deploys the quickstart on root web context -->
-                            <name>ROOT.war</name>
+                            <feature-packs>
+                                <feature-pack>
+                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
+                                </feature-pack>
+                            </feature-packs>
                             <layers>
                                 <layer>ee-core-profile-server</layer>
                                 <layer>cloud-server</layer>
@@ -187,6 +177,8 @@
                                     <resolve-expressions>false</resolve-expressions>
                                 </packaging-script>
                             </packaging-scripts>
+                            <!-- deploys the quickstart on root web context -->
+                            <name>ROOT.war</name>
                         </configuration>
                         <executions>
                             <execution>
@@ -207,13 +199,15 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <!-- deploys the quickstart on root web context -->
-                            <name>ROOT.war</name>
+                            <feature-packs>
+                                <feature-pack>
+                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
+                                </feature-pack>
+                            </feature-packs>
                             <layers>
                                 <layer>ee-core-profile-server</layer>
                                 <layer>cloud-server</layer>
                             </layers>
-                            <!-- Used for the package goal -->
                             <packaging-scripts>
                                 <packaging-script>
                                     <scripts>
@@ -223,6 +217,7 @@
                                     <resolve-expressions>false</resolve-expressions>
                                 </packaging-script>
                             </packaging-scripts>
+                            <filename>ROOT.war</filename>
                         </configuration>
                         <executions>
                             <execution>

diff --git a/mail/pom.xml b/mail/pom.xml
@@ -49,7 +49,7 @@
         <!-- The versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
 
         <version.org.seleniumhq.selenium>4.15.0</version.org.seleniumhq.selenium>
         <version.webdrivermanager>5.7.0</version.webdrivermanager>

diff --git a/micrometer/pom.xml b/micrometer/pom.xml
@@ -26,8 +26,8 @@
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.microprofile>${version.server}</version.bom.microprofile>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
-        <version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
+        <version.plugin.wildfly-jar>11.0.0.Beta1</version.plugin.wildfly-jar>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
     </properties>
 

diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml
@@ -25,8 +25,8 @@
       <version.bom.ee>${version.server}</version.bom.ee>
       <version.bom.microprofile>${version.server}</version.bom.microprofile>
       <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-      <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
-      <version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
+      <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
+      <version.plugin.wildfly-jar>11.0.0.Beta1</version.plugin.wildfly-jar>
   </properties>
 
     <repositories>

diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml
@@ -58,8 +58,8 @@
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.microprofile>${version.server}</version.bom.microprofile>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
-        <version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
+        <version.plugin.wildfly-jar>11.0.0.Beta1</version.plugin.wildfly-jar>
         <!-- The versions for other dependencies and plugin -->
         <version.io.rest-assured>4.3.1</version.io.rest-assured>
     </properties>

diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml
@@ -24,8 +24,8 @@
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.bom.microprofile>${version.server}</version.bom.microprofile>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
-        <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
-        <version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
+        <version.plugin.wildfly>5.0.0.Beta3</version.plugin.wildfly>
+        <version.plugin.wildfly-jar>11.0.0.Beta1</version.plugin.wildfly-jar>
     </properties>
 
     <repositories>