From c1bacee8454439a0c2307f06f9d7aa5fb82b5e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= <david.matejcek@omnifish.ee>
Date: Thu, 4 Aug 2022 14:25:51 +0200
Subject: [PATCH 1/4] Updated documentation dependencies - now compatible with
 JDK11 and JDK17
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
---
 docs/parent/pom.xml | 8 ++++----
 docs/pom.xml        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/parent/pom.xml b/docs/parent/pom.xml
index f2cae752b51..c34adb7e3b4 100644
--- a/docs/parent/pom.xml
+++ b/docs/parent/pom.xml
@@ -32,10 +32,10 @@
     <properties>
         <maven.site.skip>true</maven.site.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <asciidoctor.maven.plugin.version>2.2.1</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.2</asciidoctorj.version>
-        <asciidoctorj.pdf.version>1.6.0</asciidoctorj.pdf.version>
-        <jruby.version>9.3.2.0</jruby.version>
+        <asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
+        <asciidoctorj.version>2.5.3</asciidoctorj.version>
+        <asciidoctorj.pdf.version>2.1.6</asciidoctorj.pdf.version>
+        <jruby.version>9.2.20.1</jruby.version>
         <!-- status: DRAFT, BETA, etc., or blank for final -->
         <status>DRAFT</status>
         <pdf.fileName>${project.artifactId}.pdf</pdf.fileName>
diff --git a/docs/pom.xml b/docs/pom.xml
index 3b2ac07125f..df0fb1a807b 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -80,8 +80,8 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>[1.8.0,1.9.0)</version>
-                                    <message>You need JDK8</message>
+                                    <version>[11,)</version>
+                                    <message>You need JDK11+</message>
                                 </requireJavaVersion>
                             </rules>
                         </configuration>

From ac7a16bf67561595063ddf5f6909788a460ce77e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= <david.matejcek@omnifish.ee>
Date: Thu, 4 Aug 2022 14:28:37 +0200
Subject: [PATCH 2/4] Table of content levels - using 3 instead of 1 both for
 PDF and HTML

- I found it much easier to find something just by rolling through
  the TOC menu.
---
 docs/parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/parent/pom.xml b/docs/parent/pom.xml
index c34adb7e3b4..b1ae24afae4 100644
--- a/docs/parent/pom.xml
+++ b/docs/parent/pom.xml
@@ -39,7 +39,7 @@
         <!-- status: DRAFT, BETA, etc., or blank for final -->
         <status>DRAFT</status>
         <pdf.fileName>${project.artifactId}.pdf</pdf.fileName>
-        <pdf.toclevels>2</pdf.toclevels>
+        <pdf.toclevels>3</pdf.toclevels>
         <productName>Eclipse GlassFish</productName>
         <bookDirectory>${project.build.directory}/book</bookDirectory>
     </properties>
@@ -116,7 +116,7 @@
                             <attributes>
                                 <linkcss>true</linkcss>
                                 <toc>left</toc>
-                                <toclevels>1</toclevels>
+                                <toclevels>3</toclevels>
                                 <embedAssets>false</embedAssets>
                             </attributes>
                         </configuration>

From 95d5f2f2c9d931ed5dc551ea437e0e575dd1861e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= <david.matejcek@omnifish.ee>
Date: Thu, 4 Aug 2022 15:52:15 +0200
Subject: [PATCH 3/4] JRuby version reverted back to 9.3.2.0

- it is still compatible with last changes in dependencies
---
 docs/parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/parent/pom.xml b/docs/parent/pom.xml
index b1ae24afae4..244cebb1ff5 100644
--- a/docs/parent/pom.xml
+++ b/docs/parent/pom.xml
@@ -35,7 +35,7 @@
         <asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
         <asciidoctorj.version>2.5.3</asciidoctorj.version>
         <asciidoctorj.pdf.version>2.1.6</asciidoctorj.pdf.version>
-        <jruby.version>9.2.20.1</jruby.version>
+        <jruby.version>9.3.2.0</jruby.version>
         <!-- status: DRAFT, BETA, etc., or blank for final -->
         <status>DRAFT</status>
         <pdf.fileName>${project.artifactId}.pdf</pdf.fileName>

From c19977c47ad5c7ec979149cf8f7b3f66f6930c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= <david.matejcek@omnifish.ee>
Date: Thu, 4 Aug 2022 16:49:46 +0200
Subject: [PATCH 4/4] Changed jruby-complete to jruby

- the same change was done in asciidoctor
---
 docs/parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/parent/pom.xml b/docs/parent/pom.xml
index 244cebb1ff5..cbf7074f28d 100644
--- a/docs/parent/pom.xml
+++ b/docs/parent/pom.xml
@@ -71,7 +71,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.jruby</groupId>
-                        <artifactId>jruby-complete</artifactId>
+                        <artifactId>jruby</artifactId>
                         <version>${jruby.version}</version>
                     </dependency>
                     <dependency>