>.
-Tests within the _installedLib_ test group require the CDI TCK +cdi-tck-ext-lib+ artifact to be installed as a library (see also Jakarta EE 10 specification, section EE.10.2.2 "Installed Libraries").
+Tests within the _installedLib_ test group require the CDI TCK +cdi-tck-ext-lib+ artifact to be installed as a library (see also {jakartaee-version} specification, section EE.10.2.2 "Installed Libraries").
Tests within the _systemProperties_ test group require the following system properties to be set:
@@ -225,15 +185,4 @@ Tests within the _systemProperties_ test group require the following system prop
|===============
-Tests within the _security_ test group require the following mapping of roles to principals:
-
-[options="header"]
-|===============
-|Principal|Group
-|+student+|+student+
-|+alarm+|+alarm+, +student+
-|+printer+|+printer+|
-
-|===============
-
Tests within _SE_ test groups require execution in a separate JVM instance with isolated classpath including all required dependencies.
diff --git a/doc/reference/src/main/asciidoc/executing.asciidoc b/doc/reference/src/main/asciidoc/executing.asciidoc
index 53e3a9e93e..c21dd4d4a1 100644
--- a/doc/reference/src/main/asciidoc/executing.asciidoc
+++ b/doc/reference/src/main/asciidoc/executing.asciidoc
@@ -66,7 +66,7 @@ To specify particular TCK version:
[source, console]
----
-mvn test -Dincontainer -Dcdi.tck-4-0.version=4.0.4
+mvn test -Dincontainer -Dcdi.tck.version=4.1.0
----
diff --git a/doc/reference/src/main/asciidoc/installation.asciidoc b/doc/reference/src/main/asciidoc/installation.asciidoc
index 3cfe4caff5..fc3b7e9bef 100644
--- a/doc/reference/src/main/asciidoc/installation.asciidoc
+++ b/doc/reference/src/main/asciidoc/installation.asciidoc
@@ -8,11 +8,11 @@ This chapter explains how to obtain the TCK and supporting software and provides
=== Obtaining the Software
-You can obtain a release of the CDI TCK project from the link:$$https://download.eclipse.org/jakartaee/cdi/$$[download page] on the CDI specification website. The release stream for Jakarta CDI is named _4.0.x_. The CDI TCK is distributed as a ZIP file, which contains the TCK artifacts (the test suite binary and source, porting package API binary and source, the test suite configuration file, the audit source and report) in /artifacts and documentation in /doc. The TCK library dependencies are not part of the distribution and can be downloaded on demand (see readme.txt file in /lib).
+You can obtain a release of the CDI TCK project from the link:$$https://download.eclipse.org/jakartaee/cdi/$$[download page] on the CDI specification website. The release stream for Jakarta CDI is named _4.1.x_. The CDI TCK is distributed as a ZIP file, which contains the TCK artifacts (the test suite binary and source, porting package API binary and source, the test suite configuration file, the audit source and report) in /artifacts and documentation in /doc. The TCK library dependencies are not part of the distribution and can be downloaded on demand (see readme.txt file in /lib).
You can also download the current source code from link:$$https://github.com/eclipse-ee4j/cdi-tck$$[GitHub repository].
-Executing the TCK requires a Jakarta EE 10 or better runtime environment (i.e., application server), to which the test artifacts are deployed and the individual tests are invoked. The TCK does not depend on any particular Jakarta EE implementation.
+Executing the TCK requires a {jakartaee-version} or better runtime environment (i.e., application server), to which the test artifacts are deployed and the individual tests are invoked. The TCK does not depend on any particular Jakarta EE implementation.
A Jakarta Contexts and Dependency Injection for compatible implementation project is named Weld. The release stream for Jakarta CDI {revnumber} is named _{revmajor}.x_. You can obtain the latest release from the link:$$http://weld.cdi-spec.org/download/$$[download page] on the Weld website.
@@ -25,16 +25,16 @@ Weld is not required for running the CDI TCK, but it can be used as a reference
====
-Naturally, to execute Java programs, you must have a Java SE runtime environment. The TCK requires Java SE 11 or better, which you can obtain from the link:$$http://www.oracle.com/technetwork/java/index.html$$[Java Software] website.
+Naturally, to execute Java programs, you must have a Java SE runtime environment. The TCK requires Java SE 17 or better, which you can obtain from the link:$$http://www.oracle.com/technetwork/java/index.html$$[Java Software] website.
=== The TCK Environment
The TCK requires the following two Java runtime environments:
-* Java SE 11 or better
+* Java SE 17 or better
-* Jakarta EE 10 or better (e.g., WildFly 27.x or GlassFish V7)
+* {jakartaee-version} or better (e.g., WildFly {wildfly-version} or GlassFish {glassfish-version}
You should refer to vendor instructions for how to install the runtime environment.
@@ -65,7 +65,7 @@ Each test class is treated as an individual artifact. All test methods (i.e., me
[[running-against-weld, Running the TCK against Weld and WildFly]]
Running the TCK against Weld and WildFly
-* First, you should download WildFly 27.x from the WildFly link:$$http://www.wildfly.org/downloads/$$[project page].
+* First, you should download WildFly {wildfly-version} from the WildFly link:$$http://www.wildfly.org/downloads/$$[project page].
* Set the JBOSS_HOME environment variable to the location of the WildFly software.
@@ -97,11 +97,11 @@ cd core-tck-4.x.y/weld/jboss-tck-runner
mvn test -Dincontainer
----
-* Use +cdi.tck-4-0.versionn+ system property to specify particular TCK version:
+* Use +cdi.tck.version+ system property to specify particular TCK version:
[source, console]
----
-mvn test -Dincontainer -Dcdi.tck-4-0.version=4.0.5
+mvn test -Dincontainer -Dcdi.tck.version=4.1.1
----
* TestNG will report, via Maven, the outcome of the run, and report any failures on the console. Details can be found in target/surefire-reports/TestSuite.txt.
diff --git a/doc/reference/src/main/asciidoc/introduction.asciidoc b/doc/reference/src/main/asciidoc/introduction.asciidoc
index 2b10399c5f..f69c12f1ca 100644
--- a/doc/reference/src/main/asciidoc/introduction.asciidoc
+++ b/doc/reference/src/main/asciidoc/introduction.asciidoc
@@ -46,7 +46,7 @@ The CDI specification goes to great lengths to ensure that programs written for
=== Compatibility Requirements
-The compatibility requirements for Jakarta Contexts and Dependency Injection Version 3.0 consist of meeting the
+The compatibility requirements for Jakarta Contexts and Dependency Injection Version {revnumber} consist of meeting the
requirements set forth by the rules and associated definitions contained in this section.
==== Definitions
@@ -228,7 +228,7 @@ Each test class in the suite acts as a deployable unit. The deployable units, or
[NOTE]
====
The test archives are built with ShrinkWrap, a Java API for creating archives.
-ShrinkWrap is a part of the Arqullian platform ecosystem.
+ShrinkWrap is a part of the Arquillian platform ecosystem.
====
@@ -240,19 +240,19 @@ ShrinkWrap is a part of the Arqullian platform ecosystem.
This section lists the applicable requirements and specifications for the CDI TCK.
-* *Specification requirements* - Software requirements for a CDI implementation are itemized in section 1.2, "Relationship to other specifications" in the CDI specification, with details provided throughout the specification. Generally, the CDI specification targets the Jakarta EE 10 platform and will be aligned with its specifications.
+* *Specification requirements* - Software requirements for a CDI implementation are itemized in section 1.2, "Relationship to other specifications" in the CDI specification, with details provided throughout the specification. Generally, the CDI specification targets the {jakartaee-version} platform and will be aligned with its specifications.
* *Jakarta Contexts and Dependency Injection {revnumber} API* - The Java API defined in the CDI specification and provided by the compatible implementation.
-* *Testing platform* - The CDI TCK requires version 1.7.0.Alpha10 of the Arquillian (http://arquillian.org). The TCK test suite is based on TestNG 7.4 (http://testng.org). .
+* *Testing platform* - The CDI TCK requires version {arquillian-version} of the Arquillian (http://arquillian.org). The TCK test suite is based on TestNG {testng-version}(http://testng.org). .
* *Porting Package* - An implementation of SPIs that are required for the test suite to run the in-container tests and at times extend the CDI 4.0 API to provide extra information to the TCK.
-* *TCK Audit Tool* - An itemization of the assertions in the specification documents which are cross referenced by the individual tests. Describes how well the TCK covers the specification.
+* *TCK Audit Tool* - An itemization of the assertions in the specification documents which are cross-referenced by the individual tests. Describes how well the TCK covers the specification.
* *Compatible implementation* - A compatible implementation runtime for compatibility testing of the CDI specification is the Jakarta Platform Enterprise Edition 10 compatible implementation.
@@ -263,9 +263,12 @@ This section lists the applicable requirements and specifications for the CDI TC
* *The Jakarta Contexts and Dependency Injection Language Model TCK* - The CDI Language Model TCK included in the CDI TCK distribution must be run and passed by every CDI cmpatible implementation.
* *Jakarta Interceptors* - CDI is an implementation of the Jakarta Interceptors specification. Jakarta Interceptors has no TCK of its own, so the CDI TCK includes an extensive set of tests that validate the Jakarta Interceptors concepts.
+
+* *Jakarta EE Profiles* - Additional requirements for the Jakarta EE Web Profile and Jakarta EE Full Platform are specified in the CDI EE standalone TCK distributed by the Platform TCK group.
+
[TIP]
====
-The TCK distribution includes +weld/porting-package-lib/weld-inject-tck-runner-X.Y.Z-Q-tests.jar+ which contains two classes showing how the Weld compatible implementation passes the CDI TCK. The source for these classes is available from link:$$hhttps://github.com/weld/core/tree/5.0.0.Alpha2/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck$$[]
+The TCK distribution includes +weld/porting-package-lib/weld-inject-tck-runner-X.Y.Z-Q-tests.jar+ which contains two classes showing how the Weld compatible implementation passes the CDI TCK. The source for these classes is available from link:$$hhttps://github.com/weld/core/tree/{weld-version}/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck$$[]
====
@@ -279,10 +282,10 @@ The TCK distribution includes +weld/porting-package-lib/weld-inject-tck-runner-X
The CDI TCK includes the following components:
-* *Arquillian 1.7.0.Alpha10*
+* *Arquillian {arquillian-version}*
-* *TestNG 7.4.0*
+* *TestNG {testng-version}*
* *Porting Package SPIs* - Extensions to the CDI SPIs to allow testing of a container.
@@ -301,10 +304,12 @@ The audit document is provided along with the TCK; at least 95% of assertions ar
The CDI TCK has been tested on following platforms:
+* Weld {weld-version} using Eclipse Temurin Java SE 17 on Linux and MacOS
+* WildFly {wildfly-version} using Eclipse Temurin Java SE 17 on Linux and MacOS
+* Weld {weld-version} using Eclipse Temurin Java SE 21 on Linux and MacOS
+* WildFly {wildfly-version} using Eclipse Temurin Java SE 21 on Linux and MacOS
-* WildFly X using Oracle Java SE 11 on Red Hat Enterprise Linux 8.5
-
-CDI supports Jakarta EE 10, Jakarta EE 10 Web Profile, Embeddable Jakarta Enterprise Beans 4.0. The TCK will execute on any of these runtimes, but is only part of the CTS for Jakarta EE 10 and Jakarta EE 10 Web Profile.
+CDI supports {jakartaee-version}, {jakartaee-version} Web Profile, Embeddable Jakarta Enterprise Beans 4.0. The TCK will execute on any of these runtimes, but is only part of the CTS for {jakartaee-version} and {jakartaee-version} Web Profile.
[[libraries]]
diff --git a/docs/index.html b/docs/index.html
index 468c509050..b53f997770 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -247,7 +247,7 @@
The CDI TCK has been tested on following platforms:
-
-WildFly X using Oracle Java SE 11 on Red Hat Enterprise Linux 8.5
+WildFly X using Oracle Java SE 17 on Red Hat Enterprise Linux 8.5
CDI supports Jakarta EE 10, Jakarta EE 10 Web Profile, Embeddable Jakarta Enterprise Beans 4.0. The TCK will execute on any of these runtimes, but is only part of the CTS for Jakarta EE 10 and Jakarta EE 10 Web Profile.
@@ -322,13 +322,13 @@
Note
Weld is not required for running the CDI TCK, but it can be used as a reference for familiarizing yourself with the TCK before testing your own CDI implementation.
Naturally, to execute Java programs, you must have a Java SE runtime environment. The TCK requires Java SE 11 or better, which you can obtain from the Java Software website.
+Naturally, to execute Java programs, you must have a Java SE runtime environment. The TCK requires Java SE 17 or better, which you can obtain from the Java Software website.
The TCK requires the following two Java runtime environments:
-
-Java SE 11 or better
+Java SE 17 or better
-
Jakarta EE 10 or better (e.g., WildFly 28.x or GlassFish V7)
diff --git a/pom.xml b/pom.xml
index fb442cd04a..0edec3c446 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,6 @@
ext-lib
lang-model
impl
-
web
@@ -120,8 +119,7 @@
4.7.2
2.9.1
- ${project.version}
- 5.1.2.Final
+ 6.0.0.Alpha1
@@ -188,30 +186,6 @@
${apache.httpclient.version}
-
- org.seleniumhq.selenium
- selenium-java
- ${selenium.version}
-
-
-
- org.seleniumhq.selenium
- selenium-chrome-driver
- ${selenium.version}
-
-
-
- io.github.bonigarcia
- webdrivermanager
- 5.3.1
-
-
-
- net.sourceforge.htmlunit
- htmlunit
- ${htmlunit.version}
-
-
org.jboss.arquillian
arquillian-bom