Update the remaining artifacts to include the container descriptors

Signed-off-by: Scott M Stark <[email protected]>
jakartaee · Jun 26, 2024 · 3c9574b · 3c9574b
1 parent 145c7c7
commit 3c9574b
Show file tree

Hide file tree

Showing 23 changed files with 276 additions and 7 deletions.
diff --git a/appclient/pom.xml b/appclient/pom.xml
@@ -82,6 +82,19 @@
     </dependencies>
 
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -57,6 +57,18 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/common/pom.xml b/common/pom.xml
@@ -88,4 +88,19 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.properties</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+    </build>
 </project>
diff --git a/connector/pom.xml b/connector/pom.xml
@@ -54,6 +54,18 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/ejb/pom.xml b/ejb/pom.xml
@@ -61,6 +61,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/ejb30-ws/pom.xml b/ejb30-ws/pom.xml
@@ -47,6 +47,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/ejb30/pom.xml b/ejb30/pom.xml
@@ -105,6 +105,7 @@
     </dependencies>
 
     <build>
+        <!-- Include the container descriptors in the output artifact -->
         <resources>
             <resource>
                 <directory>src/main/java</directory>
@@ -124,11 +125,6 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
-            </plugin>
             <plugin>
                 <groupId>com.sun.xml.ws</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>

diff --git a/ejb32/pom.xml b/ejb32/pom.xml
@@ -63,6 +63,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/integration/pom.xml b/integration/pom.xml
@@ -58,6 +58,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/jacc/pom.xml b/jacc/pom.xml
@@ -63,6 +63,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/javaee/pom.xml b/javaee/pom.xml
@@ -83,6 +83,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/javamail/pom.xml b/javamail/pom.xml
@@ -55,6 +55,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/jaxws-common/pom.xml b/jaxws-common/pom.xml
@@ -50,6 +50,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/jaxws/pom.xml b/jaxws/pom.xml
@@ -59,6 +59,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/jdbc/pom.xml b/jdbc/pom.xml
@@ -47,6 +47,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/jms/pom.xml b/jms/pom.xml
@@ -63,6 +63,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/jta/pom.xml b/jta/pom.xml
@@ -71,6 +71,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/jws-common/pom.xml b/jws-common/pom.xml
@@ -43,6 +43,19 @@
         </dependency>
     </dependencies>
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/jws/pom.xml b/jws/pom.xml
@@ -56,6 +56,19 @@
     </dependencies>
 
     <build>
+        <!-- Include the container descriptors in the output artifact -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <excludes>
+                    <exclude>**/build.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <!-- do not publish this artifact to Maven repositories -->
             <plugin>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.7</version>
+        <version>1.0.9</version>
     </parent>
 
     <groupId>jakarta.tck</groupId>
@@ -783,7 +783,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.mortbay.jetty</groupId>