Skip to content

Commit

Permalink
User guide initial updates for Jakarta EE 9.1
Browse files Browse the repository at this point in the history
- Update to Jakarta EE 9.1
- Update CI versions as needed
- Revise the Intro pages to use params. for Release Date and Copyright Dates
- Update Jakarta EE Platform TCK (not parameterized like the others)
- Update copyright dates for 2021

Signed-off-by: Ed Bratt <ed.bratt@oracle.com>
  • Loading branch information
edbratt committed Apr 6, 2021
1 parent 6d56b98 commit 13a8cfc
Show file tree
Hide file tree
Showing 101 changed files with 727 additions and 663 deletions.
4 changes: 2 additions & 2 deletions user_guides/caj/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2017, 2021 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
Expand All @@ -27,7 +27,7 @@
<groupId>org.glassfish</groupId>
<artifactId>tck_caj</artifactId>
<packaging>pom</packaging>
<version>2.0.0</version>
<version>2.0.1</version>
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Annotations Release 2.0</name>

<properties>
Expand Down
10 changes: 6 additions & 4 deletions user_guides/caj/src/main/jbake/content/attributes.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
:TechnologyShortName: Annotations
:LegacyAcronym: CAJ
:TechnologyVersion: 2.0
:TechnologyRI: Jakarta Annotations
:TechnologyRI: Jakarta Annotations 2.0
:ReleaseDate: May 2021
:CopyrightDates: 2018, 2021
:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.ca
:SpecificationURL: https://jakarta.ee/specifications/annotations/2.0/
:TCKInquiryList: mailto:jakartaee-tck-dev@eclipse.org[jakartaee-tck-dev@eclipse.org]
Expand All @@ -20,13 +22,13 @@
// for the technology. Used in config.inc.
:TechnologyHomeEnv: CAJ_HOME
// Java SE version required.
:SEversion: 1.8
:SEversion: 8 (1.8) or 11
:AntVersion: 1.10+
:JakartaEEVersion: 9
:JakartaEEVersion: 9.1
:JavaTestVersion: 5.0
:jteFileName: <TS_HOME>/bin/ts.jte
:jtxFileName: <TS_HOME>/bin/ts.jtx
:TCKPackageName: jakarta-annotations-tck-2.0.0.zip
:TCKPackageName: jakarta-annotations-tck-2.0.1.zip
// Directory names used in examples in using.adoc.
:sigTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/signaturetest/caj
:singleTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/caj/api/client
Expand Down
4 changes: 2 additions & 2 deletions user_guides/caj/src/main/jbake/content/title.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Technology Compatibility Kit User's Guide for {TechnologyFullName}

Release {TechnologyVersion} for Jakarta EE

September 2020
{ReleaseDate}

[[sthref1]]

Expand All @@ -26,7 +26,7 @@ September 2020
Technology Compatibility Kit User's Guide for {TechnologyFullName},
Release {TechnologyVersion} for Jakarta EE

Copyright © 2017, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright © {CopyrightDates} 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
Expand Down
2 changes: 1 addition & 1 deletion user_guides/caj/src/main/jbake/templates/footer.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

<span id="copyright">
<img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;
<span >Copyright&nbsp;&copy;&nbsp;2018,&nbsp;2020&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
<span >Copyright&nbsp;&copy;&nbsp;2017,&nbsp;2021&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
</span>

</body>
Expand Down
4 changes: 2 additions & 2 deletions user_guides/concurrency/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2017, 2021 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
Expand All @@ -27,7 +27,7 @@
<groupId>org.glassfish</groupId>
<artifactId>tck_concurrency</artifactId>
<packaging>pom</packaging>
<version>2.0.0</version>
<version>2.0.1</version>
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Concurreny for Jakarta EE, Release 2.0</name>

<properties>
Expand Down
10 changes: 6 additions & 4 deletions user_guides/concurrency/src/main/jbake/content/attributes.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
:TechnologyShortName: Concurrency
:LegacyAcronym: CU
:TechnologyVersion: 2.0
:TechnologyRI: Eclipse GlassFish 6.0
:ReleaseDate: May 2021
:CopyrightDates: 2018, 2021
:TechnologyRI: Eclipse GlassFish 6.1
:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.glassfish
:SpecificationURL: https://jakarta.ee/specifications/concurrency/2.0/
:TCKInquiryList: mailto:jakartaee-tck-dev@eclipse.org[jakartaee-tck-dev@eclipse.org]
Expand All @@ -20,13 +22,13 @@
// for the technology. Used in config.inc.
:TechnologyHomeEnv: TS_HOME
// Java SE version required.
:SEversion: 8
:SEversion: 8 (1.8) or 11
:AntVersion: 1.10.0+
:JakartaEEVersion: 9
:JakartaEEVersion: 9.1
:JavaTestVersion: 5.0
:jteFileName: <TS_HOME>/bin/ts.jte
:jtxFileName: <TS_HOME>/bin/ts.jtx
:TCKPackageName: jakarta-concurrency-tck-2.0.0.zip
:TCKPackageName: jakarta-concurrency-tck-2.0.1.zip
// Directory names used in examples in using.adoc.
:sigTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/signaturetest/concurrency
:singleTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/concurrency/api/client
Expand Down
4 changes: 2 additions & 2 deletions user_guides/concurrency/src/main/jbake/content/title.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Technology Compatibility Kit User's Guide for {TechnologyFullName}

Release {TechnologyVersion} for Jakarta EE

September 2020
{ReleaseDate}

[[sthref1]]

Expand All @@ -26,7 +26,7 @@ September 2020
Technology Compatibility Kit User's Guide for {TechnologyFullName},
Release {TechnologyVersion} for Jakarta EE

Copyright © 2017, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright © {CopyrightDates} 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

<span id="copyright">
<img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;
<span >Copyright&nbsp;&copy;&nbsp;2018,&nbsp;2020&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
<span >Copyright&nbsp;&copy;&nbsp;2017,&nbsp;2021&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
</span>

</body>
Expand Down
4 changes: 2 additions & 2 deletions user_guides/connector/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2017, 2021 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
Expand All @@ -27,7 +27,7 @@
<groupId>org.glassfish</groupId>
<artifactId>tck_jca</artifactId>
<packaging>pom</packaging>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.1</version>
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Connectors for Jakarta EE, Release
2.0</name>

Expand Down
10 changes: 6 additions & 4 deletions user_guides/connector/src/main/jbake/content/attributes.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
:TechnologyShortName: Connectors
:LegacyAcronym: JCA
:TechnologyVersion: 2.0
:TechnologyRI: Eclipse GlassFish 6.0
:ReleaseDate: May 2021
:CopyrightDates: 2017, 2021
:TechnologyRI: Eclipse GlassFish 6.1
:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.glassfish
:SpecificationURL: https://jakarta.ee/specifications/connectors/2.0/
:TCKInquiryList: mailto:jakartaee-tck-dev@eclipse.org[jakartaee-tck-dev@eclipse.org]
Expand All @@ -20,13 +22,13 @@
// for the technology. Used in config.inc.
:TechnologyHomeEnv: JAVAEE_HOME
// Java SE version required.
:SEversion: 8
:SEversion: 8 (1.8) or 11
:AntVersion: 1.10.0+
:JakartaEEVersion: 9
:JakartaEEVersion: 9.1
:JavaTestVersion: 5.0
:jteFileName: <TS_HOME>/bin/ts.jte
:jtxFileName: <TS_HOME>/bin/ts.jtx
:TCKPackageName: jakarta-connectors-tck-2.0.0.zip
:TCKPackageName: jakarta-connectors-tck-2.0.1.zip
// Directory names used in examples in using.adoc.
:sigTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/signaturetest/connector
:singleTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/connector/mdb
Expand Down
4 changes: 2 additions & 2 deletions user_guides/connector/src/main/jbake/content/title.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Technology Compatibility Kit User's Guide for {TechnologyFullName}

Release {TechnologyVersion} for Jakarta EE

September 2020
{ReleaseDate}

[[sthref1]]

Expand All @@ -26,7 +26,7 @@ September 2020
Technology Compatibility Kit User's Guide for {TechnologyFullName},
Release {TechnologyVersion} for Jakarta EE

Copyright © 2017, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright © {CopyrightDates} 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
Expand Down
2 changes: 1 addition & 1 deletion user_guides/connector/src/main/jbake/templates/footer.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

<span id="copyright">
<img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;
<span>Copyright&nbsp;&copy;&nbsp;2018,&nbsp;2020&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
<span>Copyright&nbsp;&copy;&nbsp;2017,&nbsp;2021&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
</span>

</body>
Expand Down
4 changes: 2 additions & 2 deletions user_guides/el/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2020 Oracle and/or its affiliates and others.
Copyright (c) 2017, 2021 Oracle and/or its affiliates and others.
All rights reserved.
This program and the accompanying materials are made available under the
Expand All @@ -28,7 +28,7 @@
<groupId>org.glassfish</groupId>
<artifactId>tck_el</artifactId>
<packaging>pom</packaging>
<version>4.0.0</version>
<version>4.0.1</version>
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Expression Language for Jakarta EE, Release 4.0</name>

<properties>
Expand Down
10 changes: 6 additions & 4 deletions user_guides/el/src/main/jbake/content/attributes.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
:TechnologyShortName: Expression Language
:LegacyAcronym: EL
:TechnologyVersion: 4.0
:TechnologyRI: Eclipse GlassFish 6.0
:ReleaseDate: May 2021
:CopyrightDates: 2017, 2021
:TechnologyRI: Eclipse GlassFish 6.1
:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.glassfish
:SpecificationURL: https://jakarta.ee/specifications/expression-language/4.0/
:TCKInquiryList: mailto:jakartaee-tck-dev@eclipse.org[jakartaee-tck-dev@eclipse.org]
Expand All @@ -20,13 +22,13 @@
// for the technology. Used in config.inc.
:TechnologyHomeEnv: EL_HOME
// Java SE version required.
:SEversion: 8
:SEversion: 8 (1.8) or 11
:AntVersion: 1.10.0+
:JakartaEEVersion: 9
:JakartaEEVersion: 9.1
:JavaTestVersion: 5.0
:jteFileName: <TS_HOME>/bin/ts.jte
:jtxFileName: <TS_HOME>/bin/ts.jtx
:TCKPackageName: jakarta-expression-language-tck-4.0.0.zip
:TCKPackageName: jakarta-expression-language-tck-4.0.1.zip
// Directory names used in examples in using.adoc.
:sigTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/signaturetest/el
:singleTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/el/api/client
Expand Down
4 changes: 2 additions & 2 deletions user_guides/el/src/main/jbake/content/title.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Technology Compatibility Kit User's Guide for {TechnologyFullName}

Release {TechnologyVersion} for Jakarta EE

September 2020
{ReleaseDate}

[[sthref1]]

Expand All @@ -26,7 +26,7 @@ September 2020
Technology Compatibility Kit User's Guide for {TechnologyFullName},
Release {TechnologyVersion} for Jakarta EE

Copyright © 2017, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright © {CopyrightDates} 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
Expand Down
2 changes: 1 addition & 1 deletion user_guides/el/src/main/jbake/templates/footer.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

<span id="copyright">
<img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;
<span >Copyright&nbsp;&copy;&nbsp;2018,&nbsp;2020&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
<span >Copyright&nbsp;&copy;&nbsp;2017,&nbsp;2021&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
</span>

</body>
Expand Down
4 changes: 2 additions & 2 deletions user_guides/jacc/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2017, 2021 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
Expand All @@ -28,7 +28,7 @@

<groupId>org.glassfish</groupId>
<artifactId>tck_jacc</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
<packaging>pom</packaging>

<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Authorization for Jakarta EE, Release 2.0</name>
Expand Down
10 changes: 6 additions & 4 deletions user_guides/jacc/src/main/jbake/content/attributes.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
:TechnologyShortName: Authorization
:LegacyAcronym: JACC
:TechnologyVersion: 2.0
:TechnologyRI: Eclipse GlassFish 6.0
:ReleaseDate: May 2021
:CopyrightDates: 2017, 2021
:TechnologyRI: Eclipse GlassFish 6.1
:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.glassfish
:SpecificationURL: https://jakarta.ee/specifications/authorization/2.0/
:TCKInquiryList: mailto:jakartaee-tck-dev@eclipse.org[jakartaee-tck-dev@eclipse.org]
Expand All @@ -20,13 +22,13 @@
// for the technology. Used in config.inc.
:TechnologyHomeEnv: JACC_HOME
// Java SE version required.
:SEversion: 8
:SEversion: 8 (1.8) or 11
:AntVersion: 1.10.0+
:JakartaEEVersion: 9
:JakartaEEVersion: 9.1
:JavaTestVersion: 5.0
:jteFileName: <TS_HOME>/bin/ts.jte
:jtxFileName: <TS_HOME>/bin/ts.jtx
:TCKPackageName: jakarta-authorization-tck-2.0.0.zip
:TCKPackageName: jakarta-authorization-tck-2.0.1.zip
// Directory names used in examples in using.adoc.
:sigTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/signaturetest/jacc
:singleTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/jacc/ejb
Expand Down
2 changes: 1 addition & 1 deletion user_guides/jacc/src/main/jbake/templates/footer.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

<span id="copyright">
<img src="img/eclipse_foundation_logo_tiny.png" height="20px" alt="Eclipse Foundation Logo" align="top"/>&nbsp;
<span >Copyright&nbsp;&copy;&nbsp;2018,&nbsp;2020&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
<span >Copyright&nbsp;&copy;&nbsp;2017,&nbsp;2021&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
</span>

</body>
Expand Down
6 changes: 3 additions & 3 deletions user_guides/jakartaee/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2017, 2021 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
Expand All @@ -27,8 +27,8 @@
<groupId>org.glassfish</groupId>
<artifactId>cts_javaee</artifactId>
<packaging>pom</packaging>
<version>9.0.0</version>
<name>Eclipse Foundation Jakarta EE Platform, Enterprise Edition Test Compatibility Kit User's Guide, Release 9</name>
<version>9.1.0</version>
<name>Eclipse Foundation Jakarta EE Platform, Enterprise Edition Test Compatibility Kit User's Guide, Release 9.1</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down

0 comments on commit 13a8cfc

Please sign in to comment.