Merge pull request #1842 from arjantijms/update_cdi_extra_runner

Update the CDI Extra runner
jakartaee · Jan 31, 2025 · 45b6181 · 45b6181
2 parents b48f513 + 514bc2b
commit 45b6181
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/glassfish-runner/cdi-platform-extra-tck/cdi-platform-extra-tck-install/pom.xml b/glassfish-runner/cdi-platform-extra-tck/cdi-platform-extra-tck-install/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <tck.test.cdi-extra.file>jakarta-cdi-extra-tck-${tck.test.cdi-extra.version}.zip</tck.test.cdi-extra.file>
         <tck.test.cdi-extra.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee11/staged/eftl/${tck.test.cdi-extra.file}</tck.test.cdi-extra.url>
-        <tck.test.cdi-extra.version>4.1.0-M1</tck.test.cdi-extra.version>
+        <tck.test.cdi-extra.version>4.1.0-M2</tck.test.cdi-extra.version>
     </properties>
 
     <build>

diff --git a/glassfish-runner/cdi-platform-extra-tck/cdi-platform-extra-tck-run/pom.xml b/glassfish-runner/cdi-platform-extra-tck/cdi-platform-extra-tck-run/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation. All rights reserved.
+    Copyright (c) 2022, 2025 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
@@ -35,16 +35,13 @@
 
     <properties>
         <cdi.tck-4-1.version>4.1.0</cdi.tck-4-1.version>
-        <tck.version>4.1.0-M1</tck.version>
+        <tck.version>4.1.0-M2</tck.version>
 
         <glassfish.root>${project.build.directory}</glassfish.root>
 
         <!-- Note M6 still has some failures, future M7 passes all -->
         <glassfish.version>8.0.0-M9</glassfish.version>
 
-        <!-- This matches the htmlunit version in TCK -->
-        <htmlunit.version>2.50.0</htmlunit.version>
-
         <maven.build.cache.enabled>false</maven.build.cache.enabled>
 
         <!-- Weld uses 2 versions numbers. Some artefact use one version, other the second. -->
@@ -234,11 +231,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>${htmlunit.version}</version>
-            <scope>test</scope>
-        </dependency>
+		    <groupId>org.htmlunit</groupId>
+    		<artifactId>htmlunit</artifactId>
+    		<version>4.9.0</version>
+    		<scope>test</scope>
+		</dependency>
+
 
         <dependency>
             <groupId>org.jboss.weld</groupId>
@@ -387,10 +385,9 @@
                         <id>run ee tck</id>
                         <goals>
                             <goal>integration-test</goal>
+                            <goal>verify</goal>
                         </goals>
-                        <phase>integration-test</phase>
                         <configuration>
-                            <skipITs>${skip.ee.cdi.tck}</skipITs>
                             <argLine>-Xmx768m</argLine>
                             <!-- Surefire / TestNG Properties -->
                             <!-- The suite, the exclude and the test dependencies together determine which tests are being run -->