Merge pull request #16478 from bstansberry/WFLY-17553

[WFLY-17553] Remove the 'jakarta' maven resource plugin filtering of …
wildfly · Jan 24, 2023 · 8b5a266 · 8b5a266
2 parents 239a157 + 4b89657
commit 8b5a266
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 181 deletions.
diff --git a/...e-pack/common/src/main/resources/modules/system/layers/base/javax/orb/api/main/module.xml b/...e-pack/common/src/main/resources/modules/system/layers/base/javax/orb/api/main/module.xml
@@ -23,7 +23,7 @@
   -->
 <module xmlns="urn:jboss:module:1.5" name="javax.orb.api">
     <resources>
-        <artifact name="\${org.jboss.openjdk-orb:openjdk-orb@module.jakarta.suffix@}"/>
+        <artifact name="${org.jboss.openjdk-orb:openjdk-orb-jakarta}"/>
     </resources>
 
     <dependencies>

diff --git a/...src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/main/module.xml b/...src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/main/module.xml
@@ -32,9 +32,9 @@
         <artifact name="${org.apache.activemq:artemis-dto}"/>
         <artifact name="${org.apache.activemq:artemis-hqclient-protocol}"/>
         <artifact name="${org.apache.activemq:artemis-jdbc-store}"/>
-        <artifact name="\${org.apache.activemq:artemis-@module.jms.suffix@-client}"/>
-        <artifact name="\${org.apache.activemq:artemis-@module.jms.suffix@-server}"/>
-        <artifact name="\${org.apache.activemq:artemis@module.jakarta.suffix@-service-extensions}"/>
+        <artifact name="${org.apache.activemq:artemis-jakarta-client}"/>
+        <artifact name="${org.apache.activemq:artemis-jakarta-server}"/>
+        <artifact name="${org.apache.activemq:artemis-jakarta-service-extensions}"/>
     </resources>
 
     <dependencies>

diff --git a/.../main/resources/modules/system/layers/base/org/apache/activemq/artemis/ra/main/module.xml b/.../main/resources/modules/system/layers/base/org/apache/activemq/artemis/ra/main/module.xml
@@ -29,7 +29,7 @@
     </properties>
 
     <resources>
-        <artifact name="\${org.apache.activemq:artemis@module.jakarta.suffix@-ra}"/>
+        <artifact name="${org.apache.activemq:artemis-jakarta-ra}"/>
     </resources>
 
     <dependencies>

diff --git a/...k/common/src/main/resources/modules/system/layers/base/org/hornetq/client/main/module.xml b/...k/common/src/main/resources/modules/system/layers/base/org/hornetq/client/main/module.xml
@@ -31,7 +31,7 @@
     <resources>
         <artifact name="${org.hornetq:hornetq-commons}"/>
         <artifact name="${org.hornetq:hornetq-core-client}"/>
-        <artifact name="\${org.hornetq:hornetq-@module.jms.suffix@-client}"/>
+        <artifact name="${org.hornetq:hornetq-jakarta-client}"/>
     </resources>
 
     <dependencies>

diff --git a/...rc/main/resources/modules/system/layers/base/org/infinispan/client/hotrod/main/module.xml b/...rc/main/resources/modules/system/layers/base/org/infinispan/client/hotrod/main/module.xml
@@ -23,7 +23,7 @@
 <module xmlns="urn:jboss:module:1.9" name="org.infinispan.client.hotrod">
 
     <resources>
-        <artifact name="\${org.infinispan:infinispan-client-hotrod@module.jakarta.suffix@}"/>
+        <artifact name="${org.infinispan:infinispan-client-hotrod-jakarta}"/>
     </resources>
 
     <dependencies>

diff --git a/...mmon/src/main/resources/modules/system/layers/base/org/infinispan/commons/main/module.xml b/...mmon/src/main/resources/modules/system/layers/base/org/infinispan/commons/main/module.xml
@@ -23,7 +23,7 @@
 <module xmlns="urn:jboss:module:1.9" name="org.infinispan.commons">
 
     <resources>
-        <artifact name="\${org.infinispan:infinispan-commons@module.jakarta.suffix@}"/>
+        <artifact name="${org.infinispan:infinispan-commons-jakarta}"/>
     </resources>
 
     <dependencies>

diff --git a/...-pack/common/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml b/...-pack/common/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml
@@ -23,7 +23,7 @@
 <module xmlns="urn:jboss:module:1.9" name="org.infinispan">
 
     <resources>
-        <artifact name="\${org.infinispan:infinispan-core@module.jakarta.suffix@}"/>
+        <artifact name="${org.infinispan:infinispan-core-jakarta}"/>
     </resources>
 
     <dependencies>

diff --git a/...main/resources/modules/system/layers/base/org/infinispan/persistence/jdbc/main/module.xml b/...main/resources/modules/system/layers/base/org/infinispan/persistence/jdbc/main/module.xml
@@ -27,8 +27,8 @@
     </properties>
 
     <resources>
-        <artifact name="\${org.infinispan:infinispan-cachestore-jdbc-common@module.jakarta.suffix@}"/>
-        <artifact name="\${org.infinispan:infinispan-cachestore-jdbc@module.jakarta.suffix@}"/>
+        <artifact name="${org.infinispan:infinispan-cachestore-jdbc-common-jakarta}"/>
+        <artifact name="${org.infinispan:infinispan-cachestore-jdbc-jakarta}"/>
     </resources>
 
     <dependencies>

diff --git a/...ommon/src/main/resources/modules/system/layers/base/org/jboss/iiop-client/main/module.xml b/...ommon/src/main/resources/modules/system/layers/base/org/jboss/iiop-client/main/module.xml
@@ -27,7 +27,7 @@
     </properties>
 
     <resources>
-        <artifact name="\${org.jboss:jboss-iiop-client@module.jakarta.suffix@}"/>
+        <artifact name="${org.jboss:jboss-iiop-client-jakarta}"/>
     </resources>
 
     <dependencies>

diff --git a/...n/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/api/main/module.xml b/...n/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/api/main/module.xml
@@ -28,9 +28,9 @@
     </properties>
 
     <resources>
-        <artifact name="\${org.jboss.ironjacamar:ironjacamar-common-api@module.jakarta.suffix@}"/>
-        <artifact name="\${org.jboss.ironjacamar:ironjacamar-common-spi@module.jakarta.suffix@}"/>
-        <artifact name="\${org.jboss.ironjacamar:ironjacamar-core-api@module.jakarta.suffix@}"/>
+        <artifact name="${org.jboss.ironjacamar:ironjacamar-common-api-jakarta}"/>
+        <artifact name="${org.jboss.ironjacamar:ironjacamar-common-spi-jakarta}"/>
+        <artifact name="${org.jboss.ironjacamar:ironjacamar-core-api-jakarta}"/>
     </resources>
 
     <dependencies>

diff --git a/.../src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/impl/main/module.xml b/.../src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/impl/main/module.xml
@@ -29,10 +29,10 @@
     </properties>
 
     <resources>
-        <artifact name="\${org.jboss.ironjacamar:ironjacamar-common-impl@module.jakarta.suffix@}"/>
-        <artifact name="\${org.jboss.ironjacamar:ironjacamar-core-impl@module.jakarta.suffix@}"/>
-        <artifact name="\${org.jboss.ironjacamar:ironjacamar-deployers-common@module.jakarta.suffix@}"/>
-        <artifact name="\${org.jboss.ironjacamar:ironjacamar-validator@module.jakarta.suffix@}"/>
+        <artifact name="${org.jboss.ironjacamar:ironjacamar-common-impl-jakarta}"/>
+        <artifact name="${org.jboss.ironjacamar:ironjacamar-core-impl-jakarta}"/>
+        <artifact name="${org.jboss.ironjacamar:ironjacamar-deployers-common-jakarta}"/>
+        <artifact name="${org.jboss.ironjacamar:ironjacamar-validator-jakarta}"/>
     </resources>
 
     <dependencies>

diff --git a/...n/resources/modules/system/layers/base/org/jboss/ironjacamar/jdbcadapters/main/module.xml b/...n/resources/modules/system/layers/base/org/jboss/ironjacamar/jdbcadapters/main/module.xml
@@ -29,7 +29,7 @@
     </properties>
 
     <resources>
-        <artifact name="\${org.jboss.ironjacamar:ironjacamar-jdbc@module.jakarta.suffix@}"/>
+        <artifact name="${org.jboss.ironjacamar:ironjacamar-jdbc-jakarta}"/>
     </resources>
 
     <dependencies>

diff --git a/...main/resources/modules/system/layers/base/org/jboss/jboss-transaction-spi/main/module.xml b/...main/resources/modules/system/layers/base/org/jboss/jboss-transaction-spi/main/module.xml
@@ -28,7 +28,7 @@
     </properties>
 
     <resources>
-        <artifact name="\${org.jboss:jboss-transaction-spi@module.jakarta.suffix@}"/>
+        <artifact name="${org.jboss:jboss-transaction-spi-jakarta}"/>
     </resources>
 
     <dependencies>

diff --git a/...mmon/src/main/resources/modules/system/layers/base/org/jboss/metadata/ejb/main/module.xml b/...mmon/src/main/resources/modules/system/layers/base/org/jboss/metadata/ejb/main/module.xml
@@ -28,7 +28,7 @@
     </properties>
 
     <resources>
-        <artifact name="\${org.jboss.metadata:jboss-metadata-ejb@module.jakarta.suffix@}"/>
+        <artifact name="${org.jboss.metadata:jboss-metadata-ejb-jakarta}"/>
     </resources>
 
     <dependencies>

diff --git a/...urces/modules/system/layers/base/org/wildfly/extension/messaging-activemq/main/module.xml b/...urces/modules/system/layers/base/org/wildfly/extension/messaging-activemq/main/module.xml
@@ -30,7 +30,7 @@
 
     <resources>
         <artifact name="${org.wildfly:wildfly-messaging-activemq-subsystem}"/>
-        <artifact name="\${org.jboss.activemq.artemis.integration:artemis-wildfly@module.jakarta.suffix@-integration}"/>
+        <artifact name="${org.jboss.activemq.artemis.integration:artemis-wildfly-jakarta-integration}"/>
         <resource-root path="META-INF"/>
     </resources>
 

diff --git a/ee-feature-pack/galleon-feature-pack/pom.xml b/ee-feature-pack/galleon-feature-pack/pom.xml
@@ -124,16 +124,6 @@
                             <resources>
                                 <resource>
                                     <directory>${basedir}/target/unpacked-wildfly-core-galleon-resources</directory>
-                                    <excludes>
-                                        <exclude>modules/**/module.xml</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>${basedir}/target/unpacked-wildfly-core-galleon-resources</directory>
-                                    <includes>
-                                        <include>modules/**/module.xml</include>
-                                    </includes>
-                                    <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <overwrite>true</overwrite>
@@ -150,18 +140,6 @@
                             <resources>
                                 <resource>
                                     <directory>${oidc.galleon.common.resources.directory}</directory>
-                                    <excludes>
-                                        <exclude>modules/**/module.xml</exclude>
-                                        <exclude>license/*.xml</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>${oidc.galleon.common.resources.directory}</directory>
-                                    <includes>
-                                        <include>modules/**/module.xml</include>
-                                        <include>license/*.xml</include>
-                                    </includes>
-                                    <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <overwrite>true</overwrite>
@@ -179,18 +157,6 @@
                             <resources>
                                 <resource>
                                     <directory>${servlet.common.resources.directory}</directory>
-                                    <excludes>
-                                        <exclude>modules/**/module.xml</exclude>
-                                        <exclude>license/*.xml</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>${servlet.common.resources.directory}</directory>
-                                    <includes>
-                                        <include>modules/**/module.xml</include>
-                                        <include>license/*.xml</include>
-                                    </includes>
-                                    <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <overwrite>true</overwrite>
@@ -240,18 +206,6 @@
                             <resources>
                                 <resource>
                                     <directory>${common.resources.directory}</directory>
-                                    <excludes>
-                                        <exclude>modules/**/module.xml</exclude>
-                                        <exclude>license/*.xml</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>${common.resources.directory}</directory>
-                                    <includes>
-                                        <include>modules/**/module.xml</include>
-                                        <include>license/*.xml</include>
-                                    </includes>
-                                    <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <overwrite>true</overwrite>

diff --git a/galleon-pack/galleon-feature-pack/pom.xml b/galleon-pack/galleon-feature-pack/pom.xml
@@ -83,18 +83,6 @@
                             <resources>
                                 <resource>
                                     <directory>${mp.galleon.common.resources.directory}</directory>
-                                    <excludes>
-                                        <exclude>modules/**/module.xml</exclude>
-                                        <exclude>license/*.xml</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>${mp.galleon.common.resources.directory}</directory>
-                                    <includes>
-                                        <include>modules/**/module.xml</include>
-                                        <include>license/*.xml</include>
-                                    </includes>
-                                    <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <overwrite>true</overwrite>

diff --git a/pom.xml b/pom.xml
@@ -262,21 +262,6 @@
              still being easily disabled in profiles where it is not wanted. -->
         <surefire.default-test.phase>test</surefire.default-test.phase>
 
-        <!-- WildFly Preview vs standard WildFly GAV expression properties.
-             Used to drive maven-resource-plugin filtering for module.xml files
-             where WildFly Preview and standard WildFly use different artifacts but
-             otherwise identical module.xml files. The expression encapsulates the part
-             of a groupId/artifactId/classifier that differs in the two dists.
-             Values here are the ones used by standard WildFly; WildFly Preview child
-             modules will override. Often the standard value will be an empty string
-             and WildFly Preview will change it to additional text a project uses to
-             identify its jakarta.* namespace artifacts.
-             -->
-        <!-- TODO clean this out, as these strings no longer differ between WF and WFP -->
-        <module.jakarta.classifier>::jakarta</module.jakarta.classifier>
-        <module.jakarta.suffix>-jakarta</module.jakarta.suffix>
-        <module.jms.suffix>jakarta</module.jms.suffix>
-
         <!-- Base wildfly version used by testsuite/galleon/update test to install a server that gets updated to the SNAPSHOT version -->
         <wildfly.test.galleon.update.base.version>26.1.1.Final</wildfly.test.galleon.update.base.version>