Bump AsciidoctorJ to v2.5.12 and JRuby to v9.4.6.0 (#259)

* Bump AsciidoctorJ to v2.5.12 and JRuby to v9.4.6.0 * Fix use of OS dependant linebreaks in tests
asciidoctor · Mar 12, 2024 · 68ed054 · 68ed054
1 parent 7b4045a
commit 68ed054
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 29 deletions.
diff --git a/asciidoc-maven-site-converter-example/pom.xml b/asciidoc-maven-site-converter-example/pom.xml
@@ -14,8 +14,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
+        <jruby.version>9.4.6.0</jruby.version>
     </properties>
 
     <build>

diff --git a/asciidoc-maven-site-parser-example/pom.xml b/asciidoc-maven-site-parser-example/pom.xml
@@ -14,8 +14,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
+        <jruby.version>9.4.6.0</jruby.version>
     </properties>
 
     <build>

diff --git a/asciidoc-multiple-inputs-example/pom.xml b/asciidoc-multiple-inputs-example/pom.xml
@@ -14,8 +14,8 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
         <asciidoctorj.pdf.version>2.3.14</asciidoctorj.pdf.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
+        <jruby.version>9.4.6.0</jruby.version>
     </properties>
 
     <build>

diff --git a/asciidoc-to-html-example/pom.xml b/asciidoc-to-html-example/pom.xml
@@ -13,8 +13,8 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
+        <jruby.version>9.4.6.0</jruby.version>
     </properties>
 
     <build>

diff --git a/asciidoc-to-html-multipage-example/pom.xml b/asciidoc-to-html-multipage-example/pom.xml
@@ -15,9 +15,9 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
         <asciidoctor-multipage.version>0.0.16</asciidoctor-multipage.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <jruby.version>9.4.6.0</jruby.version>
     </properties>
 
     <dependencies>

diff --git a/asciidoc-to-revealjs-example/pom.xml b/asciidoc-to-revealjs-example/pom.xml
@@ -14,8 +14,8 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
+        <jruby.version>9.4.6.0</jruby.version>
         <revealjs.version>3.9.2</revealjs.version>
         <!-- Use 'master' as version and remove the 'v' prefixing the download url to use the current snapshot version  -->
         <asciidoctor-revealjs.version>master</asciidoctor-revealjs.version>

diff --git a/asciidoctor-diagram-example/pom.xml b/asciidoctor-diagram-example/pom.xml
@@ -11,9 +11,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
         <asciidoctorj.diagram.version>2.3.0</asciidoctorj.diagram.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <jruby.version>9.4.6.0</jruby.version>
     </properties>
 
     <build>

diff --git a/asciidoctor-epub-example/pom.xml b/asciidoctor-epub-example/pom.xml
@@ -16,9 +16,9 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
         <asciidoctorj.epub.version>2.1.0</asciidoctorj.epub.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
         <!-- for a correct kf8 generation, you'll need at least jRuby >= 9.1.8.0 -->
-        <jruby.version>9.4.5.0</jruby.version>
+        <jruby.version>9.4.6.0</jruby.version>
         <!-- provide full path to kindlegen application if you need the fallback solution -->
         <path.to.kindlegen>/absolute/path/to/kindlegen</path.to.kindlegen>
     </properties>

diff --git a/asciidoctor-pdf-cjk-example/pom.xml b/asciidoctor-pdf-cjk-example/pom.xml
@@ -16,9 +16,9 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
         <asciidoctorj.pdf.version>2.3.14</asciidoctorj.pdf.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <jruby.version>9.4.6.0</jruby.version>
         <pdf.cjk.version>0.1.3</pdf.cjk.version>
         <pdf.cjk.kaigen.version>0.1.1</pdf.cjk.kaigen.version>
         <pdf.cjk.kaigen.fonts.download.uri>https://github.com/chloerei/asciidoctor-pdf-cjk-kai_gen_gothic/releases/download/v0.1.0-fonts</pdf.cjk.kaigen.fonts.download.uri>

diff --git a/asciidoctor-pdf-example/pom.xml b/asciidoctor-pdf-example/pom.xml
@@ -14,8 +14,8 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
         <asciidoctorj.pdf.version>2.3.14</asciidoctorj.pdf.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
+        <jruby.version>9.4.6.0</jruby.version>
     </properties>
 
     <build>

diff --git a/asciidoctor-pdf-with-theme-example/pom.xml b/asciidoctor-pdf-with-theme-example/pom.xml
@@ -14,8 +14,8 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
         <asciidoctorj.pdf.version>2.3.14</asciidoctorj.pdf.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
+        <jruby.version>9.4.6.0</jruby.version>
     </properties>
 
     <build>

diff --git a/docbook-pipeline-docbkx-example/pom.xml b/docbook-pipeline-docbkx-example/pom.xml
@@ -13,8 +13,8 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
+        <jruby.version>9.4.6.0</jruby.version>
     </properties>
 
     <build>

diff --git a/java-extension-example/asciidoctor-with-extension-example/pom.xml b/java-extension-example/asciidoctor-with-extension-example/pom.xml
@@ -11,8 +11,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>3.0.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
-        <jruby.version>9.4.5.0</jruby.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
+        <jruby.version>9.4.6.0</jruby.version>
     </properties>
 
     <build>

diff --git a/java-extension-example/asciidoctorj-twitter-extension/pom.xml b/java-extension-example/asciidoctorj-twitter-extension/pom.xml
@@ -12,7 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <asciidoctorj.version>2.5.11</asciidoctorj.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
     </properties>
 
     <dependencies>

diff --git a/tests/src/test/java/org/asciidoctor/maven/examples/common/StringUtils.java b/tests/src/test/java/org/asciidoctor/maven/examples/common/StringUtils.java
@@ -6,10 +6,10 @@
 public class StringUtils {
 
     /**
-     * Applies OS specific linebreaks.
+     * Fixed in AsciidoctorJ 2.5.12, always uses '\n' for all OSs.
      */
     public static String lines(String... lines) {
         return Arrays.stream(lines)
-                .collect(Collectors.joining(System.lineSeparator()));
+            .collect(Collectors.joining("\n"));
     }
 }