Update and sync more for old TCK

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
jakartaee · May 16, 2024 · 089e746 · 089e746
1 parent 38c579a
commit 089e746
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/tck/old-tck/source/docker/pom.getlibs.xml b/tck/old-tck/source/docker/pom.getlibs.xml
@@ -1,5 +1,6 @@
  <!--
 
+    Copyright (c) 2024 Contributors to the Eclipse Foundation.
     Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +25,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.7</version>
+        <version>1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>jakarta</groupId>

diff --git a/tck/old-tck/source/docker/pom.getmodules.xml b/tck/old-tck/source/docker/pom.getmodules.xml
@@ -1,5 +1,6 @@
  <!--
 
+    Copyright (c) 2024 Contributors to the Eclipse Foundation.
     Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -27,7 +28,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.7</version>
+        <version>1.0.9</version>
     </parent>
 
     <groupId>jakarta</groupId>
@@ -36,8 +37,8 @@
 
     <properties>
         <!-- CDI -->
-        <cdi-api.version>4.1.0-M1</cdi-api.version>
-        <jakarta.faces-api.version>4.1.0-M1</jakarta.faces-api.version>
+        <cdi-api.version>4.1.0</cdi-api.version>
+        <jakarta.faces-api.version>4.1.0</jakarta.faces-api.version>
         <jakarta.activation-api.version>2.1.0</jakarta.activation-api.version>
 
         <!-- Jakarta Server Pages -->
@@ -47,9 +48,9 @@
         <jstl-api.version>3.0.0</jstl-api.version>
 
         <jakarta.annotation-api.version>2.1.0</jakarta.annotation-api.version>
-        <jakarta.el-api.version>6.0.0-M2</jakarta.el-api.version>
+        <jakarta.el-api.version>6.0.0</jakarta.el-api.version>
         <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
-        <jakarta.servlet-api.version>6.1.0-M1</jakarta.servlet-api.version>
+        <jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
         <glassfish-corba-orb.version>4.2.4</glassfish-corba-orb.version>
     </properties>
 

diff --git a/tck/old-tck/source/pom-bundle.xml b/tck/old-tck/source/pom-bundle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022 Contributors to the Eclipse Foundation. All rights reserved.
+    Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -164,12 +164,12 @@
                             <artifactItem>
                                 <groupId>net.sourceforge.htmlunit</groupId>
                                 <artifactId>htmlunit</artifactId>
-                                <version>2.66.0</version>
+                                <version>2.70.0</version>
                             </artifactItem>
                             <artifactItem>
                                 <groupId>net.sourceforge.htmlunit</groupId>
                                 <artifactId>htmlunit-core-js</artifactId>
-                                <version>2.66.0</version>
+                                <version>2.70.0</version>
                             </artifactItem>
                             <!--artifactItem>
                                 <groupId>org.apache.httpcomponents</groupId>
@@ -209,17 +209,17 @@
                             <artifactItem>
                                 <groupId>xalan</groupId>
                                 <artifactId>serializer</artifactId>
-                                <version>2.7.2</version>
+                                <version>2.7.3</version>
                             </artifactItem>
                             <artifactItem>
                                 <groupId>xalan</groupId>
                                 <artifactId>xalan</artifactId>
-                                <version>2.7.2</version>
+                                <version>2.7.3</version>
                             </artifactItem>
                             <artifactItem>
                                 <groupId>xerces</groupId>
                                 <artifactId>xercesImpl</artifactId>
-                                <version>2.11.0</version>
+                                <version>2.12.2</version>
                             </artifactItem>
                             <artifactItem>
                                 <groupId>xml-apis</groupId>

diff --git a/tck/old-tck/source/release/tools/jsf.xml b/tck/old-tck/source/release/tools/jsf.xml
@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2024 Contributors to the Eclipse Foundation.
     Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -117,7 +118,7 @@
         <!-- the lib directory -->
         <copy todir="${deliverable.bundle.dir}/lib" includeEmptyDirs="no">
             <fileset dir="${ts.home}/lib"
-            	includes="tsharness.jar, jsftck.jar, javatest.jar, jdom-1.1.3.jar, jaxen-core-1.0.jar, saxpath.jar, jaxb-xjc.jar, tsharness.jar, javatest.jar, ant.jar, commons-logging-1.1.3.jar, commons-io-2.4.jar, commons-lang3-3.12.0.jar, commons-codec-1.9.jar, commons-collections-3.2.1.jar, commons-httpclient-3.1.jar, cssparser-0.9.25.jar, dec-0.1.2.jar, httpclient-4.5.5.jar, httpcore-4.4.9.jar, htmlunit-2.66.0.jar, htmlunit-core-js-2.66.0.jar, htmlunit-cssparser-1.12.0.jar, htmlunit-xpath-2.66.0.jar, httpmime-4.5.5.jar, neko-htmlunit-2.66.0.jar, nekohtml-1.9.21.jar, xercesImpl-2.11.0.jar, xalan-2.7.2.jar, serializer-2.7.2.jar, sac-1.3.jar, jaxen-1.1.6.jar, xml-apis-1.4.01.jar" />
+            	includes="tsharness.jar, jsftck.jar, javatest.jar, jdom-1.1.3.jar, jaxen-core-1.0.jar, saxpath.jar, jaxb-xjc.jar, tsharness.jar, javatest.jar, ant.jar, commons-logging-1.1.3.jar, commons-io-2.4.jar, commons-lang3-3.12.0.jar, commons-codec-1.9.jar, commons-collections-3.2.1.jar, commons-httpclient-3.1.jar, cssparser-0.9.25.jar, dec-0.1.2.jar, httpclient-4.5.5.jar, httpcore-4.4.9.jar, htmlunit-2.70.0.jar, htmlunit-core-js-2.70.0.jar, htmlunit-cssparser-1.12.0.jar, htmlunit-xpath-2.70.0.jar, httpmime-4.5.5.jar, neko-htmlunit-2.70.0.jar, nekohtml-1.9.21.jar, xercesImpl-2.12.2.jar, xalan-2.7.3.jar, serializer-2.7.3.jar, sac-1.3.jar, jaxen-1.1.6.jar, xml-apis-1.4.01.jar" />
         </copy>
 
         <!-- copy relevant DTDs -->