Skip to content

Commit

Permalink
Updates for review feedback
Browse files Browse the repository at this point in the history
Signed-off-by: Scott M Stark <[email protected]>
  • Loading branch information
starksm64 committed Nov 14, 2024
1 parent 07e2f93 commit ba20a3f
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 63 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion core-profile-tck/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 3 additions & 5 deletions core-profile-tck/examples/README.adoc
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion core-profile-tck/examples/wf-core-tck-runner
Submodule wf-core-tck-runner deleted from 349ff6
24 changes: 24 additions & 0 deletions core-profile-tck/tck-dist/EFTL.adoc
Original file line number Diff line number Diff line change
@@ -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 <<url to this license>> "
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.
43 changes: 0 additions & 43 deletions core-profile-tck/tck-dist/EFTL.txt

This file was deleted.

10 changes: 6 additions & 4 deletions core-profile-tck/tck-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
<asciidoctorj.pdf.version>2.3.18</asciidoctorj.pdf.version>
<asciidoctorj.version>3.0.0</asciidoctorj.version>
<guide.name>core-profile-tck-reference-guide</guide.name>
<revnumber>11.0</revnumber>
<revmajor>11</revmajor>
</properties>

<dependencies>
Expand Down Expand Up @@ -113,8 +115,8 @@
<docinfo>true</docinfo>
<experimental>true</experimental>
<tck-version>${project.version}</tck-version>
<revnumber>10.0</revnumber>
<revmajor>10</revmajor>
<revnumber>${revnumber}</revnumber>
<revmajor>${revmajor}</revmajor>
<toc />
</attributes>
</configuration>
Expand All @@ -134,8 +136,8 @@
<docinfo>true</docinfo>
<experimental>true</experimental>
<tck-version>${project.version}</tck-version>
<revnumber>10.0</revnumber>
<revmajor>10</revmajor>
<revnumber>${revnumber}</revnumber>
<revmajor>${revmajor}</revmajor>
<toc />
</attributes>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.

7 changes: 5 additions & 2 deletions core-profile-tck/tck-dist/src/main/assembly/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<files>
<!-- This is the final EFTL license -->
<file>
<source>EFTL.txt</source>
<source>EFTL.adoc</source>
<destName>LICENSE</destName>
</file>
<file>
Expand All @@ -46,7 +46,10 @@
</file>
</files>
<fileSets>
<!-- The compatible implementation tck runner examples -->
<!-- The compatible implementation tck runner examples. The content of the examples directory
is now included in the tck dist during the release build by cloning example runner
repos. Submodules are no longer used.
-->
<fileSet>
<directory>${project.parent.basedir}/examples</directory>
<outputDirectory>examples</outputDirectory>
Expand Down

0 comments on commit ba20a3f

Please sign in to comment.