Skip to content

Commit 74fcd7b

Browse files
lukasjlukasj
committed
tck ug fixes,
correct CI, tool versions, removal of deployment requirements, removal of duplicities Signed-off-by: Lukas Jungmann <[email protected]>
1 parent 630c014 commit 74fcd7b

File tree

7 files changed

+21
-30
lines changed

7 files changed

+21
-30
lines changed

‎tck/tck-docs/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
22
<!--
33
4-
Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -62,14 +62,14 @@ <h2>Guide to Jakarta EE JSON Processing TCK 2.1 Documentation</h2>
6262
Jakarta EE JSON Processing TCK, Version 2.1. In addition, the guide
6363
provides the rules you must comply with to pass the Jakarta EE JSON
6464
Processing TCK.</li>
65-
<li>The <a href="assertions/JSONP2.0JavadocAssertions.html">Javadoc
65+
<li>The <a href="assertions/JSONP2.1JavadocAssertions.html">Javadoc
6666
Assertion List</a> lists all the javadoc assertions that are tested by
67-
the Jakarta EE JSON Processing 2.0 TCK.</li>
67+
the Jakarta EE JSON Processing 2.1 TCK.</li>
6868
</ul>
6969
<hr>
7070
<p><cite><small></small></cite></p>
7171
<address><small>
72-
Copyright � 2013, 2021 Oracle and/or its affiliates. All rights
72+
Copyright &copy; 2013, 2021 Oracle and/or its affiliates. All rights
7373
reserved.
7474
</small></address>
7575
<cite>

‎tck/tck-docs/userguide/src/main/jbake/content/attributes.conf

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
:TechnologyFullName: Jakarta JSON Processing
22
:TechnologyShortName: JSON Processing
33
:LegacyAcronym: JSONP
4-
:ReleaseDate: December 2021
5-
:CopyrightDates: 2017, 2021
4+
:ReleaseDate: February 2022
5+
:CopyrightDates: 2017, 2022
66
:TechnologyVersion: 2.1
7-
:TechnologyRI: Eclipse JSON Processing 2.1.0
8-
:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.jsonp
7+
:TechnologyRI: Eclipse Parsson 1.1.0
8+
:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.parsson
99
:SpecificationURL: https://jakarta.ee/specifications/jsonp/2.1/
1010
:TCKInquiryList: mailto:[email protected][[email protected]]
1111
:SpecificationInquiryList: mailto:[email protected][[email protected]]
@@ -22,8 +22,10 @@
2222
// for the technology. Used in config.inc.
2323
:TechnologyHomeEnv: JSONP_HOME
2424
// Java SE version required.
25-
:SEversion: 11
25+
:SEversion: 11+
2626
:JakartaEEVersion: 10.0
27+
:MavenVersion: 3.6.3+
28+
:JunitVersion: 5.7.2+
2729
:jteFileName: <TS_HOME>/bin/ts.jte
2830
:excludeListFileName: tck-docs/TCK-Exclude-List.txt
2931
:TCKPackageName: jakarta-jsonp-tck-2.1.0.zip

‎tck/tck-docs/userguide/src/main/jbake/content/config.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ slashes as a path separator instead.
8484

8585

8686
1. Set the following environment variables in your shell environment:
87-
a. `JAVA_HOME` to the directory in which Java SE 8 or 11 is installed
87+
a. `JAVA_HOME` to the directory in which Java SE {SEversion} is installed
8888
b. `M2_HOME` to the directory in which the Apache Maven build tool is installed.
8989
c. +{TechnologyHomeEnv}+ to the directory in which the {TechnologyShortName}
9090
{TechnologyVersion} CI has been installed
@@ -95,12 +95,12 @@ slashes as a path separator instead.
9595
pluggability tests to test the SPI provider interface.
9696
This property should only be set when running the pluggability tests. All other tests use the
9797
provider supplied with the {TechnologyShortName} {TechnologyVersion} implementation under test.
98-
b. `jimage.dir` property is set to extract the JDK9+ modules for running the signature tests.
98+
b. `jimage.dir` property is set to extract the Java SE {SEversion} modules for running the signature tests.
9999
100100
3. Set the below jars to the classpath
101101
a. JAR file for the {TechnologyShortName} {TechnologyVersion} API. +
102-
`jakarta.json-2.1.0.jar`.
103-
c. JUnit 5 jars (5.7.2+)
102+
`jakarta.json-api.jar`.
103+
c. JUnit 5 jars ({JunitVersion})
104104
Maven cordinates :
105105
+
106106
[source,oac_no_warn]
@@ -158,7 +158,7 @@ slashes as a path separator instead.
158158

159159

160160
1. Set the following environment variables in your shell environment:
161-
a. `JAVA_HOME` to the directory in which Java SE 8 or 11 is installed
161+
a. `JAVA_HOME` to the directory in which Java SE {SEversion} is installed
162162
b. `M2_HOME` to the directory in which the Apache Maven build tool is installed.
163163
c. +{TechnologyHomeEnv}+ to the directory in which the {TechnologyShortName}
164164
{TechnologyVersion} CI has been installed
@@ -173,7 +173,7 @@ slashes as a path separator instead.
173173
174174
3. Set the below jars to the classpath
175175
a. JAR file for the {TechnologyShortName} {TechnologyVersion} API. +
176-
`jakarta.json-2.1.0.jar`.
176+
`jakarta.json-api.jar`.
177177
c. JUnit 5 jars (5.7.2+)
178178
Maven cordinates :
179179
+

‎tck/tck-docs/userguide/src/main/jbake/content/debug.adoc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ link:#GBFYF[Configuration Failures] to see if a
5454
configuration issue is the cause of the failures.
5555

5656

57-
If a large number of tests failed, you should read
58-
link:#GBFYF[Configuration Failures] to see if a
59-
configuration issue is the cause of the failures.
60-
61-
62-
6357
[[GBFYF]][[configuration-failures]]
6458

6559
6.2 Configuration Failures

‎tck/tck-docs/userguide/src/main/jbake/content/using.adoc

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,7 @@ compatibility testing against the Vendor and Compatible Implementations.
110110
1. Verify that you have followed the configuration instructions in
111111
link:config.html#GBFVU[Section 4.1, "Configuring Your Environment to Run
112112
the TCK Against the Compatible Implementation."]
113-
2. If required, verify that you have completed the steps in
114-
link:config.html#GCLIW[Section 4.3.2, "Deploying the Prebuilt Archives."]
115-
3. Run the tests, as described in link:#GBFUZ[Section 5.1, "Starting
113+
2. Run the tests, as described in link:#GBFUZ[Section 5.1, "Starting
116114
the tests,"] and, if desired, link:#GBFWM[Section 5.2, "Running a Subset
117115
of the Tests."]
118116
@@ -127,10 +125,7 @@ Vendors must pass.
127125
1. Verify that you have followed the configuration instructions in
128126
link:config.html#GCLHU[Section 4.2, "Configuring Your Environment to
129127
Repackage and Run the TCK Against the Vendor Implementation."]
130-
2. If required, verify that you have completed the steps in
131-
link:config.html#GCLIL[Section 4.3.3, "Deploying the
132-
Test Applications Against the Vendor Implementation."]
133-
3. Run the tests, as described in link:#GBFUZ[Section 5.1, "Starting
128+
2. Run the tests, as described in link:#GBFUZ[Section 5.1, "Starting
134129
JavaTest,"] and, if desired, link:#GBFWM[Section 5.2, "Running a Subset
135130
of the Tests."]
136131

‎tck/tck-docs/userguide/src/main/jbake/templates/footer.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<span id="copyright">
3939
<img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;
40-
<span >Copyright&nbsp;&copy;&nbsp;2017,&nbsp;2021&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
40+
<span >Copyright&nbsp;&copy;&nbsp;2017,&nbsp;2022&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
4141
</span>
4242

4343
</body>

‎tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.util.HashMap;
3434
import java.util.logging.Logger;
3535

36-
import jakarta.jsonp.tck.common.*;
36+
import jakarta.jsonp.tck.common.JSONP_Util;
3737
import jakarta.jsonp.tck.provider.MyJsonProvider;
3838
import jakarta.jsonp.tck.provider.MyJsonGenerator;
3939
import org.jboss.arquillian.container.test.api.Deployment;

0 commit comments

Comments
 (0)