Switch to hugo-asciidoctorj-extension

agrestio · Apr 16, 2024 · d3c8c14 · d3c8c14
1 parent 588359a
commit d3c8c14
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 135 deletions.
diff --git a/agrest-asciidoc-postprocessor/pom.xml b/agrest-asciidoc-postprocessor/pom.xml
diff --git a/agrest-asciidoc-postprocessor/src/main/java/io/agrest/docs/AgrestPostprocessor.java b/agrest-asciidoc-postprocessor/src/main/java/io/agrest/docs/AgrestPostprocessor.java
diff --git a/agrest-docs-framework/src/docs/asciidoc/framework.adoc b/agrest-docs-framework/src/docs/asciidoc/framework.adoc
@@ -1,4 +1,4 @@
-:agrest-header: _chapters/header.html
+:hugo-font-awesome-icons: false
 
 = Agrest Framework
 

diff --git a/agrest-docs-get-started-cayenne-sb/src/docs/asciidoc/getting-started.adoc b/agrest-docs-get-started-cayenne-sb/src/docs/asciidoc/getting-started.adoc
@@ -1,4 +1,4 @@
-:agrest-header: _chapters/header.html
+:hugo-font-awesome-icons: false
 
 = Getting Started
 

diff --git a/agrest-docs-protocol/src/docs/asciidoc/protocol.adoc b/agrest-docs-protocol/src/docs/asciidoc/protocol.adoc
@@ -1,4 +1,4 @@
-:agrest-header: _chapters/header.html
+:hugo-font-awesome-icons: false
 
 = Agrest Protocol
 

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,6 @@
 	<packaging>pom</packaging>
 
     <modules>
-        <module>agrest-asciidoc-postprocessor</module>
         <module>agrest-docs-get-started-cayenne-sb</module>
         <module>agrest-docs-protocol</module>
         <module>agrest-docs-framework</module>
@@ -20,10 +19,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <asciidoctorj.version>2.5.3</asciidoctorj.version>
-        <asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
-        <asciidoctorj.pdf.version>1.6.2</asciidoctorj.pdf.version>
-        <jruby.version>9.2.20.1</jruby.version>
+        <asciidoctorj.version>2.5.12</asciidoctorj.version>
+        <asciidoctor.maven.plugin.version>2.2.6</asciidoctor.maven.plugin.version>
+        <asciidoctorj.pdf.version>2.1.4</asciidoctorj.pdf.version>
         <jsoup.version>1.14.3</jsoup.version>
 
         <agrest.version>5.0.M19</agrest.version>
@@ -78,11 +76,6 @@
                 <artifactId>asciidoctor-maven-plugin</artifactId>
                 <version>${asciidoctor.maven.plugin.version}</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.jruby</groupId>
-                        <artifactId>jruby-complete</artifactId>
-                        <version>${jruby.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj</artifactId>
@@ -94,9 +87,9 @@
                         <version>${asciidoctorj.pdf.version}</version>
                     </dependency>
                     <dependency>
-                        <groupId>io.agrest.docs</groupId>
-                        <artifactId>agrest-asciidoc-postprocessor</artifactId>
-                        <version>${project.version}</version>
+                        <groupId>io.bootique.tools</groupId>
+                        <artifactId>hugo-asciidoctorj-extension</artifactId>
+                        <version>1.0-M2</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -121,11 +114,12 @@
                         <icons>font</icons>
                         <toc>auto</toc>
                         <project-version>${project.version}</project-version>
+                        <docs-version>5.x</docs-version>
+                        <hugo-header>_chapters/header.html</hugo-header>
                     </attributes>
-                    <!-- this will inject a header with "front-matter" markup -->
                     <extensions>
                         <extension>
-                            <className>io.agrest.docs.AgrestPostprocessor</className>
+                            <className>io.bootique.tools.asciidoctorj.HugoExtension</className>
                         </extension>
                     </extensions>
                 </configuration>