Issue #23641 descriptors: antrun-extended-plugin replaced by assembly plugin
- I'm not sure about those exclusions, but let's not change it now
- license and notice files added to META-INF (consequence of the phase)
diff --git a/appserver/connectors/descriptors/pom.xml b/appserver/connectors/descriptors/pom.xml
index 2b0d7ab..0d33206 100644
--- a/appserver/connectors/descriptors/pom.xml
+++ b/appserver/connectors/descriptors/pom.xml
@@ -29,31 +29,26 @@
<artifactId>descriptors</artifactId>
<packaging>distribution-fragment</packaging>
- <name>JavaEE Connector Architecture Descriptors</name>
- <description>Descriptors of Java EE Connector Architecture module</description>
+ <name>Jakarta EE Connector Architecture Descriptors</name>
<build>
<plugins>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <jar file="target/descriptors.jar">
- <fileset dir="src/main/resources">
- <exclude name="**/*connector_1_5.dtd" />
- <exclude name="**/*connector_1_6.dtd" />
- </fileset>
- </jar>
- <attachArtifact file="target/descriptors.jar" type="jar" classifier="resources" />
- </tasks>
- </configuration>
+ <id>jar</id>
<goals>
- <goal>run</goal>
+ <goal>single</goal>
</goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/jar.xml</descriptor>
+ </descriptors>
+ <attach>true</attach>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/appserver/connectors/descriptors/src/assembly/jar.xml b/appserver/connectors/descriptors/src/assembly/jar.xml
new file mode 100644
index 0000000..8d4bee7
--- /dev/null
+++ b/appserver/connectors/descriptors/src/assembly/jar.xml
@@ -0,0 +1,20 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd"
+>
+ <id>resources</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>**/*connector_1_5.dtd</exclude>
+ <exclude>**/*connector_1_6.dtd</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
