WELD-2771 Update TCK version, remove web tck parts which were migrate…

…d into platform TCKs. Update CI to skip servlet tests for JDK 11 (some deps require 17 as min version).
weld · Apr 22, 2024 · 9510f82 · 9510f82
1 parent 9954a46
commit 9510f82
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 80 deletions.
diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
@@ -119,11 +119,18 @@ jobs:
           path: .
       - name: Extract WildFly
         run: unzip wildfly.zip
-      - name: Build with Maven
+      - if: ${{ matrix.java.name != '11' }}
+        name: Build with Maven
         run: |
           JBOSS_HOME=`pwd`'/wildfly'
           export JBOSS_HOME=`echo $JBOSS_HOME`
           mvn clean verify -Dincontainer -Dno-format -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -pl '!jboss-tck-runner'
+      - if: ${{ matrix.java.name == '11' }}
+        name: Build with Maven; skipping incontainer servlet tests due to JDK 11
+        run: |
+          JBOSS_HOME=`pwd`'/wildfly'
+          export JBOSS_HOME=`echo $JBOSS_HOME`
+          mvn clean verify -Dincontainer -Dno-format -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -pl '!environments/servlet/tests/tomcat,!jboss-tck-runner'
       - name: Prepare failure archive (if maven failed)
         if: failure()
         shell: bash
@@ -249,7 +256,7 @@ jobs:
         run: |
           JBOSS_HOME=`pwd`'/wildfly'
           export JBOSS_HOME=`echo $JBOSS_HOME`
-          mvn clean verify -Dincontainer -Dno-format -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dcdi.tck.suite.xml.file=src/test/tck/tck-tests-web.xml -Dadditional.vm.args="-Dorg.jboss.weld.construction.relaxed=true" -f jboss-tck-runner/pom.xml
+          mvn clean verify -Dincontainer -Dno-format -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dcdi.tck.suite.xml.file=src/test/tck/tck-tests.xml -Dadditional.vm.args="-Dorg.jboss.weld.construction.relaxed=true" -f jboss-tck-runner/pom.xml
       - name: Prepare failure archive (if maven failed)
         if: failure()
         shell: bash
@@ -332,9 +339,9 @@ jobs:
           name: test-reports-no-container-jdk${{matrix.java.name}}
           path: 'test-reports.tgz'
 
-  # Weld Examples build and test, only JDK 11
+  # Weld Examples build and test, only JDK 17
   examples-tests:
-    name: "Weld Examples build and test - JDK 11}"
+    name: "Weld Examples build and test - JDK 17}"
     runs-on: ubuntu-latest
     needs: build-jdk11
     timeout-minutes: 120
@@ -343,7 +350,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v4.2.1
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: Download Maven Repo
         uses: actions/download-artifact@v4
@@ -364,7 +371,7 @@ jobs:
         run: |
           JBOSS_HOME=`pwd`'/wildfly'
           export JBOSS_HOME=`echo $JBOSS_HOME`
-          mvn clean verify -Dno-format -Darquillian=wildfly-managed -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -f examples/pom.xml
+          mvn clean verify -Dno-format -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -f examples/pom.xml
       - name: Prepare failure archive (if maven failed)
         if: failure()
         shell: bash

diff --git a/environments/servlet/tests/base/pom.xml b/environments/servlet/tests/base/pom.xml
@@ -62,16 +62,4 @@
 
     </dependencies>
 
-    <build>
-    	<plugins>
-    		<plugin>
-    			<groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration combine.self="override">
-                	<skip>true</skip>
-                </configuration>
-    		</plugin>
-    	</plugins>
-    </build>
-
 </project>
diff --git a/jboss-tck-runner/pom.xml b/jboss-tck-runner/pom.xml
@@ -20,11 +20,6 @@
     </licenses>
     <url>http://weld.cdi-spec.org</url>
 
-    <properties>
-        <!-- This matches the htmlunit version in TCK -->
-        <htmlunit.version>2.50.0</htmlunit.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
@@ -177,10 +172,8 @@
                             <value>false</value>
                         </property>
                     </properties>
-                    <!-- https://issues.apache.org/jira/browse/SUREFIRE-569 -->
                     <dependenciesToScan>
                         <dependency>jakarta.enterprise:cdi-tck-core-impl</dependency>
-                        <dependency>jakarta.enterprise:cdi-tck-web-impl</dependency>
                     </dependenciesToScan>
                 </configuration>
             </plugin>
@@ -266,15 +259,6 @@
                                     <overWrite>false</overWrite>
                                     <destFileName>tck-core-suite.xml</destFileName>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>jakarta.enterprise</groupId>
-                                    <artifactId>cdi-tck-web-impl</artifactId>
-                                    <version>${cdi.tck-4-1.version}</version>
-                                    <type>xml</type>
-                                    <classifier>suite</classifier>
-                                    <overWrite>false</overWrite>
-                                    <destFileName>tck-web-suite.xml</destFileName>
-                                </artifactItem>
                             </artifactItems>
                             <outputDirectory>target/suites</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
@@ -360,7 +344,7 @@
             </build>
         </profile>
 
-        <!-- Run the TCK in the managed container (full Java EE platform) -->
+        <!-- Run the CDI TCK in the managed container (full Java EE platform) -->
         <profile>
             <id>incontainer</id>
             <activation>
@@ -372,52 +356,10 @@
             </activation>
             <properties>
                 <excluded.groups>se</excluded.groups>
-                <cdi.tck.suite.xml.file>target/suites/tck-web-suite.xml</cdi.tck.suite.xml.file>
+                <!-- Note that this is the CDI CORE exclude list; it doesn't include TCKs living in EE platform suite -->
+                <cdi.tck.suite.xml.file>target/suites/tck-core-suite.xml</cdi.tck.suite.xml.file>
             </properties>
             <dependencies>
-                <dependency>
-                    <groupId>jakarta.enterprise</groupId>
-                    <artifactId>cdi-tck-web-impl</artifactId>
-                    <version>${cdi.tck-4-1.version}</version>
-                    <type>xml</type>
-                    <classifier>suite</classifier>
-                    <scope>test</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>jakarta.el</groupId>
-                            <artifactId>jakarta.el-api</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>jakarta.faces</groupId>
-                            <artifactId>jakarta.faces-api</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <artifactId>container-se-api</artifactId>
-                            <groupId>org.jboss.arquillian.container</groupId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-
-                <dependency>
-                    <groupId>jakarta.enterprise</groupId>
-                    <artifactId>cdi-tck-web-impl</artifactId>
-                    <version>${cdi.tck-4-1.version}</version>
-                    <scope>test</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>jakarta.el</groupId>
-                            <artifactId>jakarta.el-api</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>jakarta.faces</groupId>
-                            <artifactId>jakarta.faces-api</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <artifactId>container-se-api</artifactId>
-                            <groupId>org.jboss.arquillian.container</groupId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
                 <dependency>
                     <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>

diff --git a/jboss-tck-runner/src/test/tck/tck-tests-web.xml b/jboss-tck-runner/src/test/tck/tck-tests-web.xml
@@ -2,6 +2,8 @@
 <!-- CDI TCK TestNG configuration for Weld -->
 <!-- Used mainly for WeldMethodInterceptor in combination with relaxed construction mode -->
 <!-- This version is for the web profile of TCKs (with EJB tests and other EE deps) -->
+<!-- The list of tests present here should be synced with Platform TCK exclusion list -->
+<!-- See https://github.com/jakartaee/platform-tck/blob/master/cdi-ee-tck/src/main/resources/tck-tests.xml -->
 <suite name="Weld / JBoss AS run of CDI TCK" verbose="0" configfailurepolicy="continue">
 
     <listeners>

diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
         <arquillian.tomcat.version>1.2.0.Final</arquillian.tomcat.version>
         <atinject.tck.version>2.0.1</atinject.tck.version>
         <!-- Version of the CDI 4.x release TCK -->
-        <cdi.tck-4-1.version>4.1.0-M1</cdi.tck-4-1.version>
+        <cdi.tck-4-1.version>4.1.0</cdi.tck-4-1.version>
         <!-- By default, each mvn profile uses corresponding file from TCK repo, see jboss-tck-runner/pom.xml -->
         <!-- We can also use our own file, needed for relaxed mode testing (see WeldMethodInterceptor) -->
         <!-- Our variant is under src/test/tck/tck-tests.xml -->