Merge pull request #855 from lukasj/jpa31_ug

[pers31] update userguide
jakartaee · Feb 22, 2022 · ecb9cc6 · ecb9cc6
2 parents 43d0128 + 8b61f56
commit ecb9cc6
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/install/jpa/docs/jpatck-ReleaseNotes-3.1.html b/install/jpa/docs/jpatck-ReleaseNotes-3.1.html
@@ -29,7 +29,7 @@
   <body>
     <div align="center">
       <h1>Jakarta EE Persistence Technology Compatibility Kit, Version 3.1</h1>
-      <h2> <em class="emphasize">Release Notes, December, 2021</em></h2>
+      <h2> <em class="emphasize">Release Notes, March, 2022</em></h2>
     </div>
     <h2><a name="kit_contents">Kit Contents</a></h2>
     <p>The Jakarta EE Persistence, Version 3.1 Technology Compatibility Kit
@@ -125,7 +125,7 @@ <h2><a name="install_setup_run">Installing, Setting Up, and Running the
     <p>The online version of the JT Harness version 5.0 documentation is
       available <a href="https://wiki.openjdk.java.net/display/CodeTools/Documentation">here</a>.</p>
     <hr>
-    <p> <cite> <small>Copyright © 2017, 2021 Oracle and/or its affiliates. All
+    <p> <cite> <small>Copyright © 2017, 2022 Oracle and/or its affiliates. All
           rights reserved.</small> </cite> </p>
   </body>
 </html>
diff --git a/user_guides/jpa/pom.xml b/user_guides/jpa/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 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
@@ -22,22 +22,22 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.7</version>
     </parent>
     <groupId>org.glassfish</groupId>
     <artifactId>tck_jpa</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.1</version>
-    <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Persistence for Jakarta EE, Release 3.0</name>
+    <version>3.1.0</version>
+    <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Persistence for Jakarta EE, Release 3.1</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <site.output.dir>${project.build.directory}/staging</site.output.dir>
         <maven.site.skip>true</maven.site.skip>
-        <asciidoctorj.version>2.4.2</asciidoctorj.version>
-        <asciidoctorj.diagram.version>2.1.0</asciidoctorj.diagram.version>
-        <asciidoctorj.maven.plugin.version>2.1.0</asciidoctorj.maven.plugin.version>
-        <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
+        <asciidoctorj.version>2.5.3</asciidoctorj.version>
+        <asciidoctorj.diagram.version>2.2.1</asciidoctorj.diagram.version>
+        <asciidoctorj.maven.plugin.version>2.2.2</asciidoctorj.maven.plugin.version>
+        <asciidoctorj.pdf.version>1.6.2</asciidoctorj.pdf.version>
         <jbake.maven.plugin.version>0.3.3</jbake.maven.plugin.version>
         <freemarker.version>2.3.30</freemarker.version>
         <!-- status: DRAFT, BETA, etc., or blank for final -->
@@ -81,8 +81,8 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>[1.8.0,)</version>
-                                    <message>You need JDK8 or newer</message>
+                                    <version>[11,)</version>
+                                    <message>You need Java SE 11 or newer</message>
                                 </requireJavaVersion>
                             </rules>
                         </configuration>
@@ -101,7 +101,7 @@
                         </goals>
                         <configuration>
                             <chapterPatterns>
-                                [0-9]+\s.*,Preface.*,Part\s.*
+                                [A-C0-9]+\s.*,Preface.*,Part\s.*
                             </chapterPatterns>
                         </configuration>
                     </execution>
@@ -206,7 +206,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M3</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

diff --git a/user_guides/jpa/src/main/jbake/content/attributes.conf b/user_guides/jpa/src/main/jbake/content/attributes.conf
@@ -1,8 +1,8 @@
 :TechnologyFullName: Jakarta Persistence
 :TechnologyShortName: Persistence
 :LegacyAcronym: JPA
-:ReleaseDate: December 2021
-:CopyrightDates: 2017, 2021		   
+:ReleaseDate: March 2022
+:CopyrightDates: 2017, 2022
 :TechnologyVersion: 3.1
 :TechnologyRI: EclipseLink 3.1
 :TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.eclipselink

diff --git a/user_guides/jpa/src/main/jbake/content/config.adoc b/user_guides/jpa/src/main/jbake/content/config.adoc
@@ -60,7 +60,7 @@ the file under the `<TS_HOME>/bin/xml/impl/<your_impl>` directory.
 For more information, you may wish to view `<TS_HOME>/bin/xml/impl/glassfish/config.vi.xml`,
 the configuration file for Jakarta EE {JakartaEEVersion} Compatible Implementation, Eclipse GlassFish.
 
-[[GBFWG]][[custom-deployment-handlers]]
+[[GBFWE]][[custom-deployment-handlers]]
 
 4.5 Custom Deployment Handlers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -84,7 +84,7 @@ resides. The primary `build.xml` file in the `<TS_HOME>/bin` directory
 has a target to invoke any of the required targets (`-deploy`, `-undeploy`,
 `-deploy.all`, `-undeploy.all`).
 
-[[GBFVA]][[create-custom-deployment-handler]]
+[[GBFWF]][[create-custom-deployment-handler]]
 
 4.5.1 To Create a Custom Deployment Handler
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/user_guides/jpa/src/main/jbake/templates/footer.ftl b/user_guides/jpa/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"/>&nbsp;			
-		<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 >Copyright&nbsp;&copy;&nbsp;2017,&nbsp;2022&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</span>
 </span>
 
 </body>