From c8005526c3a33f0c08153220972165d415438647 Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Wed, 31 Jan 2024 15:03:56 -0600 Subject: [PATCH 1/5] Initial update to remove the web integration tests from the core tck, #529 Signed-off-by: Scott M Stark --- README.md | 5 +- dist-build/README.adoc | 8 +- dist-build/artifact-install.pom | 32 --- dist-build/jboss-runner.pom | 232 +----------------- dist-build/lang-model-tck-runner/pom.xml | 15 +- dist-build/libs/pom.xml | 5 - dist-build/pom.xml | 84 +------ dist-build/src/main/assembly/assembly.xml | 1 - doc/reference/pom.xml | 18 +- .../asciidoc/cdi-tck-reference-guide.asciidoc | 2 +- .../src/main/asciidoc/configuration.asciidoc | 53 +--- .../src/main/asciidoc/executing.asciidoc | 2 +- .../src/main/asciidoc/installation.asciidoc | 16 +- .../src/main/asciidoc/introduction.asciidoc | 27 +- docs/index.html | 6 +- pom.xml | 27 +- 16 files changed, 67 insertions(+), 466 deletions(-) diff --git a/README.md b/README.md index 5200a27681..d806d9e8e4 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ or when compiling against staged Jakarta artifacts: `mvn -Pstaging install` ## Building the CDI TCK distribution -The CDI TCK distribution artifact is built by specifing an additional `-Drelease` property to build the TCK reference +The CDI TCK distribution artifact is built by specifying an additional `-Drelease` property to build the TCK reference documentation and distribution bundle, e.g.: `mvn -Drelease install` @@ -24,7 +24,7 @@ The https://github.com/jakartaee/cdi/wiki/Eclipse-CI-Release-Jobs page describes ## Sources in GIT -Master branch contains the CDI TCK 4.0 +Master branch contains the CDI TCK 4.1 ### Source Layout @@ -37,5 +37,4 @@ Master branch contains the CDI TCK 4.0 * ide-configs - useful settings for Eclipse and Intellij IDEs * impl - The core set of tests, excluding those that depend on web and full platform containers * lang-model - A standalone test suite for the CDI language model; see its [README](./lang-model/README.adoc) -* web - The extra tests that depend on the web profile and full platform * README.md - this doc diff --git a/dist-build/README.adoc b/dist-build/README.adoc index bf4496ce02..6d8f10345f 100644 --- a/dist-build/README.adoc +++ b/dist-build/README.adoc @@ -42,7 +42,7 @@ porting-package-lib/ == Software Requirements -* A Java SE 11 runtime +* A Java SE 17 runtime * Maven 3.6.x + == Installation @@ -72,8 +72,6 @@ Run the tests: * Run embedded container tests: `mvn clean verify -f jboss-tck-runner/pom.xml` -* Run incontainer, full EE set [1800+ tests] - `mvn clean verify -Dincontainer -f jboss-tck-runner/pom.xml` * Run SE tests [30+ tests] `mvn clean verify -Dincontainer=se -f jboss-tck-runner/pom.xml` @@ -85,11 +83,11 @@ Then: * `mvn install -f $CDI_TCK_ROOT/artifacts/pom.xml` * `mvn -Dtck package -f $CDI_TCK_ROOT/weld/jboss-as/pom.xml` - to enable CDI Extension -* `mvn clean verify -Dincontainer -Dcdi.tck-4-0.version=${TCK_VERSION} -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml`` - to run the TCK against WildFly +* `mvn clean verify -Dincontainer -Dcdi.tck.version=${TCK_VERSION} -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml`` - to run the TCK against WildFly Alternatively, run against Weld in plane Java SE: -* `mvn clean verify -Dcdi.tck-4-0.version=${TCK_VERSION} -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml` +* `mvn clean verify -Dcdi.tck.version=${TCK_VERSION} -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml` == Where to file challenges diff --git a/dist-build/artifact-install.pom b/dist-build/artifact-install.pom index fddb0a881e..ec7bd4a268 100644 --- a/dist-build/artifact-install.pom +++ b/dist-build/artifact-install.pom @@ -109,38 +109,6 @@ - - install-cdi-tck-web-impl - package - - install-file - - - jakarta.enterprise - cdi-tck-web-impl - ${project.version} - jar - cdi-tck-web-impl-${project.version}.jar - true - - - - install-cdi-web-tck-suite - package - - install-file - - - jakarta.enterprise - cdi-tck-web-impl - ${project.version} - xml - suite - cdi-tck-web-impl-${project.version}-suite.xml - false - - - install-cdi-tck-lang-model package diff --git a/dist-build/jboss-runner.pom b/dist-build/jboss-runner.pom index 9a73bb04ce..1e08576052 100644 --- a/dist-build/jboss-runner.pom +++ b/dist-build/jboss-runner.pom @@ -69,7 +69,7 @@ jakarta.enterprise cdi-tck-api - ${cdi.tck-4-0.version} + ${cdi.tck.version} jakarta.el @@ -81,7 +81,7 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck-4-0.version} + ${cdi.tck.version} xml suite test @@ -112,7 +112,7 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck-4-0.version} + ${cdi.tck.version} test @@ -187,7 +187,6 @@ jakarta.enterprise:cdi-tck-core-impl - jakarta.enterprise:cdi-tck-web-impl @@ -267,21 +266,12 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck-4-0.version} + ${cdi.tck.version} xml suite false tck-core-suite.xml - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck-4-0.version} - xml - suite - false - tck-web-suite.xml - target/suites false @@ -364,205 +354,6 @@ - - - incontainer - - false - - incontainer - true - - - - se - - - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck-4-0.version} - xml - suite - test - - - jakarta.el - jakarta.el-api - - - jakarta.faces - jakarta.faces-api - - - container-se-api - org.jboss.arquillian.container - - - org.jboss.test-audit - jboss-test-audit-api - - - org.jboss.test-audit - jboss-test-audit-impl - - - - - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck-4-0.version} - test - - - jakarta.el - jakarta.el-api - - - jakarta.faces - jakarta.faces-api - - - container-se-api - org.jboss.arquillian.container - - - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - test - - - org.jboss.arquillian.core - arquillian-core-spi - - - org.jboss.arquillian.core - arquillian-core-api - - - org.jboss.logmanager - log4j-jboss-logmanager - - - - - org.jboss.arquillian.protocol - arquillian-protocol-servlet-jakarta - ${arquillian.version} - test - - - log4j - log4j - - - - - - src/test/resources - - - src/test/wildfly8 - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-jboss-home-is-set - - enforce - - - - - JBOSS_HOME - Environment variable "JBOSS_HOME" must be set in order to execute in-container tests. Please configure it so that it points to your WildFly installation. - - - true - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-resources - - validate - - copy-resources - - - ${JBOSS_HOME}/standalone/configuration - - - ${JBOSS_HOME}/docs/examples/configs - standalone-activemq-embedded.xml - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - ${excluded.groups} - - - --add-exports=java.desktop/sun.awt=ALL-UNNAMED - --add-opens=java.base/java.io=ALL-UNNAMED - --add-opens=java.base/java.lang=ALL-UNNAMED - --add-opens=java.base/java.lang.invoke=ALL-UNNAMED - --add-opens=java.base/java.security=ALL-UNNAMED - --add-opens=java.base/java.util=ALL-UNNAMED - --add-opens=java.management/javax.management=ALL-UNNAMED - --add-opens=java.naming/javax.naming=ALL-UNNAMED - - - - - surefire.testng.verbose - 0 - - - - - wildfly-23 - - target/dependency/lib - java:jboss/datasources/ExampleDS - - - ${jacoco.agent} - - - - - ${surefire.plugin.jdk17.args} - - - - target/suites/tck-web-suite.xml - - - - - - weld-se @@ -636,21 +427,6 @@ - - - webprofile - - false - - webprofile - true - - - - javaee-full,se - - - diff --git a/dist-build/lang-model-tck-runner/pom.xml b/dist-build/lang-model-tck-runner/pom.xml index d08639778e..53a5757411 100644 --- a/dist-build/lang-model-tck-runner/pom.xml +++ b/dist-build/lang-model-tck-runner/pom.xml @@ -10,7 +10,6 @@ 11 11 - 4.0.4 5.0.0.SP2 @@ -19,7 +18,7 @@ jakarta.enterprise cdi-tck-lang-model - ${cdi.tck-4-0.version} + ${project.version} org.jboss.weld @@ -42,9 +41,11 @@ 3.0.2.Final - org.jboss.shrinkwrap - shrinkwrap-api - 1.2.6 + org.jboss.arquillian + arquillian-bom + ${arquillian.version} + import + pom org.wildfly.arquillian @@ -54,7 +55,7 @@ org.jboss.arquillian.protocol arquillian-protocol-servlet-jakarta - 1.7.0.Alpha10 + ${arquillian.version} log4j @@ -81,7 +82,7 @@ org.jboss.arquillian.junit arquillian-junit-container - 1.7.0.Alpha10 + ${arquillian.version} test diff --git a/dist-build/libs/pom.xml b/dist-build/libs/pom.xml index 5270547e7a..1243e89c7d 100644 --- a/dist-build/libs/pom.xml +++ b/dist-build/libs/pom.xml @@ -73,11 +73,6 @@ cdi-tck-core-impl ${cdi.tck.version} - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck.version} - \ No newline at end of file diff --git a/dist-build/pom.xml b/dist-build/pom.xml index 4d6f30a9b1..526614d82d 100644 --- a/dist-build/pom.xml +++ b/dist-build/pom.xml @@ -21,33 +21,33 @@ jakarta.enterprise cdi-tck-parent - ${cdi.tck.version} + ${project.version} pom jakarta.enterprise cdi-tck-api - ${cdi.tck.version} + ${project.version} true jakarta.enterprise cdi-tck-api - ${cdi.tck.version} + ${project.version} sources true jakarta.enterprise cdi-tck-api - ${cdi.tck.version} + ${project.version} javadoc true jakarta.enterprise cdi-tck-reference-guide - ${cdi.tck.version} + ${project.version} zip true @@ -55,13 +55,13 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck.version} + ${project.version} true jakarta.enterprise cdi-tck-core-impl - ${cdi.tck.version} + ${project.version} sources true @@ -129,76 +129,6 @@ sig true - - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck.version} - true - - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck.version} - sources - true - - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck.version} - audit-cdi - xml - true - - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck.version} - audit-mb - xml - true - - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck.version} - audit-int - xml - true - - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck.version} - suite - xml - true - - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck.version} - coverage-cdi - html - true - - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck.version} - coverage-mb - html - true - - - jakarta.enterprise - cdi-tck-web-impl - ${cdi.tck.version} - coverage-interceptors - html - true - jakarta.enterprise cdi-tck-lang-model diff --git a/dist-build/src/main/assembly/assembly.xml b/dist-build/src/main/assembly/assembly.xml index 477db70f83..b9c688fe1c 100644 --- a/dist-build/src/main/assembly/assembly.xml +++ b/dist-build/src/main/assembly/assembly.xml @@ -51,7 +51,6 @@ jakarta.enterprise:cdi-tck-parent jakarta.enterprise:cdi-tck-core-impl - jakarta.enterprise:cdi-tck-web-impl jakarta.enterprise:cdi-tck-api jakarta.enterprise:cdi-tck-ext-lib jakarta.enterprise:cdi-tck-lang-model diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index 0a8565b0f9..f6025b0ad0 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -16,10 +16,10 @@ - 2.2.2 + 2.2.5 2.3.10 cdi-tck-reference-guide.pdf - 4.0 + 4.1 @@ -42,7 +42,17 @@ cdi-tck-reference-guide.asciidoc + ${revnumber} ${project.build.sourceDirectory} + coderay + + ${arquillian.version} + ${testng.version} + ${weld.version} + 33 + 7.0.x + Jakarta EE 11 + @@ -58,11 +68,9 @@ ${project.build.directory}/generated-docs-pdf cdi-tck-reference-guide.pdf - ${revnumber} images ${project.basedir}/src/main/style cditck - coderay font @@ -82,8 +90,6 @@ ${project.build.directory}/generated-docs-html cdi-tck-reference-guide.html - ${revnumber} - coderay ${project.basedir}/src/main/asciidoc/images left diff --git a/doc/reference/src/main/asciidoc/cdi-tck-reference-guide.asciidoc b/doc/reference/src/main/asciidoc/cdi-tck-reference-guide.asciidoc index fcda0884fe..f25ff01a33 100644 --- a/doc/reference/src/main/asciidoc/cdi-tck-reference-guide.asciidoc +++ b/doc/reference/src/main/asciidoc/cdi-tck-reference-guide.asciidoc @@ -13,7 +13,7 @@ This guide describes how to download, install, configure, and run the Technology Compatibility Kit (TCK) used to verify the compatibility of an implementation of the Jakarta Contexts and Dependency Injection. -The CDI TCK is built atop TestNG framework and Arquillian platform. The CDI TCK uses Arquillian version _1.7.0.Alpha10_ to execute the test suite. +The CDI TCK is built atop TestNG framework and Arquillian platform. The CDI TCK uses Arquillian version _{arquillian-version}_ to execute the test suite. The CDI TCK is provided under link:$$http://www.apache.org/licenses/LICENSE-2.0$$[Apache Public License 2.0]. diff --git a/doc/reference/src/main/asciidoc/configuration.asciidoc b/doc/reference/src/main/asciidoc/configuration.asciidoc index 99e4b7c770..5bc24deb77 100644 --- a/doc/reference/src/main/asciidoc/configuration.asciidoc +++ b/doc/reference/src/main/asciidoc/configuration.asciidoc @@ -98,43 +98,6 @@ You can configure the CDI TCK to just run tests related to the CDI Lite specific ---- -=== Using the CDI TCK with the Jakarta EE Web Profile - -You can configure the CDI TCK to just run tests appropriate to the Jakarta EE Web Profile by excluding TestNG group _javaee-full_,_se_ e.g. via a maven-surefire-plugin configuration like: - -[source.XML, xml] ----- - - org.apache.maven.plugins - maven-surefire-plugin - - javaee-full,se - - jakarta.enterprise:cdi-tck-core-impl - jakarta.enterprise:cdi-tck-web-impl - - - ----- - -=== Using the CDI TCK with the Jakarta EE Full Platform - -You can configure the CDI TCK to just run tests appropriate to the Jakarta EE Full Platform by excluding TestNG group _se_ e.g. via a maven-surefire-plugin configuration like: - -[source.XML, xml] ----- - - org.apache.maven.plugins - maven-surefire-plugin - - se - - jakarta.enterprise:cdi-tck-core-impl - jakarta.enterprise:cdi-tck-web-impl - - - ----- === Using the CDI TCK with the Java SE @@ -210,11 +173,8 @@ It's beyond the scope of this guide to describe in how to set up your build envi The TCK makes use of the Java 1.4 keyword +assert+; you must ensure that the JVM used to run the application server is started with assertions enabled. See link:$$http://docs.oracle.com/javase/7/docs/technotes/guides/language/assert.html#enable-disable$$[Programming With Assertions] for more information on how to enable assertions. -Tests within the _jms_ test group require some basic Java Message Service configuration. A connection factory, a queue destination for PTP messaging domain and a topic destination for pub/sub messaging domain must be available via JNDI lookup. The corresponding JNDI names are specified with configuration properties - see <>. - -Tests within the _persistence_ test group require basic data source configuration. The data source has to be valid and JTA-based. The JNDI name of the DataSource is specified with configuration property - see <>. -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 35b9d50673..4c96676e4d 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,6 @@ ext-lib lang-model impl - web @@ -116,7 +115,7 @@ 2.9.1 ${project.version} - 5.1.2.Final + 6.0.0.Alpha1 @@ -183,30 +182,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 From db4bf952205592a7b571e5ea9cd9ff88d84ff953 Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Tue, 13 Feb 2024 13:59:40 -0600 Subject: [PATCH 2/5] Restore the ability to run against a different TCK version using the cdi.tck.version property Signed-off-by: Scott M Stark --- dist-build/README.adoc | 11 ++++++++--- dist-build/jboss-runner.pom | 1 + dist-build/libs/pom.xml | 4 ++-- dist-build/pom.xml | 20 ++++++++++---------- dist-build/src/main/assembly/assembly.xml | 2 +- pom.xml | 1 - 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dist-build/README.adoc b/dist-build/README.adoc index 6d8f10345f..479722d8e0 100644 --- a/dist-build/README.adoc +++ b/dist-build/README.adoc @@ -75,6 +75,9 @@ Run the tests: * Run SE tests [30+ tests] `mvn clean verify -Dincontainer=se -f jboss-tck-runner/pom.xml` +To run with an alternate version of the CDI TCK, you can pass in the cdi.tck.version property on the command line, e.g.: +`mvn -Dcdi.tck.version=4.1.1 clean verify -f jboss-tck-runner/pom.xml` + === Running the Language Model TCK against Wildfly / Weld Follow the `Configuration`` instructions as for the main TCK above. @@ -83,11 +86,13 @@ Then: * `mvn install -f $CDI_TCK_ROOT/artifacts/pom.xml` * `mvn -Dtck package -f $CDI_TCK_ROOT/weld/jboss-as/pom.xml` - to enable CDI Extension -* `mvn clean verify -Dincontainer -Dcdi.tck.version=${TCK_VERSION} -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml`` - to run the TCK against WildFly +* `mvn clean verify -Dincontainer -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml`` - to run the TCK against WildFly + +Alternatively, run against Weld in plain Java SE: -Alternatively, run against Weld in plane Java SE: +* `mvn clean verify -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml` -* `mvn clean verify -Dcdi.tck.version=${TCK_VERSION} -f $CDI_TCK_ROOT/weld/lang-model-tck-runner/pom.xml` +You can specify the `cdi.tck.version` property on the command line to override the version from the CDI TCK bundle distribution. == Where to file challenges diff --git a/dist-build/jboss-runner.pom b/dist-build/jboss-runner.pom index 1e08576052..664d392363 100644 --- a/dist-build/jboss-runner.pom +++ b/dist-build/jboss-runner.pom @@ -22,6 +22,7 @@ 2.50.0 + ${project.version} diff --git a/dist-build/libs/pom.xml b/dist-build/libs/pom.xml index 1243e89c7d..972b482dbb 100644 --- a/dist-build/libs/pom.xml +++ b/dist-build/libs/pom.xml @@ -66,12 +66,12 @@ jakarta.enterprise cdi-tck-api - ${cdi.tck.version} + ${project.version} jakarta.enterprise cdi-tck-core-impl - ${cdi.tck.version} + ${project.version} diff --git a/dist-build/pom.xml b/dist-build/pom.xml index 526614d82d..538b762baf 100644 --- a/dist-build/pom.xml +++ b/dist-build/pom.xml @@ -68,7 +68,7 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck.version} + ${project.version} audit-cdi xml true @@ -76,7 +76,7 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck.version} + ${project.version} audit-mb xml true @@ -84,7 +84,7 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck.version} + ${project.version} audit-int xml true @@ -92,7 +92,7 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck.version} + ${project.version} suite xml true @@ -100,7 +100,7 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck.version} + ${project.version} coverage-cdi html true @@ -108,7 +108,7 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck.version} + ${project.version} coverage-mb html true @@ -116,7 +116,7 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck.version} + ${project.version} coverage-interceptors html true @@ -124,7 +124,7 @@ jakarta.enterprise cdi-tck-core-impl - ${cdi.tck.version} + ${project.version} sigtest-jdk11 sig true @@ -132,7 +132,7 @@ jakarta.enterprise cdi-tck-lang-model - ${cdi.tck.version} + ${project.version} true @@ -169,7 +169,7 @@ src/main/assembly/assembly.xml - cdi-tck-${cdi.tck.version} + cdi-tck-${project.version} diff --git a/dist-build/src/main/assembly/assembly.xml b/dist-build/src/main/assembly/assembly.xml index b9c688fe1c..0a7f6f9cf8 100644 --- a/dist-build/src/main/assembly/assembly.xml +++ b/dist-build/src/main/assembly/assembly.xml @@ -3,7 +3,7 @@ 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"> dist - cdi-tck-${cdi.tck.version} + cdi-tck-${project.version} zip diff --git a/pom.xml b/pom.xml index 4c96676e4d..346655a442 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,6 @@ 4.7.2 2.9.1 - ${project.version} 6.0.0.Alpha1 From c67b5914b90b3c2d90a9cb4e0fb75beaaa874770 Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Sat, 17 Feb 2024 00:32:09 -0600 Subject: [PATCH 3/5] Update the sigtest plugin, signature file and docs Signed-off-by: Scott M Stark --- dist-build/lang-model-tck-runner/pom.xml | 2 +- .../src/main/asciidoc/sigtest.asciidoc | 73 +++++++++---------- impl/pom.xml | 8 +- .../{cdi-api-jdk11.sig => cdi-api-jdk17.sig} | 55 +++++++++++++- impl/src/main/resources/sigtest-pom.xml | 24 +++--- impl/src/main/resources/sigtest-weld-pom.xml | 14 ++-- pom.xml | 6 +- 7 files changed, 116 insertions(+), 66 deletions(-) rename impl/src/main/resources/{cdi-api-jdk11.sig => cdi-api-jdk17.sig} (97%) diff --git a/dist-build/lang-model-tck-runner/pom.xml b/dist-build/lang-model-tck-runner/pom.xml index 53a5757411..3bcf77b895 100644 --- a/dist-build/lang-model-tck-runner/pom.xml +++ b/dist-build/lang-model-tck-runner/pom.xml @@ -10,7 +10,7 @@ 11 11 - 5.0.0.SP2 + 6.0.0.Alpha1 diff --git a/doc/reference/src/main/asciidoc/sigtest.asciidoc b/doc/reference/src/main/asciidoc/sigtest.asciidoc index bb54d25131..1aea31708b 100644 --- a/doc/reference/src/main/asciidoc/sigtest.asciidoc +++ b/doc/reference/src/main/asciidoc/sigtest.asciidoc @@ -12,18 +12,18 @@ The sigtest plugin is availble from Maven Central using a dependency like: ---- ... - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1 ---- The source for the sigtest plugin can be found here: -https://github.com/jtulach/netbeans-apitest +https://github.com/eclipse-ee4j/jakartaee-tck-tools/tree/master/tools/sigtest === Running the signature test To run the signature test, use a pom file like that found in -https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigtest-pom.xml and shown here: +https://github.com/jakartaee/cdi-tck/blob/master/impl/src/main/resources/sigtest-pom.xml and shown here: [source, xml] ---- @@ -34,21 +34,21 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt org.eclipse.ee4j project - 1.0.6 + 1.0.9 jakarta.enterprise cdi-tck-sigtest - 4.0 + 4.1 CDI TCK Signature Tests CDI TCK Signature test validation of CDI dependent API jars - 2.1.0 + 3.0.0-M1 + 2.2.0-M1 2.0.1 - 2.1.0 - 5.0.0 - 4.0.1 + 5.0.1 + 4.1.0.Beta1 @@ -56,7 +56,7 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt jakarta.annotation jakarta.annotation-api - ${annotation.api.version} + ${annotations.api.version} jakarta.el @@ -66,7 +66,7 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt jakarta.interceptor jakarta.interceptor-api - ${interceptor.api.version} + ${interceptors.api.version} jakarta.inject @@ -106,9 +106,9 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1 sigtest @@ -119,8 +119,8 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt - cdi-api-jdk11.sig - jakarta.decorator,jakarta.enterprise,jakarta.interceptor + cdi-api-jdk17.sig + jakarta.decorator,jakarta.enterprise.**,jakarta.interceptor target/classes cdi-sig-report.txt @@ -133,19 +133,15 @@ Your version should specify the dependencies on these jars as used in your compa [source, console] ---- -Scotts-iMacPro:resources starksm$ mvn -f sigtest-pom.xml verify -[INFO] Scanning for projects... -[INFO] -[INFO] -----------------< jakarta.enterprise:cdi-tck-sigtest >----------------- -[INFO] Building CDI TCK Signature Tests 4.0 -[INFO] --------------------------------[ jar ]--------------------------------- -[INFO] +(base) starksm@Scotts-Mac-Studio impl % mvn -Djdk.major.version=21 -Dsignature process-resources ... -[INFO] --- sigtest-maven-plugin:1.5:check (sigtest) @ cdi-tck-sigtest --- -[INFO] Packages: jakarta.decorator,jakarta.enterprise +[INFO] --- sigtest:2.1:check (sigtest) @ cdi-tck-sigtest --- +[INFO] Packages: jakarta.decorator,jakarta.enterprise.**,jakarta.interceptor +Feb 16, 2024 11:42:25 PM com.sun.tdk.signaturetest.SignatureTest parseParameters +INFO: SignatureTest.args: [-FileName, /Users/starksm/Dev/Jakarta/rh-cdi-tck/impl/src/main/resources/cdi-api-jdk17.sig, -static, -b, -Mode, bin, -ApiVersion, 4.1, -PackageWithoutSubpackages, jakarta.decorator, -Package, jakarta.enterprise, -PackageWithoutSubpackages, jakarta.interceptor, -BootCP, -Classpath, /Users/starksm/Dev/Jakarta/rh-cdi-tck/impl/src/main/resources/target/classes:/Users/starksm/.m2/repository/jakarta/annotation/jakarta.annotation-api/3.0.0-M1/jakarta.annotation-api-3.0.0-M1.jar:/Users/starksm/.m2/repository/jakarta/el/jakarta.el-api/5.0.1/jakarta.el-api-5.0.1.jar:/Users/starksm/.m2/repository/jakarta/interceptor/jakarta.interceptor-api/2.2.0-M1/jakarta.interceptor-api-2.2.0-M1.jar:/Users/starksm/.m2/repository/jakarta/inject/jakarta.inject-api/2.0.1/jakarta.inject-api-2.0.1.jar:/Users/starksm/.m2/repository/jakarta/enterprise/jakarta.enterprise.lang-model/4.1.0.Beta1/jakarta.enterprise.lang-model-4.1.0.Beta1.jar:/Users/starksm/.m2/repository/jakarta/enterprise/jakarta.enterprise.cdi-api/4.1.0.Beta1/jakarta.enterprise.cdi-api-4.1.0.Beta1.jar] [INFO] SignatureTest report -Base version: 4.0.0-SNAPSHOT -Tested version: 4.0 +Base version: 4.1.0-SNAPSHOT +Tested version: 4.1 Check mode: bin [throws removed] Constant checking: on @@ -154,13 +150,14 @@ Warning: The return type java.lang.reflect.Member can't be resolved Warning: The return type java.lang.reflect.Member can't be resolved -[INFO] /Users/starksm/Dev/JBoss/Jakarta/cdi-tck/impl/src/main/resources/cdi-sig-report.txt: 0 failures in /Users/starksm/Dev/JBoss/Jakarta/cdi-tck/impl/src/main/resources/cdi-api-jdk11.sig +[INFO] /Users/starksm/Dev/Jakarta/rh-cdi-tck/impl/src/main/resources/cdi-sig-report.txt: 0 failures in /Users/starksm/Dev/Jakarta/rh-cdi-tck/impl/src/main/resources/cdi-api-jdk17.sig [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ -[INFO] Total time: 1.941 s -[INFO] Finished at: 2021-12-13T11:38:06-06:00 +[INFO] Total time: 2.021 s +[INFO] Finished at: 2024-02-16T23:42:25-06:00 [INFO] ------------------------------------------------------------------------ + ---- You can ignore the following warnings: @@ -169,7 +166,7 @@ You can ignore the following warnings: The important thing is that the mvn version shows "BUILD SUCCESS". Another example that just specifies a compatible implementation test as the dependency to validate the API artifact signatures from the transitive dependencies is pom file like that found in -https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigtest-weld-pom.xml and shown here: +https://github.com/jakartaee/cdi-tck/blob/master/impl/src/main/resources/sigtest-weld-pom.xml and shown here: [source, xml] ---- @@ -180,7 +177,7 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt org.eclipse.ee4j project - 1.0.6 + 1.0.9 jakarta.enterprise @@ -190,7 +187,7 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt CDI TCK Signature test validation of CDI dependent API jars - 5.0.0.CR2 + 6.0.0.Alpha2 @@ -224,9 +221,9 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1 sigtest @@ -237,10 +234,10 @@ https://github.com/eclipse-ee4j/cdi-tck/blob/master/impl/src/main/resources/sigt - cdi-api-jdk11.sig - jakarta.decorator,jakarta.enterprise,jakarta.interceptor + cdi-api-jdk17.sig + jakarta.decorator,jakarta.enterprise.**,jakarta.interceptor target/classes - cdi-sig-report.txt + cdi-sig-report.xml diff --git a/impl/pom.xml b/impl/pom.xml index 5467ee7bb6..32aee543f8 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -359,8 +359,8 @@ - - 11 + + 17 @@ -402,13 +402,14 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin generate + process-resources @@ -425,6 +426,7 @@ jakarta.enterprise.inject.se, jakarta.enterprise.inject.spi, jakarta.enterprise.inject.spi.configurator, + jakarta.enterprise.invoke, jakarta.enterprise.util, jakarta.enterprise.lang.model, jakarta.enterprise.lang.model.declarations, diff --git a/impl/src/main/resources/cdi-api-jdk11.sig b/impl/src/main/resources/cdi-api-jdk17.sig similarity index 97% rename from impl/src/main/resources/cdi-api-jdk11.sig rename to impl/src/main/resources/cdi-api-jdk17.sig index 21f901e950..c0cddabf84 100644 --- a/impl/src/main/resources/cdi-api-jdk11.sig +++ b/impl/src/main/resources/cdi-api-jdk17.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 4.0.0-SNAPSHOT +#Version 4.1.0-SNAPSHOT CLSS public abstract interface !annotation jakarta.decorator.Decorator anno 0 jakarta.enterprise.inject.Stereotype() @@ -14,6 +14,8 @@ CLSS public abstract interface !annotation jakarta.decorator.Delegate anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[FIELD, PARAMETER]) intf java.lang.annotation.Annotation +CLSS abstract interface jakarta.decorator.package-info + CLSS public abstract interface !annotation jakarta.enterprise.context.ApplicationScoped anno 0 jakarta.enterprise.context.NormalScope(boolean passivating=false) anno 0 java.lang.annotation.Documented() @@ -221,6 +223,8 @@ CLSS public abstract interface jakarta.enterprise.context.control.RequestContext meth public abstract boolean activate() meth public abstract void deactivate() +CLSS abstract interface jakarta.enterprise.context.package-info + CLSS public abstract interface jakarta.enterprise.context.spi.AlterableContext intf jakarta.enterprise.context.spi.Context meth public abstract void destroy(jakarta.enterprise.context.spi.Contextual) @@ -239,6 +243,8 @@ CLSS public abstract interface jakarta.enterprise.context.spi.CreationalContext< meth public abstract void push({jakarta.enterprise.context.spi.CreationalContext%0}) meth public abstract void release() +CLSS abstract interface jakarta.enterprise.context.spi.package-info + CLSS public abstract interface jakarta.enterprise.event.Event<%0 extends java.lang.Object> meth public abstract !varargs <%0 extends {jakarta.enterprise.event.Event%0}> jakarta.enterprise.event.Event<{%%0}> select(jakarta.enterprise.util.TypeLiteral<{%%0}>,java.lang.annotation.Annotation[]) meth public abstract !varargs <%0 extends {jakarta.enterprise.event.Event%0}> jakarta.enterprise.event.Event<{%%0}> select(java.lang.Class<{%%0}>,java.lang.annotation.Annotation[]) @@ -309,6 +315,8 @@ meth public static jakarta.enterprise.event.TransactionPhase valueOf(java.lang.S meth public static jakarta.enterprise.event.TransactionPhase[] values() supr java.lang.Enum +CLSS abstract interface jakarta.enterprise.event.package-info + CLSS public abstract interface !annotation jakarta.enterprise.inject.Alternative anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) @@ -644,6 +652,12 @@ CLSS public abstract interface jakarta.enterprise.inject.build.compatible.spi.Bu intf jakarta.enterprise.inject.spi.Prioritized meth public abstract jakarta.enterprise.inject.build.compatible.spi.AnnotationBuilderFactory annotationBuilderFactory() +CLSS public final jakarta.enterprise.inject.build.compatible.spi.BuildServicesResolver +cons public init() +meth public static void setBuildServices(jakarta.enterprise.inject.build.compatible.spi.BuildServices) +supr java.lang.Object +hfds configuredBuildServices,discoveredBuildServices,lock + CLSS public abstract interface jakarta.enterprise.inject.build.compatible.spi.ClassConfig intf jakarta.enterprise.inject.build.compatible.spi.DeclarationConfig meth public abstract jakarta.enterprise.inject.build.compatible.spi.ClassConfig addAnnotation(jakarta.enterprise.lang.model.AnnotationInfo) @@ -702,6 +716,11 @@ meth public abstract java.util.Collection createInvoker(jakarta.enterprise.inject.build.compatible.spi.BeanInfo,jakarta.enterprise.lang.model.declarations.MethodInfo) + +CLSS public abstract interface jakarta.enterprise.inject.build.compatible.spi.InvokerInfo + CLSS public abstract interface jakarta.enterprise.inject.build.compatible.spi.Messages meth public abstract void error(java.lang.Exception) meth public abstract void error(java.lang.String) @@ -813,6 +832,8 @@ meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBea meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,double[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,int) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,int[]) +meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,jakarta.enterprise.inject.build.compatible.spi.InvokerInfo) +meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,jakarta.enterprise.inject.build.compatible.spi.InvokerInfo[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.AnnotationInfo) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.AnnotationInfo[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.declarations.ClassInfo) @@ -858,6 +879,8 @@ meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObs meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,double[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,int) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,int[]) +meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,jakarta.enterprise.inject.build.compatible.spi.InvokerInfo) +meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,jakarta.enterprise.inject.build.compatible.spi.InvokerInfo[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.AnnotationInfo) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.AnnotationInfo[]) meth public abstract jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder<{jakarta.enterprise.inject.build.compatible.spi.SyntheticObserverBuilder%0}> withParam(java.lang.String,jakarta.enterprise.lang.model.declarations.ClassInfo) @@ -892,6 +915,8 @@ CLSS public abstract interface !annotation jakarta.enterprise.inject.build.compa anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD]) intf java.lang.annotation.Annotation +CLSS abstract interface jakarta.enterprise.inject.build.compatible.spi.package-info + CLSS public final jakarta.enterprise.inject.literal.InjectLiteral cons public init() fld public final static jakarta.enterprise.inject.literal.InjectLiteral INSTANCE @@ -1039,6 +1064,8 @@ meth public abstract !varargs java.util.Set jakarta.enterprise.context.spi.CreationalContext<{%%0}> createCreationalContext(jakarta.enterprise.context.spi.Contextual<{%%0}>) meth public abstract <%0 extends java.lang.Object> jakarta.enterprise.inject.spi.Bean resolve(java.util.Set>) meth public abstract boolean isInterceptorBinding(java.lang.Class) +meth public abstract boolean isMatchingBean(java.util.Set,java.util.Set,java.lang.reflect.Type,java.util.Set) +meth public abstract boolean isMatchingEvent(java.lang.reflect.Type,java.util.Set,java.lang.reflect.Type,java.util.Set) meth public abstract boolean isNormalScope(java.lang.Class) meth public abstract boolean isQualifier(java.lang.Class) meth public abstract boolean isScope(java.lang.Class) @@ -1047,11 +1074,11 @@ meth public abstract jakarta.enterprise.context.spi.Context getContext(java.lang meth public abstract jakarta.enterprise.event.Event getEvent() meth public abstract jakarta.enterprise.inject.Instance createInstance() meth public abstract java.lang.Object getReference(jakarta.enterprise.inject.spi.Bean,java.lang.reflect.Type,jakarta.enterprise.context.spi.CreationalContext) +meth public abstract java.util.Collection getContexts(java.lang.Class) meth public abstract java.util.Set> getBeans(java.lang.String) CLSS public abstract interface jakarta.enterprise.inject.spi.BeanManager intf jakarta.enterprise.inject.spi.BeanContainer -meth public abstract !varargs <%0 extends java.lang.Object> java.util.Set> resolveObserverMethods({%%0},java.lang.annotation.Annotation[]) meth public abstract !varargs java.util.List> resolveDecorators(java.util.Set,java.lang.annotation.Annotation[]) meth public abstract <%0 extends jakarta.enterprise.inject.spi.Extension> {%%0} getExtension(java.lang.Class<{%%0}>) meth public abstract <%0 extends java.lang.Object, %1 extends java.lang.Object> jakarta.enterprise.inject.spi.Bean<{%%0}> createBean(jakarta.enterprise.inject.spi.BeanAttributes<{%%0}>,java.lang.Class<{%%1}>,jakarta.enterprise.inject.spi.ProducerFactory<{%%1}>) @@ -1068,7 +1095,9 @@ meth public abstract boolean isPassivatingScope(java.lang.Class getPassivationCapableBean(java.lang.String) meth public abstract jakarta.enterprise.inject.spi.BeanAttributes createBeanAttributes(jakarta.enterprise.inject.spi.AnnotatedMember) meth public abstract jakarta.enterprise.inject.spi.InjectionPoint createInjectionPoint(jakarta.enterprise.inject.spi.AnnotatedField) @@ -1238,6 +1267,7 @@ meth public abstract void setInjectionTarget(jakarta.enterprise.inject.spi.Injec CLSS public abstract interface jakarta.enterprise.inject.spi.ProcessManagedBean<%0 extends java.lang.Object> intf jakarta.enterprise.inject.spi.ProcessBean<{jakarta.enterprise.inject.spi.ProcessManagedBean%0}> meth public abstract jakarta.enterprise.inject.spi.AnnotatedType<{jakarta.enterprise.inject.spi.ProcessManagedBean%0}> getAnnotatedBeanClass() +meth public abstract jakarta.enterprise.invoke.InvokerBuilder> createInvoker(jakarta.enterprise.inject.spi.AnnotatedMethod) CLSS public abstract interface jakarta.enterprise.inject.spi.ProcessObserverMethod<%0 extends java.lang.Object, %1 extends java.lang.Object> meth public abstract jakarta.enterprise.inject.spi.AnnotatedMethod<{jakarta.enterprise.inject.spi.ProcessObserverMethod%1}> getAnnotatedMethod() @@ -1453,6 +1483,16 @@ CLSS public abstract interface jakarta.enterprise.inject.spi.configurator.Produc meth public abstract <%0 extends {jakarta.enterprise.inject.spi.configurator.ProducerConfigurator%0}> jakarta.enterprise.inject.spi.configurator.ProducerConfigurator<{jakarta.enterprise.inject.spi.configurator.ProducerConfigurator%0}> produceWith(java.util.function.Function,{%%0}>) meth public abstract jakarta.enterprise.inject.spi.configurator.ProducerConfigurator<{jakarta.enterprise.inject.spi.configurator.ProducerConfigurator%0}> disposeWith(java.util.function.Consumer<{jakarta.enterprise.inject.spi.configurator.ProducerConfigurator%0}>) +CLSS abstract interface jakarta.enterprise.inject.spi.package-info + +CLSS public abstract interface jakarta.enterprise.invoke.Invoker<%0 extends java.lang.Object, %1 extends java.lang.Object> +meth public abstract {jakarta.enterprise.invoke.Invoker%1} invoke({jakarta.enterprise.invoke.Invoker%0},java.lang.Object[]) throws java.lang.Exception + +CLSS public abstract interface jakarta.enterprise.invoke.InvokerBuilder<%0 extends java.lang.Object> +meth public abstract jakarta.enterprise.invoke.InvokerBuilder<{jakarta.enterprise.invoke.InvokerBuilder%0}> withArgumentLookup(int) +meth public abstract jakarta.enterprise.invoke.InvokerBuilder<{jakarta.enterprise.invoke.InvokerBuilder%0}> withInstanceLookup() +meth public abstract {jakarta.enterprise.invoke.InvokerBuilder%0} build() + CLSS public abstract interface jakarta.enterprise.lang.model.AnnotationInfo meth public abstract boolean hasMember(java.lang.String) meth public abstract jakarta.enterprise.lang.model.AnnotationMember member(java.lang.String) @@ -1637,6 +1677,10 @@ meth public abstract java.lang.String name() meth public jakarta.enterprise.lang.model.declarations.DeclarationInfo$Kind kind() meth public jakarta.enterprise.lang.model.declarations.RecordComponentInfo asRecordComponent() +CLSS abstract interface jakarta.enterprise.lang.model.declarations.package-info + +CLSS abstract interface jakarta.enterprise.lang.model.package-info + CLSS public abstract interface jakarta.enterprise.lang.model.types.ArrayType intf jakarta.enterprise.lang.model.types.Type meth public abstract jakarta.enterprise.lang.model.types.Type componentType() @@ -1743,6 +1787,8 @@ meth public abstract jakarta.enterprise.lang.model.types.Type upperBound() meth public jakarta.enterprise.lang.model.types.Type$Kind kind() meth public jakarta.enterprise.lang.model.types.WildcardType asWildcardType() +CLSS abstract interface jakarta.enterprise.lang.model.types.package-info + CLSS public abstract jakarta.enterprise.util.AnnotationLiteral<%0 extends java.lang.annotation.Annotation> cons protected init() intf java.io.Serializable @@ -1779,6 +1825,8 @@ meth public java.lang.String toString() supr java.lang.Object hfds actualType,serialVersionUID +CLSS abstract interface jakarta.enterprise.util.package-info + CLSS public abstract interface !annotation jakarta.inject.Inject anno 0 java.lang.annotation.Documented() anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) @@ -1867,6 +1915,8 @@ intf java.lang.annotation.Annotation meth public abstract java.lang.Class[] value() CLSS public abstract interface jakarta.interceptor.InvocationContext +meth public <%0 extends java.lang.annotation.Annotation> java.util.Set<{%%0}> getInterceptorBindings(java.lang.Class<{%%0}>) +meth public <%0 extends java.lang.annotation.Annotation> {%%0} getInterceptorBinding(java.lang.Class<{%%0}>) meth public abstract java.lang.Object getTarget() meth public abstract java.lang.Object getTimer() meth public abstract java.lang.Object proceed() throws java.lang.Exception @@ -1875,6 +1925,7 @@ meth public abstract java.lang.reflect.Constructor getConstructor() meth public abstract java.lang.reflect.Method getMethod() meth public abstract java.util.Map getContextData() meth public abstract void setParameters(java.lang.Object[]) +meth public java.util.Set getInterceptorBindings() CLSS public abstract interface java.io.Serializable diff --git a/impl/src/main/resources/sigtest-pom.xml b/impl/src/main/resources/sigtest-pom.xml index 5cdc5c7cd8..873f77d700 100644 --- a/impl/src/main/resources/sigtest-pom.xml +++ b/impl/src/main/resources/sigtest-pom.xml @@ -6,21 +6,21 @@ org.eclipse.ee4j project - 1.0.6 + 1.0.9 jakarta.enterprise cdi-tck-sigtest - 4.0 + 4.1 CDI TCK Signature Tests CDI TCK Signature test validation of CDI dependent API jars - 2.1.0 + 3.0.0-M1 + 2.2.0-M1 2.0.1 - 2.1.0 - 5.0.0 - 4.0.0-RC5 + 5.0.1 + 4.1.0.Beta1 @@ -28,7 +28,7 @@ jakarta.annotation jakarta.annotation-api - ${annotation.api.version} + ${annotations.api.version} jakarta.el @@ -38,7 +38,7 @@ jakarta.interceptor jakarta.interceptor-api - ${interceptor.api.version} + ${interceptors.api.version} jakarta.inject @@ -78,9 +78,9 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1 sigtest @@ -91,8 +91,8 @@ - cdi-api-jdk11.sig - jakarta.decorator,jakarta.enterprise,jakarta.interceptor + cdi-api-jdk17.sig + jakarta.decorator,jakarta.enterprise.**,jakarta.interceptor target/classes cdi-sig-report.txt diff --git a/impl/src/main/resources/sigtest-weld-pom.xml b/impl/src/main/resources/sigtest-weld-pom.xml index 0c7e711312..80f4b575d2 100644 --- a/impl/src/main/resources/sigtest-weld-pom.xml +++ b/impl/src/main/resources/sigtest-weld-pom.xml @@ -6,7 +6,7 @@ org.eclipse.ee4j project - 1.0.6 + 1.0.9 jakarta.enterprise @@ -16,7 +16,7 @@ CDI TCK Signature test validation of CDI dependent API jars - 5.0.0.CR2 + 6.0.0.Alpha2 @@ -50,9 +50,9 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1 sigtest @@ -63,10 +63,10 @@ - cdi-api-jdk11.sig - jakarta.decorator,jakarta.enterprise,jakarta.interceptor + cdi-api-jdk17.sig + jakarta.decorator,jakarta.enterprise.**,jakarta.interceptor target/classes - cdi-sig-report.txt + cdi-sig-report.xml diff --git a/pom.xml b/pom.xml index 346655a442..bab324ddc9 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ - 4.1.0-M1 + 4.1.0.Beta1 11 3.0.0-M1 @@ -220,9 +220,9 @@ - org.netbeans.tools + jakarta.tck sigtest-maven-plugin - 1.5 + 2.1 From 02d0e29ad619121979d291deb0bee312d8874d48 Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Sat, 17 Feb 2024 00:32:09 -0600 Subject: [PATCH 4/5] Update the sigtest plugin, signature file and docs Signed-off-by: Scott M Stark --- dist-build/pom.xml | 2 +- impl/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist-build/pom.xml b/dist-build/pom.xml index 538b762baf..b10e302a0a 100644 --- a/dist-build/pom.xml +++ b/dist-build/pom.xml @@ -125,7 +125,7 @@ jakarta.enterprise cdi-tck-core-impl ${project.version} - sigtest-jdk11 + sigtest-jdk17 sig true diff --git a/impl/pom.xml b/impl/pom.xml index 32aee543f8..1db5487666 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -147,7 +147,7 @@ ${basedir}/src/main/resources/cdi-api-jdk11.sig sig - sigtest-jdk11 + sigtest-jdk17 From 10955e9fd7056b48117abe25acbe38df7f9e7985 Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Sat, 17 Feb 2024 00:32:09 -0600 Subject: [PATCH 5/5] Update the sigtest plugin, signature file and docs Signed-off-by: Scott M Stark --- impl/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/impl/pom.xml b/impl/pom.xml index 1db5487666..1d71040345 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -145,7 +145,7 @@ audit-int - ${basedir}/src/main/resources/cdi-api-jdk11.sig + ${basedir}/src/main/resources/cdi-api-jdk17.sig sig sigtest-jdk17