Version updates

jakartaee · Nov 16, 2023 · 7687be7 · 7687be7
1 parent 7ff42ba
commit 7687be7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/jdsol-spec/pom.xml b/jdsol-spec/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2020 Oracle and/or its affiliates and others.
+    Copyright (c) 2017, 2023 Oracle and/or its affiliates and others.
     All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.9</version>
         <relativePath/>
     </parent>
 
@@ -83,10 +83,9 @@
     <properties>
         <site.output.dir>${project.build.directory}/staging</site.output.dir>
         <maven.site.skip>true</maven.site.skip>
-        <asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>2.4.0</asciidoctorj.version>
-        <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
-        <jruby.version>9.2.13.0</jruby.version>
+        <asciidoctorj.version>2.5.10</asciidoctorj.version>
+        <asciidoctorj.pdf.version>2.3.9</asciidoctorj.pdf.version>
+        <jruby.version>9.3.13.0</jruby.version>
         <!-- status: DRAFT, BETA, etc., or blank for final -->
         <status>DRAFT</status>
         <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
@@ -100,7 +99,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M3</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -126,7 +124,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>timestamp-property</id>
@@ -146,7 +144,6 @@
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
-                <version>${asciidoctor.maven.plugin.version}</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.jruby</groupId>
@@ -173,6 +170,7 @@
                         </goals>
                         <configuration>
                             <backend>html5</backend>
+                            <sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
                             <outputFile>${project.build.directory}/generated-docs/jdsol-spec-${project.version}.html</outputFile>
                             <attributes>
                                 <doctype>book</doctype>
@@ -196,6 +194,7 @@
                         </goals>
                         <configuration>
                             <backend>pdf</backend>
+                            <sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
                             <outputFile>${project.build.directory}/generated-docs/jdsol-spec-${project.version}.pdf</outputFile>
                             <attributes>
                                 <pdf-stylesdir>${project.basedir}/src/main/theme</pdf-stylesdir>
@@ -218,8 +217,8 @@
                 </executions>
                 <configuration>
                     <sourceDocumentName>jdsol-spec.adoc</sourceDocumentName>
-                    <sourceHighlighter>coderay</sourceHighlighter>
                     <attributes>
+                        <source-highlighter>coderay</source-highlighter>
                         <revnumber>${project.version}</revnumber>
                         <revremark>${status}</revremark>
                         <revdate>${revisiondate}</revdate>
@@ -232,7 +231,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.6.0</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>

diff --git a/jdsol-spec/src/main/asciidoc/jdsol-spec.adoc b/jdsol-spec/src/main/asciidoc/jdsol-spec.adoc
@@ -16,7 +16,7 @@
 ifdef::backend-pdf[]
 :pagenums:
 :numbered:
-:title-logo-image: image:jakarta_ee_logo_schooner_color_stacked_default.png[pdfwidth=4.25in,align=right]
+:title-logo-image: image:images/jakarta_ee_logo_schooner_color_stacked_default.png[pdfwidth=4.25in,align=right]
 endif::[]
 
 // == License

diff --git a/jdsol-spec/src/main/asciidoc/jdsol.adoc b/jdsol-spec/src/main/asciidoc/jdsol.adoc
@@ -153,7 +153,7 @@ This diagram demonstrates data flow. The particular case shown has two levels of
 translation, with file inclusion on the second level (as is the case in the
 example in <<SMAP Resolution>>).
 
-image:data-flow.png[data flow diagram,pdfwidth=75%]
+image:images/data-flow.png[data flow diagram,pdfwidth=75%]
 
 Where `TS` is <<TermTranslatedSource,translated-source>> and `FS` is
 <<TermFinalSource,final-source>>.
@@ -731,7 +731,7 @@ The following example demonstrates resolution with this algorithm. The
 example. In this example, `Incl.bar` is included by `Hi.bar`, but each is the
 result of a prior translation.
 
-image:resolution.png[resolution diagram,pdfwidth=75%]         
+image:images/resolution.png[resolution diagram,pdfwidth=75%]         
 
 If the unresolved SMAP (in `Hi.java.smap`) is as follows: