diff --git a/appclient/pom.xml b/appclient/pom.xml
index ab2b49c492..db6c38be3c 100644
--- 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
index bd19efb3d8..053bb8d01e 100644
--- 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
index 6e4056287c..c8c7036aaf 100644
--- 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
index 4f9171c720..20822da2d2 100644
--- 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
index 94e2f6dfaa..f806a77c84 100644
--- 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
index 94c38c04d2..b5b79d5664 100644
--- 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
index c620bd52fd..368b60a6d7 100644
--- 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
index 670e876a47..5b830e60ef 100644
--- 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
index 2737603b36..63360dbca1 100644
--- 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
index b81e9bc391..ac8e3b1d4c 100644
--- 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
index 9c1178a710..6e4df1dd18 100644
--- 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
index 6bc4b77856..40136f78b1 100644
--- 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
index 187779b8f6..2b03a3888a 100644
--- 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
index 6a01f5e170..2f9c7d4e30 100644
--- 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
index fbd6f6b348..d01065497f 100644
--- 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
index ea4e259691..47ade77660 100644
--- 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
index f96965cfbd..8cf7a5abd3 100644
--- 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
index d9e3fb09e5..66787fd831 100644
--- 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
index bdfcb23fe8..6bdc3b1447 100644
--- 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
index 2291cc512b..1a29cba47a 100644
--- 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>
diff --git a/samples/pom.xml b/samples/pom.xml
index 9be8218c9d..007c6bfd01 100644
--- a/samples/pom.xml
+++ b/samples/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/webservices12/pom.xml b/webservices12/pom.xml
index a7c6d62fb2..7381b6e791 100644
--- a/webservices12/pom.xml
+++ b/webservices12/pom.xml
@@ -62,6 +62,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/xa/pom.xml b/xa/pom.xml
index 1be74f074e..c6dff7c89d 100644
--- a/xa/pom.xml
+++ b/xa/pom.xml
@@ -51,6 +51,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>