tck dist update (#323)

Signed-off-by: David Kral <david.k.kral@oracle.com>
jakartaee · Feb 28, 2022 · 7340b84 · 7340b84
1 parent 29a2568
commit 7340b84
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 74 deletions.
diff --git a/tck-dist/pom.xml b/tck-dist/pom.xml
@@ -66,15 +66,13 @@
             <properties>
                 <license>EFTL</license>
                 <bundle-name>jakarta-jsonb-tck</bundle-name>
-                <assembly-descriptor>src/main/assembly/assembly-eftl.xml</assembly-descriptor>
             </properties>
         </profile>
         <profile>
             <id>EPL</id>
             <properties>
                 <license>EPL</license>
                 <bundle-name>jsonb-tck</bundle-name>
-                <assembly-descriptor>src/main/assembly/assembly.xml</assembly-descriptor>
             </properties>
             <activation>
                 <activeByDefault>true</activeByDefault>
@@ -97,7 +95,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>${assembly-descriptor}</descriptor>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
                             </descriptors>
                             <escapeString>\</escapeString>
                             <appendAssemblyId>false</appendAssemblyId>

diff --git a/tck-dist/src/main/assembly/assembly-eftl.xml b/tck-dist/src/main/assembly/assembly-eftl.xml
diff --git a/tck-dist/src/main/assembly/assembly.xml b/tck-dist/src/main/assembly/assembly.xml
@@ -41,6 +41,14 @@
                 <include>**/*.sh</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>**/*.xml</include>
+            </includes>
+            <filtered>true</filtered>
+        </fileSet>
     </fileSets>
     <dependencySets>
         <dependencySet>