From 978126e64d910aa2c54587e800e146c7b824916f Mon Sep 17 00:00:00 2001
From: Jan Westerkamp <jan.westerkamp@ijug.eu>
Date: Tue, 13 Jun 2023 13:37:55 +0200
Subject: [PATCH 1/2] rename properties to follow Maven conventions

---
 pom.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4bb4d04..f9add5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,11 @@
         <version.plugin.checkstyle>3.2.1</version.plugin.checkstyle>
         <version.plugin.rat>0.15</version.plugin.rat>
         <version.plugin.bnd>6.4.0</version.plugin.bnd>
-        <version.plugin.asciidoctor>2.2.2</version.plugin.asciidoctor>
-        <version.plugin.asciidoctor.pdf>2.3.4</version.plugin.asciidoctor.pdf>
+        
+        <!-- AsciiDoctor support versions -->
+        <asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
+        <asciidoctorj.pdf.version>2.3.4</asciidoctorj.pdf.version>
+        
         <version.plugin.copy.rename>1.0.1</version.plugin.copy.rename>
         <version.plugin.release>3.0.0-M7</version.plugin.release>
         <version.plugin.gpg>3.0.1</version.plugin.gpg>
@@ -408,7 +411,7 @@
                 <plugin>
                     <groupId>org.asciidoctor</groupId>
                     <artifactId>asciidoctor-maven-plugin</artifactId>
-                    <version>${version.plugin.asciidoctor}</version>
+                    <version>${asciidoctor.maven.plugin.version}</version>
                     <configuration>
                         <sourceDocumentName>${project.artifactId}.asciidoc</sourceDocumentName>
                         <attributes>
@@ -447,7 +450,7 @@
                         <dependency>
                             <groupId>org.asciidoctor</groupId>
                             <artifactId>asciidoctorj-pdf</artifactId>
-                            <version>${version.plugin.asciidoctor.pdf}</version>
+                            <version>${asciidoctorj.pdf.version}</version>
                         </dependency>
                     </dependencies>
                 </plugin>

From 18217d767c65b9c633ec4d32d064877bfcdf20f9 Mon Sep 17 00:00:00 2001
From: Jan Westerkamp <jan.westerkamp@ijug.eu>
Date: Tue, 13 Jun 2023 13:52:54 +0200
Subject: [PATCH 2/2] Asciidoctor Maven Plugin and dependency versions updated

---
 pom.xml | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index f9add5f..f0908fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,9 +56,11 @@
         <version.plugin.rat>0.15</version.plugin.rat>
         <version.plugin.bnd>6.4.0</version.plugin.bnd>
         
-        <!-- AsciiDoctor support versions -->
-        <asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
-        <asciidoctorj.pdf.version>2.3.4</asciidoctorj.pdf.version>
+        <!-- Asciidoctor support versions -->
+        <asciidoctor.maven.plugin.version>2.2.4</asciidoctor.maven.plugin.version>
+        <asciidoctorj.version>2.5.10</asciidoctorj.version>
+        <asciidoctorj.pdf.version>2.3.7</asciidoctorj.pdf.version>
+        <jruby.version>9.4.2.0</jruby.version>
         
         <version.plugin.copy.rename>1.0.1</version.plugin.copy.rename>
         <version.plugin.release>3.0.0-M7</version.plugin.release>
@@ -412,6 +414,25 @@
                     <groupId>org.asciidoctor</groupId>
                     <artifactId>asciidoctor-maven-plugin</artifactId>
                     <version>${asciidoctor.maven.plugin.version}</version>
+                    <dependencies>
+                    <!-- Comment this section to use the default jruby artifact provided by the plugin -->
+                    <dependency>
+                        <groupId>org.jruby</groupId>
+                        <artifactId>jruby</artifactId>
+                        <version>${jruby.version}</version>
+                    </dependency>
+                    <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
+                    <dependency>
+                        <groupId>org.asciidoctor</groupId>
+                        <artifactId>asciidoctorj</artifactId>
+                        <version>${asciidoctorj.version}</version>
+                    </dependency>
+                        <dependency>
+                            <groupId>org.asciidoctor</groupId>
+                            <artifactId>asciidoctorj-pdf</artifactId>
+                            <version>${asciidoctorj.pdf.version}</version>
+                        </dependency>
+                    </dependencies>
                     <configuration>
                         <sourceDocumentName>${project.artifactId}.asciidoc</sourceDocumentName>
                         <attributes>
@@ -446,13 +467,6 @@
                             </configuration>
                         </execution>
                     </executions>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.asciidoctor</groupId>
-                            <artifactId>asciidoctorj-pdf</artifactId>
-                            <version>${asciidoctorj.pdf.version}</version>
-                        </dependency>
-                    </dependencies>
                 </plugin>
 
                 <!-- Release -->