Bump org.asciidoctor:asciidoctorj from 2.5.13 to 3.0.0

Bumps [org.asciidoctor:asciidoctorj](https://github.com/asciidoctor/asciidoctorj) from 2.5.13 to 3.0.0. - [Release notes](https://github.com/asciidoctor/asciidoctorj/releases) - [Changelog](https://github.com/asciidoctor/asciidoctorj/blob/main/CHANGELOG.adoc) - [Commits](asciidoctor/asciidoctorj@v2.5.13...v3.0.0) --- updated-dependencies: - dependency-name: org.asciidoctor:asciidoctorj dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
asciidoctor · Nov 2, 2024 · c8c9a41 · c8c9a41
1 parent 5138126
commit c8c9a41
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 24 deletions.
diff --git a/asciidoc-maven-site-converter-example/pom.xml b/asciidoc-maven-site-converter-example/pom.xml
@@ -14,7 +14,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <asciidoctor.maven.plugin.version>3.1.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
         <jruby.version>9.4.8.0</jruby.version>
     </properties>
 

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

diff --git a/asciidoc-multiple-inputs-example/pom.xml b/asciidoc-multiple-inputs-example/pom.xml
@@ -14,7 +14,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.1.0</asciidoctor.maven.plugin.version>
         <asciidoctorj.pdf.version>2.3.19</asciidoctorj.pdf.version>
-        <asciidoctorj.version>2.5.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
         <jruby.version>9.4.8.0</jruby.version>
     </properties>
 

diff --git a/asciidoc-to-html-example/pom.xml b/asciidoc-to-html-example/pom.xml
@@ -13,7 +13,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.1.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
         <jruby.version>9.4.8.0</jruby.version>
     </properties>
 

diff --git a/asciidoc-to-html-multipage-example/pom.xml b/asciidoc-to-html-multipage-example/pom.xml
@@ -15,7 +15,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.1.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
         <asciidoctor-multipage.version>0.0.19</asciidoctor-multipage.version>
         <jruby.version>9.4.8.0</jruby.version>
     </properties>

diff --git a/asciidoc-to-revealjs-example/pom.xml b/asciidoc-to-revealjs-example/pom.xml
@@ -14,7 +14,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.1.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
         <jruby.version>9.4.8.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  -->

diff --git a/asciidoctor-diagram-example/pom.xml b/asciidoctor-diagram-example/pom.xml
@@ -11,7 +11,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>3.1.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
         <asciidoctorj.diagram.version>2.3.1</asciidoctorj.diagram.version>
         <jruby.version>9.4.8.0</jruby.version>
     </properties>

diff --git a/asciidoctor-epub-example/pom.xml b/asciidoctor-epub-example/pom.xml
@@ -16,7 +16,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.1.0</asciidoctor.maven.plugin.version>
         <asciidoctorj.epub.version>2.1.3</asciidoctorj.epub.version>
-        <asciidoctorj.version>2.5.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
         <!-- for a correct kf8 generation, you'll need at least jRuby >= 9.1.8.0 -->
         <jruby.version>9.4.8.0</jruby.version>
         <!-- provide full path to kindlegen application if you need the fallback solution -->

diff --git a/asciidoctor-pdf-cjk-example/pom.xml b/asciidoctor-pdf-cjk-example/pom.xml
@@ -16,7 +16,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.1.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
         <asciidoctorj.pdf.version>2.3.19</asciidoctorj.pdf.version>
         <jruby.version>9.4.8.0</jruby.version>
         <pdf.cjk.version>0.1.3</pdf.cjk.version>

diff --git a/asciidoctor-pdf-example/pom.xml b/asciidoctor-pdf-example/pom.xml
@@ -14,7 +14,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.1.0</asciidoctor.maven.plugin.version>
         <asciidoctorj.pdf.version>2.3.19</asciidoctorj.pdf.version>
-        <asciidoctorj.version>2.5.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
         <jruby.version>9.4.8.0</jruby.version>
     </properties>
 

diff --git a/asciidoctor-pdf-with-theme-example/pom.xml b/asciidoctor-pdf-with-theme-example/pom.xml
@@ -14,7 +14,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.1.0</asciidoctor.maven.plugin.version>
         <asciidoctorj.pdf.version>2.3.19</asciidoctorj.pdf.version>
-        <asciidoctorj.version>2.5.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
         <jruby.version>9.4.8.0</jruby.version>
     </properties>
 

diff --git a/docbook-pipeline-docbkx-example/pom.xml b/docbook-pipeline-docbkx-example/pom.xml
@@ -13,7 +13,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <asciidoctor.maven.plugin.version>3.1.0</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.5.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
         <jruby.version>9.4.8.0</jruby.version>
     </properties>
 

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

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.13</asciidoctorj.version>
+        <asciidoctorj.version>3.0.0</asciidoctorj.version>
     </properties>
 
     <dependencies>

diff --git a/...torj-twitter-extension/src/main/java/org/asciidoctorj/twitter/extension/TwitterMacro.java b/...torj-twitter-extension/src/main/java/org/asciidoctorj/twitter/extension/TwitterMacro.java
@@ -1,7 +1,7 @@
 package org.asciidoctorj.twitter.extension;
 
-import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 
 import java.util.HashMap;
@@ -14,17 +14,16 @@ public TwitterMacro(String macroName) {
     }
 
     @Override
-    public Object process(ContentNode contentNode, String twitterHandle, Map<String, Object> attributes) {
-
+    public PhraseNode process(StructuralNode parent, String target, Map<String, Object> attributes) {
         String twitterLink;
         String twitterLinkText;
-        if (twitterHandle == null || twitterHandle.isEmpty()) {
+        if (target == null || target.isEmpty()) {
             twitterLink = "https://www.twitter.com/";
             twitterLinkText = "Twitter";
         } else {
-            twitterLink = "https://www.twitter.com/" + twitterHandle;
+            twitterLink = "https://www.twitter.com/" + target;
             // Prepend twitterHandle with @ as text link:
-            twitterLinkText = "@" + twitterHandle;
+            twitterLinkText = "@" + target;
         }
 
         // Define options for an 'anchor' element:
@@ -33,9 +32,6 @@ public Object process(ContentNode contentNode, String twitterHandle, Map<String,
         options.put("target", twitterLink);
 
         // Create the 'anchor' node:
-        PhraseNode inlineTwitterLink = createPhraseNode(contentNode, "anchor", twitterLinkText, attributes, options);
-
-        // Convert to String value:
-        return inlineTwitterLink.convert();
+        return createPhraseNode(parent, "anchor", twitterLinkText, attributes, options);
     }
 }