tck ug fixes, correct CI, tool versions, removal of deployment requirements, removal of duplicities Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/tck/tck-docs/index.html b/tck/tck-docs/index.html index 1d6fbfe..d03992c 100644 --- a/tck/tck-docs/index.html +++ b/tck/tck-docs/index.html
@@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!-- - Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -62,14 +62,14 @@ Jakarta EE JSON Processing TCK, Version 2.1. In addition, the guide provides the rules you must comply with to pass the Jakarta EE JSON Processing TCK.</li> - <li>The <a href="assertions/JSONP2.0JavadocAssertions.html">Javadoc + <li>The <a href="assertions/JSONP2.1JavadocAssertions.html">Javadoc Assertion List</a> lists all the javadoc assertions that are tested by - the Jakarta EE JSON Processing 2.0 TCK.</li> + the Jakarta EE JSON Processing 2.1 TCK.</li> </ul> <hr> <p><cite><small></small></cite></p> <address><small> - Copyright � 2013, 2021 Oracle and/or its affiliates. All rights + Copyright © 2013, 2021 Oracle and/or its affiliates. All rights reserved. </small></address> <cite>
diff --git a/tck/tck-docs/userguide/src/main/jbake/content/attributes.conf b/tck/tck-docs/userguide/src/main/jbake/content/attributes.conf index aca3910..42525ec 100644 --- a/tck/tck-docs/userguide/src/main/jbake/content/attributes.conf +++ b/tck/tck-docs/userguide/src/main/jbake/content/attributes.conf
@@ -1,11 +1,11 @@ :TechnologyFullName: Jakarta JSON Processing :TechnologyShortName: JSON Processing :LegacyAcronym: JSONP -:ReleaseDate: December 2021 -:CopyrightDates: 2017, 2021 +:ReleaseDate: February 2022 +:CopyrightDates: 2017, 2022 :TechnologyVersion: 2.1 -:TechnologyRI: Eclipse JSON Processing 2.1.0 -:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.jsonp +:TechnologyRI: Eclipse Parsson 1.1.0 +:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.parsson :SpecificationURL: https://jakarta.ee/specifications/jsonp/2.1/ :TCKInquiryList: mailto:jsonp-dev@eclipse.org[jsonp-dev@eclipse.org] :SpecificationInquiryList: mailto:jsonp-dev@eclipse.org[jsonp-dev@eclipse.org] @@ -22,8 +22,10 @@ // for the technology. Used in config.inc. :TechnologyHomeEnv: JSONP_HOME // Java SE version required. -:SEversion: 11 +:SEversion: 11+ :JakartaEEVersion: 10.0 +:MavenVersion: 3.6.3+ +:JunitVersion: 5.7.2+ :jteFileName: <TS_HOME>/bin/ts.jte :excludeListFileName: tck-docs/TCK-Exclude-List.txt :TCKPackageName: jakarta-jsonp-tck-2.1.0.zip
diff --git a/tck/tck-docs/userguide/src/main/jbake/content/config.adoc b/tck/tck-docs/userguide/src/main/jbake/content/config.adoc index 5b0ec59..b8bcfb0 100644 --- a/tck/tck-docs/userguide/src/main/jbake/content/config.adoc +++ b/tck/tck-docs/userguide/src/main/jbake/content/config.adoc
@@ -84,7 +84,7 @@ 1. Set the following environment variables in your shell environment: - a. `JAVA_HOME` to the directory in which Java SE 8 or 11 is installed + a. `JAVA_HOME` to the directory in which Java SE {SEversion} is installed b. `M2_HOME` to the directory in which the Apache Maven build tool is installed. c. +{TechnologyHomeEnv}+ to the directory in which the {TechnologyShortName} {TechnologyVersion} CI has been installed @@ -95,12 +95,12 @@ pluggability tests to test the SPI provider interface. This property should only be set when running the pluggability tests. All other tests use the provider supplied with the {TechnologyShortName} {TechnologyVersion} implementation under test. - b. `jimage.dir` property is set to extract the JDK9+ modules for running the signature tests. + b. `jimage.dir` property is set to extract the Java SE {SEversion} modules for running the signature tests. 3. Set the below jars to the classpath a. JAR file for the {TechnologyShortName} {TechnologyVersion} API. + - `jakarta.json-2.1.0.jar`. - c. JUnit 5 jars (5.7.2+) + `jakarta.json-api.jar`. + c. JUnit 5 jars ({JunitVersion}) Maven cordinates : + [source,oac_no_warn] @@ -158,7 +158,7 @@ 1. Set the following environment variables in your shell environment: - a. `JAVA_HOME` to the directory in which Java SE 8 or 11 is installed + a. `JAVA_HOME` to the directory in which Java SE {SEversion} is installed b. `M2_HOME` to the directory in which the Apache Maven build tool is installed. c. +{TechnologyHomeEnv}+ to the directory in which the {TechnologyShortName} {TechnologyVersion} CI has been installed @@ -173,7 +173,7 @@ 3. Set the below jars to the classpath a. JAR file for the {TechnologyShortName} {TechnologyVersion} API. + - `jakarta.json-2.1.0.jar`. + `jakarta.json-api.jar`. c. JUnit 5 jars (5.7.2+) Maven cordinates : +
diff --git a/tck/tck-docs/userguide/src/main/jbake/content/debug.adoc b/tck/tck-docs/userguide/src/main/jbake/content/debug.adoc index 3aebb42..04e1d2b 100644 --- a/tck/tck-docs/userguide/src/main/jbake/content/debug.adoc +++ b/tck/tck-docs/userguide/src/main/jbake/content/debug.adoc
@@ -54,12 +54,6 @@ configuration issue is the cause of the failures. -If a large number of tests failed, you should read -link:#GBFYF[Configuration Failures] to see if a -configuration issue is the cause of the failures. - - - [[GBFYF]][[configuration-failures]] 6.2 Configuration Failures
diff --git a/tck/tck-docs/userguide/src/main/jbake/content/using.adoc b/tck/tck-docs/userguide/src/main/jbake/content/using.adoc index 6fc99dd..80fbfed 100644 --- a/tck/tck-docs/userguide/src/main/jbake/content/using.adoc +++ b/tck/tck-docs/userguide/src/main/jbake/content/using.adoc
@@ -110,9 +110,7 @@ 1. Verify that you have followed the configuration instructions in link:config.html#GBFVU[Section 4.1, "Configuring Your Environment to Run the TCK Against the Compatible Implementation."] -2. If required, verify that you have completed the steps in -link:config.html#GCLIW[Section 4.3.2, "Deploying the Prebuilt Archives."] -3. Run the tests, as described in link:#GBFUZ[Section 5.1, "Starting +2. Run the tests, as described in link:#GBFUZ[Section 5.1, "Starting the tests,"] and, if desired, link:#GBFWM[Section 5.2, "Running a Subset of the Tests."] @@ -127,10 +125,7 @@ 1. Verify that you have followed the configuration instructions in link:config.html#GCLHU[Section 4.2, "Configuring Your Environment to Repackage and Run the TCK Against the Vendor Implementation."] -2. If required, verify that you have completed the steps in -link:config.html#GCLIL[Section 4.3.3, "Deploying the -Test Applications Against the Vendor Implementation."] -3. Run the tests, as described in link:#GBFUZ[Section 5.1, "Starting +2. Run the tests, as described in link:#GBFUZ[Section 5.1, "Starting JavaTest,"] and, if desired, link:#GBFWM[Section 5.2, "Running a Subset of the Tests."]
diff --git a/tck/tck-docs/userguide/src/main/jbake/templates/footer.ftl b/tck/tck-docs/userguide/src/main/jbake/templates/footer.ftl index 236b646..d7ceadf 100644 --- a/tck/tck-docs/userguide/src/main/jbake/templates/footer.ftl +++ b/tck/tck-docs/userguide/src/main/jbake/templates/footer.ftl
@@ -37,7 +37,7 @@ <span id="copyright"> <img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/> - <span >Copyright © 2017, 2021 Oracle and/or its affiliates. All rights reserved.</span> + <span >Copyright © 2017, 2022 Oracle and/or its affiliates. All rights reserved.</span> </span> </body>
diff --git a/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java index 9cff878..cd96c24 100644 --- a/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java +++ b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java
@@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.logging.Logger; -import jakarta.jsonp.tck.common.*; +import jakarta.jsonp.tck.common.JSONP_Util; import jakarta.jsonp.tck.provider.MyJsonProvider; import jakarta.jsonp.tck.provider.MyJsonGenerator; import org.jboss.arquillian.container.test.api.Deployment;