From ba20a3f9727bc7af9bceeb9990b9d2c948a21555 Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Thu, 14 Nov 2024 11:28:00 -0600 Subject: [PATCH] Updates for review feedback Signed-off-by: Scott M Stark --- .gitmodules | 3 -- core-profile-tck/README.adoc | 2 +- core-profile-tck/examples/README.adoc | 8 ++-- core-profile-tck/examples/wf-core-tck-runner | 1 - core-profile-tck/tck-dist/EFTL.adoc | 24 +++++++++++ core-profile-tck/tck-dist/EFTL.txt | 43 ------------------- core-profile-tck/tck-dist/pom.xml | 10 +++-- .../src/main/asciidoc/configuration.asciidoc | 4 +- .../src/main/asciidoc/installation.asciidoc | 2 +- .../src/main/asciidoc/introduction.asciidoc | 3 +- .../tck-dist/src/main/assembly/assembly.xml | 7 ++- 11 files changed, 44 insertions(+), 63 deletions(-) delete mode 160000 core-profile-tck/examples/wf-core-tck-runner create mode 100644 core-profile-tck/tck-dist/EFTL.adoc delete mode 100644 core-profile-tck/tck-dist/EFTL.txt diff --git a/.gitmodules b/.gitmodules index 29e2a5545a..e69de29bb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "core-profile-tck/examples/wf-core-tck-runner"] - path = core-profile-tck/examples/wf-core-tck-runner - url = https://github.com/wildfly/wildfly-tck-runners diff --git a/core-profile-tck/README.adoc b/core-profile-tck/README.adoc index 59986096ae..f069a15581 100644 --- a/core-profile-tck/README.adoc +++ b/core-profile-tck/README.adoc @@ -4,7 +4,7 @@ This is the repository for the Jakarta Core Profile TCK == Sources in GIT -Main branch contains the work-in-progress on Jakarta Core Profile TCK 10.0 +Main branch contains the work-in-progress on Jakarta Core Profile TCK 11.0 === Source Layout diff --git a/core-profile-tck/examples/README.adoc b/core-profile-tck/examples/README.adoc index dd09f5d375..da9fbbee97 100644 --- a/core-profile-tck/examples/README.adoc +++ b/core-profile-tck/examples/README.adoc @@ -1,9 +1,7 @@ = Example Jakarta Core Profile Compatibile Implementation TCK Configurations -This directory contains git submodules for Jakarta Core Profile compatible implementations TCK runner projects. To see the contents when cloning the core-profile-tck project, you either need to have used the `--recurse-submodule` option to clone, or you need to run `git submodule init` and `git submodule update` from within each subdirectory after the clone of core-profile-tck project to initialize and fetch the submodule project contents. +This directory contains example Core Profile TCK maven projects to run the TCK tests against an implementation. -When you are done making changes to your local branch and before switching to other git branches, remove the submodule (remote) repo from your local repo by running the `git submodule deinit wf-core-tck-runner` command from the `core-profile-tck/examples` folder. Removing the submodule (repo) will ensure that the submodule will not be used in the branches that you switch to. +As part of the release process, the following runner repositories are cloned: +https://github.com/wildfly/wildfly-tck-runners/tree/main/core-profile as wf-core-tck-runner -== Current Compatible Implementation TCK Runner Projects - -* wf-core-tck-runner - this submodule contains the Maven project for WildFly 27 diff --git a/core-profile-tck/examples/wf-core-tck-runner b/core-profile-tck/examples/wf-core-tck-runner deleted file mode 160000 index 349ff6312f..0000000000 --- a/core-profile-tck/examples/wf-core-tck-runner +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 349ff6312ffbbcd98e7f3e03374304e6e813e9e3 diff --git a/core-profile-tck/tck-dist/EFTL.adoc b/core-profile-tck/tck-dist/EFTL.adoc new file mode 100644 index 0000000000..97ff4a1a21 --- /dev/null +++ b/core-profile-tck/tck-dist/EFTL.adoc @@ -0,0 +1,24 @@ += Eclipse Foundation Specification License - v1.1 + +By using and/or copying this document, or the Eclipse Foundation document from which this statement is linked or incorporated by reference, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions: + +Permission to copy, and distribute the contents of this document, or the Eclipse Foundation document from which this statement is linked, in any medium for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the document, or portions thereof, that you use: + +* link or URL to the original Eclipse Foundation document. +* All existing copyright notices, or if one does not exist, a notice (hypertext is preferred, but a textual representation is permitted) of the form: "Copyright (c) [$date-of-document] Eclipse Foundation AISBL <> " + +Inclusion of the full text of this NOTICE must be provided. We request that authorship attribution be provided in any software, documents, or other items or products that you create pursuant to the implementation of the contents of this document, or any portion thereof. + +No right to create modifications or derivatives of Eclipse Foundation documents is granted pursuant to this license, except anyone may prepare and distribute derivative works and portions of this document in software that implements the specification, in supporting materials accompanying such software, and in documentation of such software, PROVIDED that all such works include the notice below. HOWEVER, the publication of derivative works of this document for use as a technical specification is expressly prohibited. + +The notice is: + +"Copyright (c) [$date-of-document] Eclipse Foundation AISBL. This software or document includes material copied from or derived from [title and URI of the Eclipse Foundation specification document]." + +== Disclaimers + +THIS DOCUMENT IS PROVIDED "AS IS," AND TO THE EXTENT PERMITTED BY APPLICABLE LAW THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION AISBL MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. + +TO THE EXTENT PERMITTED BY APPLICABLE LAW THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION AISBL WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF. + +The name and trademarks of the copyright holders or the Eclipse Foundation AISBL may NOT be used in advertising or publicity pertaining to this document or its contents without specific, written prior permission. Title to copyright in this document will at all times remain with copyright holders. \ No newline at end of file diff --git a/core-profile-tck/tck-dist/EFTL.txt b/core-profile-tck/tck-dist/EFTL.txt deleted file mode 100644 index ad9c941022..0000000000 --- a/core-profile-tck/tck-dist/EFTL.txt +++ /dev/null @@ -1,43 +0,0 @@ -Eclipse Foundation Technology Compatibility Kit License - v 1.0 -Copyright (c) 2018, Eclipse Foundation, Inc. and its licensors. - -Redistribution and use in binary form is permitted provided that the following conditions are met: - 1. Use of the Technology Compatibility Kit accompanying this license ( the “TCK”) and its documentation is permitted - solely for the purpose of testing compatibility of an implementation (the “Product”) of a specification - (the “Specification”) made available by the Eclipse Foundation, Inc. (“Eclipse”). - 2. Only those modifications expressly permitted by the TCK and its documentation are permitted. Except in these - limited circumstances, no modifications to the TCK are permitted under this license. - 3. A Product will be deemed to be “compatible” with the Specification if it fully and completely meets and satisfies - all requirements of the TCK. - 4. Before any claim of compatibility (or any similar claim suggesting compatibility) is made based on the TCK, the - testing party must: - a. use the TCK to demonstrate that the Product fully and completely meets and satisfies all requirements of the TCK; - b. make TCK test results showing full and complete satisfaction of all requirements of the TCK publicly - available on the testing party’s website and send a link to such test results to Eclipse at tck@eclipse.org; and - c. comply with any requirements stated in the Specification with regard to subsetting, supersetting, modifying - or extending the Specification in any Product claimed to be compatible with the Specification. - 5. The test results must be continuously available and the link must be live for at least as long as the Product is - available in the marketplace. - 6. The TCK may not be used as a basis for any statements of partial compatibility. The TCK may only be used as a - basis for true, factual statements of full compatibility of Products that fully meet and satisfy all requirements - of the TCK. - 7. A determination that a Product is compatible with the TCK does not, in itself, give rise to the right to use any - name, mark, logo associated with the TCK, Eclipse, or Eclipse’s contributors or licensors. - 8. Upon the request of Eclipse, a tester will retract any statements of compatibility (or any similar claim - suggesting compatibility) which Eclipse reasonably determines to be false or misleading or in violation of the - terms of this license. - 9. Redistribution of the TCK must be under this Eclipse Foundation Technology Compatibility Kit License and must - reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - 10. Neither the name, trademarks or logos of Eclipse, nor the names, trademarks or logos of its contributors or - licensors may be used to endorse or promote products tested with this software without specific prior written permission. - 11. The source code for the TCK accompanying this license is available from Eclipse. - -TO THE EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON- INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. TO THE EXTENT PERMITTED BY APPLICABLE LAW, -NEITHER THE COPYRIGHT OWNER OR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. diff --git a/core-profile-tck/tck-dist/pom.xml b/core-profile-tck/tck-dist/pom.xml index 2fea1b5126..6590e83705 100644 --- a/core-profile-tck/tck-dist/pom.xml +++ b/core-profile-tck/tck-dist/pom.xml @@ -28,6 +28,8 @@ 2.3.18 3.0.0 core-profile-tck-reference-guide + 11.0 + 11 @@ -113,8 +115,8 @@ true true ${project.version} - 10.0 - 10 + ${revnumber} + ${revmajor} @@ -134,8 +136,8 @@ true true ${project.version} - 10.0 - 10 + ${revnumber} + ${revmajor} diff --git a/core-profile-tck/tck-dist/src/main/asciidoc/configuration.asciidoc b/core-profile-tck/tck-dist/src/main/asciidoc/configuration.asciidoc index e483ec3ea3..4401e271aa 100644 --- a/core-profile-tck/tck-dist/src/main/asciidoc/configuration.asciidoc +++ b/core-profile-tck/tck-dist/src/main/asciidoc/configuration.asciidoc @@ -13,7 +13,7 @@ The various TCKs will have properties or configuration variables that need to be [NOTE] ==== -The JSON-B standalone TCK configuration example includes running the the tests with the system property `java.locale.providers` set to COMPAT. This addresses a known inconsistency in a test when run under both Java SE 11 and Java SE 17. +The JSON-B standalone TCK configuration example includes running the the tests with the system property `java.locale.providers` set to COMPAT. This addresses a known inconsistency in a test when run under both Java SE 17 and Java SE 21. ==== [NOTE] @@ -34,7 +34,7 @@ In the WildFly runner example these are set to `unused`. These properties are va Refer to the configuration section of the CDI, RESTful, JSON-P and JSON-B standalone TCK user guides for configuration specific to each TCK. The `examples` directory in the TCK distribution illustrates sample configuration setup using Maven. ==== Jakarta RESTful TCK Configuration -The Jakarta Core Profile TCK provides a JUnit 5 suite runner that excludes the tests tagged with `xml_binding`, `servlet` and `security` as these specifications are not part of the Core Profile. The examples/wf-core-tck-runner/rest-tck project contains a pom.xml that configure surefire to run the `ee.jakarta.tck.coreprofile.rs.CoreProfileRestTCKSuite` class which configures the Core Profile RESTful TCK test suite. +The Jakarta Core Profile TCK provides a JUnit 5 suite runner that excludes the tests tagged with `xml_binding`, `servlet` and `security` as these specifications are not part of the Core Profile. The https://github.com/wildfly/wildfly-tck-runners/tree/main/core-profile/rest-tck project contains a pom.xml that configure surefire to run the `ee.jakarta.tck.coreprofile.rs.CoreProfileRestTCKSuite` class which configures the Core Profile RESTful TCK test suite. [NOTE] diff --git a/core-profile-tck/tck-dist/src/main/asciidoc/installation.asciidoc b/core-profile-tck/tck-dist/src/main/asciidoc/installation.asciidoc index 8a73b9db4c..dc3ecab02f 100644 --- a/core-profile-tck/tck-dist/src/main/asciidoc/installation.asciidoc +++ b/core-profile-tck/tck-dist/src/main/asciidoc/installation.asciidoc @@ -31,7 +31,7 @@ The TCK requires the following software to be installed: * Maven 3.9 or newer -* A Jakarta EE {revmajor} implementation (e.g., WildFly 34.x) +* A Jakarta EE {revmajor} implementation (e.g., WildFly 34.x, Open Liberty 24.x) You should refer to EE {revmajor} implementation instructions for how to install the runtime environment. diff --git a/core-profile-tck/tck-dist/src/main/asciidoc/introduction.asciidoc b/core-profile-tck/tck-dist/src/main/asciidoc/introduction.asciidoc index 1e74e5b3bd..eb30eeb577 100644 --- a/core-profile-tck/tck-dist/src/main/asciidoc/introduction.asciidoc +++ b/core-profile-tck/tck-dist/src/main/asciidoc/introduction.asciidoc @@ -207,7 +207,7 @@ The test archives are built with ShrinkWrap, a Java API for creating archives. S This section lists the applicable requirements and specifications for the Jakarta Core Profile TCK. -* *Specification requirements* - Software requirements for a Jakarta Core Profile implementation include a Java SE 11 or newer compatible runtime. +* *Specification requirements* - Software requirements for a Jakarta Core Profile implementation include a Java SE 17 or newer compatible runtime. * *Jakarta Contexts and Dependency Injection API* - The Java API defined in the CDI specification and provided by the compatible implementation. @@ -242,4 +242,5 @@ The Core Profile TCK includes the following components: The Core Profile TCK has been tested on following platforms: * WildFly 34 Preview using Eclipse Temurin Java SE 17 and Eclipse Temurin Java SE 21 on Linux based operating systems. +* Open Liberty 24 Beta using IBM Semeru Runtime Certified Edition 17 and 21 on Linux based operating systems. diff --git a/core-profile-tck/tck-dist/src/main/assembly/assembly.xml b/core-profile-tck/tck-dist/src/main/assembly/assembly.xml index fac75820ab..dfd0f75d80 100644 --- a/core-profile-tck/tck-dist/src/main/assembly/assembly.xml +++ b/core-profile-tck/tck-dist/src/main/assembly/assembly.xml @@ -21,7 +21,7 @@ - EFTL.txt + EFTL.adoc LICENSE @@ -46,7 +46,10 @@ - + ${project.parent.basedir}/examples examples