Merge pull request #35 from jmini/patch-7

Update dependencies to the latest version
asciidoctor · Dec 11, 2015 · 0b50187 · 0b50187
2 parents 1787b56 + cb87bff
commit 0b50187
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 46 deletions.
diff --git a/asciidoc-maven-site-example/pom.xml b/asciidoc-maven-site-example/pom.xml
@@ -12,7 +12,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
-        <jruby.version>1.7.20.1</jruby.version>
+        <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+        <jruby.version>9.0.4.0</jruby.version>
     </properties>
 
     <build>
@@ -33,6 +34,12 @@
                         <artifactId>jruby-complete</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>
                 </dependencies>
             </plugin>
         </plugins>

diff --git a/asciidoc-multiple-inputs-example/pom.xml b/asciidoc-multiple-inputs-example/pom.xml
@@ -11,7 +11,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
-        <jruby.version>1.7.20.1</jruby.version>
+        <asciidoctorj.pdf.version>1.5.0-alpha.10.1</asciidoctorj.pdf.version>
+        <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+        <jruby.version>9.0.4.0</jruby.version>
     </properties>
 
     <build>
@@ -25,22 +27,20 @@
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj-pdf</artifactId>
-                        <version>1.5.0-alpha.9</version>
+                        <version>${asciidoctorj.pdf.version}</version>
                     </dependency>
                     <!-- Comment this section to use the default jruby artifact provided by the plugin -->
                     <dependency>
                         <groupId>org.jruby</groupId>
                         <artifactId>jruby-complete</artifactId>
                         <version>${jruby.version}</version>
                     </dependency>
-                    <!-- Uncomment the following element to override the version of AsciidoctorJ -->
-                    <!--
+                    <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.3-SNAPSHOT</version>
+                        <version>${asciidoctorj.version}</version>
                     </dependency>
-                    -->
                 </dependencies>
                 <configuration>
                     <!-- Attributes common to all output formats -->

diff --git a/asciidoc-to-html-example/pom.xml b/asciidoc-to-html-example/pom.xml
@@ -11,7 +11,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
-        <jruby.version>1.7.20.1</jruby.version>
+        <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+        <jruby.version>9.0.4.0</jruby.version>
     </properties>
 
     <build>
@@ -28,14 +29,12 @@
                         <artifactId>jruby-complete</artifactId>
                         <version>${jruby.version}</version>
                     </dependency>
-                    <!-- Uncomment the following element to override the version of AsciidoctorJ -->
-                    <!--
+                    <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.3-SNAPSHOT</version>
+                        <version>${asciidoctorj.version}</version>
                     </dependency>
-                    -->
                 </dependencies>
                 <configuration>
                     <sourceDirectory>src/docs/asciidoc</sourceDirectory>

diff --git a/asciidoc-to-revealjs-example/pom.xml b/asciidoc-to-revealjs-example/pom.xml
@@ -12,7 +12,8 @@
         <project.slides.directory>${project.build.directory}/generated-slides</project.slides.directory>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
-        <jruby.version>1.7.20.1</jruby.version>
+        <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+        <jruby.version>9.0.4.0</jruby.version>
         <revealjs.version>3.1.0</revealjs.version>
         <asciidoctor-revealjs.version>master</asciidoctor-revealjs.version>
     </properties>
@@ -64,14 +65,12 @@
                         <artifactId>jruby-complete</artifactId>
                         <version>${jruby.version}</version>
                     </dependency>
-                    <!-- Uncomment the following element to override the version of AsciidoctorJ -->
-                    <!--
+                    <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.3-SNAPSHOT</version>
+                        <version>${asciidoctorj.version}</version>
                     </dependency>
-                    -->
                 </dependencies>
                 <configuration>
                     <sourceDirectory>src/docs/asciidoc</sourceDirectory>

diff --git a/asciidoctor-diagram-example/pom.xml b/asciidoctor-diagram-example/pom.xml
@@ -11,7 +11,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
-        <jruby.version>1.7.20.1</jruby.version>
+        <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+        <jruby.version>9.0.4.0</jruby.version>
+        <rubygems.asciidoctor.diagram.version>1.3.1</rubygems.asciidoctor.diagram.version>
     </properties>
 
     <repositories>
@@ -31,7 +33,7 @@
         <dependency>
             <groupId>rubygems</groupId>
             <artifactId>asciidoctor-diagram</artifactId>
-            <version>1.2.1</version>
+            <version>${rubygems.asciidoctor.diagram.version}</version>
             <type>gem</type>
             <scope>provided</scope>
             <exclusions>
@@ -51,7 +53,7 @@
                 <version>1.0.10</version>
                 <configuration>
                     <!-- align JRuby version with AsciidoctorJ to avoid redundant downloading -->
-                    <jrubyVersion>1.7.9</jrubyVersion>
+                    <jrubyVersion>${jruby.version}</jrubyVersion>
                     <gemHome>${project.build.directory}/gems</gemHome>
                     <gemPath>${project.build.directory}/gems</gemPath>
                 </configuration>
@@ -74,14 +76,12 @@
                         <artifactId>jruby-complete</artifactId>
                         <version>${jruby.version}</version>
                     </dependency>
-                    <!-- Uncomment the following element to override the version of AsciidoctorJ -->
-                    <!--
+                    <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.3-SNAPSHOT</version>
+                        <version>${asciidoctorj.version}</version>
                     </dependency>
-                    -->
                 </dependencies>
                 <configuration>
                     <sourceDirectory>src/docs/asciidoc</sourceDirectory>

diff --git a/asciidoctor-pdf-example/pom.xml b/asciidoctor-pdf-example/pom.xml
@@ -11,7 +11,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
-        <jruby.version>1.7.20.1</jruby.version>
+        <asciidoctorj.pdf.version>1.5.0-alpha.10.1</asciidoctorj.pdf.version>
+        <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+        <jruby.version>9.0.4.0</jruby.version>
     </properties>
 
     <build>
@@ -25,22 +27,20 @@
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj-pdf</artifactId>
-                        <version>1.5.0-alpha.9</version>
+                        <version>${asciidoctorj.pdf.version}</version>
                     </dependency>
                     <!-- Comment this section to use the default jruby artifact provided by the plugin -->
                     <dependency>
                         <groupId>org.jruby</groupId>
                         <artifactId>jruby-complete</artifactId>
                         <version>${jruby.version}</version>
                     </dependency>
-                    <!-- Uncomment the following element to override the version of AsciidoctorJ -->
-                    <!--
+                    <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.3-SNAPSHOT</version>
+                        <version>${asciidoctorj.version}</version>
                     </dependency>
-                    -->
                 </dependencies>
                 <configuration>
                     <sourceDirectory>src/docs/asciidoc</sourceDirectory>

diff --git a/docbook-pipeline-docbkx-example/pom.xml b/docbook-pipeline-docbkx-example/pom.xml
@@ -11,7 +11,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
-        <jruby.version>1.7.20.1</jruby.version>
+        <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+        <jruby.version>9.0.4.0</jruby.version>
     </properties>
 
     <build>
@@ -28,14 +29,12 @@
                         <artifactId>jruby-complete</artifactId>
                         <version>${jruby.version}</version>
                     </dependency>
-                    <!-- Uncomment the following element to override the version of AsciidoctorJ -->
-                    <!--
+                    <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.3-SNAPSHOT</version>
+                        <version>${asciidoctorj.version}</version>
                     </dependency>
-                    -->
                 </dependencies>
                 <configuration>
                     <sourceDirectory>src/docs/asciidoc</sourceDirectory>

diff --git a/docbook-pipeline-jdocbook-example/pom.xml b/docbook-pipeline-jdocbook-example/pom.xml
@@ -11,7 +11,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
-        <jruby.version>1.7.20.1</jruby.version>
+        <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+        <jruby.version>9.0.4.0</jruby.version>
     </properties>
 
     <repositories>
@@ -41,14 +42,12 @@
                         <artifactId>jruby-complete</artifactId>
                         <version>${jruby.version}</version>
                     </dependency>
-                    <!-- Uncomment the following element to override the version of AsciidoctorJ -->
-                    <!--
+                    <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.3-SNAPSHOT</version>
+                        <version>${asciidoctorj.version}</version>
                     </dependency>
-                    -->
                 </dependencies>
                 <configuration>
                     <sourceDirectory>src/docs/asciidoc</sourceDirectory>

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,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
-        <jruby.version>1.7.20.1</jruby.version>
+        <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+        <jruby.version>9.0.4.0</jruby.version>
     </properties>
 
     <build>
@@ -34,14 +35,12 @@
                         <artifactId>jruby-complete</artifactId>
                         <version>${jruby.version}</version>
                     </dependency>
-                    <!-- Uncomment the following element to override the version of AsciidoctorJ -->
-                    <!--
+                    <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj</artifactId>
-                        <version>1.5.3-SNAPSHOT</version>
+                        <version>${asciidoctorj.version}</version>
                     </dependency>
-                    -->
                 </dependencies>
                 <configuration>
                     <sourceDirectory>src/docs/asciidoc</sourceDirectory>

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,11 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
-        <jruby.version>1.7.20.1</jruby.version>
+        <asciidoctor-revealjs.version>master</asciidoctor-revealjs.version>
+        <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+        <asciidoctorj.pdf.version>1.5.0-alpha.10.1</asciidoctorj.pdf.version>
+        <jruby.version>9.0.4.0</jruby.version>
+        <rubygems.asciidoctor.diagram.version>1.3.1</rubygems.asciidoctor.diagram.version>
     </properties>
 
     <modules>