Updates for TCK release

jakartaee · Jan 10, 2024 · 9b31289 · 9b31289
1 parent f026646
commit 9b31289
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/dist-build/src/main/assembly/assembly.xml b/dist-build/src/main/assembly/assembly.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
    <id>dist</id>
    <baseDirectory>cdi-tck-${cdi.tck.version}</baseDirectory>
    <formats>

diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml
@@ -122,13 +122,14 @@
             </plugin>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <phase>process-classes</phase>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <copy file="${basedir}/target/generated-docs-pdf/${pdf.name}" todir="${basedir}" />
-                            </tasks>
+                            </target>
                         </configuration>
                         <goals>
                             <goal>run</goal>

diff --git a/doc/reference/src/main/assembly/assembly.xml b/doc/reference/src/main/assembly/assembly.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
+   <id>bin</id>
    <baseDirectory>cdi-tck-ref-guide</baseDirectory>
    <formats>
       <format>zip</format>

diff --git a/pom.xml b/pom.xml
@@ -116,7 +116,7 @@
         <xmlunit.version>2.9.1</xmlunit.version>
         <!-- Required for distribution build, should be overriden for each build -->
         <cdi.tck.version>${project.version}</cdi.tck.version>
-        <weld.version>5.0.0.SP2</weld.version>
+        <weld.version>5.1.2.Final</weld.version>
     </properties>
 
     <!-- Dependency management -->