Update asciidoctorj versions

jakartaee · Nov 16, 2023 · b8eb04a · b8eb04a
1 parent 480b0ce
commit b8eb04a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/spec/pom.xml b/spec/pom.xml
@@ -82,9 +82,9 @@
     <properties>
         <site.output.dir>${project.build.directory}/staging</site.output.dir>
         <maven.site.skip>true</maven.site.skip>
-        <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>
@@ -169,6 +169,7 @@
                         </goals>
                         <configuration>
                             <backend>html5</backend>
+                            <sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
                             <outputFile>${project.build.directory}/generated-docs/jakarta-server-pages-spec-${project.version}.html</outputFile>
                             <attributes>
                                 <doctype>book</doctype>
@@ -192,6 +193,7 @@
                         </goals>
                         <configuration>
                             <backend>pdf</backend>
+                            <sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
                             <outputFile>${project.build.directory}/generated-docs/jakarta-server-pages-spec-${project.version}.pdf</outputFile>
                             <attributes>
                                 <pdf-stylesdir>${project.basedir}/src/main/theme</pdf-stylesdir>
@@ -214,8 +216,8 @@
                 </executions>
                 <configuration>
                     <sourceDocumentName>server-pages-spec.adoc</sourceDocumentName>
-                    <sourceHighlighter>coderay</sourceHighlighter>
                     <attributes>
+                        <source-highlighter>coderay</source-highlighter>
                         <revnumber>${project.version}</revnumber>
                         <revremark>${status}</revremark>
                         <revdate>${revisiondate}</revdate>

diff --git a/spec/src/main/asciidoc/ServerPages.adoc b/spec/src/main/asciidoc/ServerPages.adoc
@@ -3772,7 +3772,7 @@ Always resolves the requested value, returning `null`
 
 [[_JSP_Resolver_Hierarchy]]
 .*Figure JSP.2-1* JSP Resolver Hierarchy
-image:sp-2.svg[image]
+image:images/sp-2.svg[image]
 
 === Functions
 
@@ -6374,7 +6374,7 @@ produce responses.
 
 [[_Relationship_between_JSP_Pages_and_XML_views_of_JSP_pages]]
 .*Figure JSP.{jsp-chapter}-1* Relationship between JSP Pages and XML views of JSP pages
-image:sp-4.svg[image]
+image:images/sp-4.svg[image]
 
 JSP documents are used by JSP page authors.
 They can be authored directly, using a text editor, through an XML
@@ -10575,7 +10575,7 @@ the `Servlet` class corresponding to the JSP page must implement the
 
 [[Contracts_between_a_JSP_Page_and_a_JSP_Container]]
 .*Figure JSP.{jsp-chapter}-1* Contracts between a JSP Page and a JSP Container
-image:sp-11.svg[image]
+image:images/sp-11.svg[image]
 
 
 The involved contracts are shown in

diff --git a/spec/src/main/asciidoc/server-pages-spec.adoc b/spec/src/main/asciidoc/server-pages-spec.adoc
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2017, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2017, 2023 Contributors to the Eclipse Foundation
 //
 
 = Jakarta Server Pages
@@ -17,7 +17,7 @@ ifdef::backend-pdf[]
 :media: prepress
 :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