From feda7e3d07ed5739b0c479ccb4f8d69738bedb23 Mon Sep 17 00:00:00 2001
From: arjantijms <arjan.tijms@gmail.com>
Date: Thu, 23 Dec 2021 19:17:01 +0100
Subject: [PATCH] Update the plugins used to generate the spec to their latest
 versions

Note that the final release of the 2.0.0 plugin has different defaults
and requirements for setting things like the image dir.

The configuration and the documents have been adjusted for that.

Signed-off-by: arjantijms <arjan.tijms@gmail.com>
---
 spec/pom.xml                                  | 44 +++++++++++--------
 spec/src/main/asciidoc/appH-binary_data.adoc  |  2 +-
 spec/src/main/asciidoc/ch01-introduction.adoc |  2 +-
 spec/src/main/asciidoc/ch03-architecture.adoc |  4 +-
 .../asciidoc/ch05-java_representation.adoc    | 12 ++---
 .../asciidoc/ch06-binding_xml_schema.adoc     |  6 +--
 .../asciidoc/ch07-customize_xml_schema.adoc   |  2 +-
 spec/src/main/asciidoc/xml-binding-spec.adoc  |  2 +-
 8 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/spec/pom.xml b/spec/pom.xml
index 30324d3..aeb03ab 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -18,30 +18,21 @@
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
         <version>1.0.6</version>
         <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>jakarta.xml.bind</groupId>
     <artifactId>xml-binding-spec</artifactId>
+    <version>4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <version>4.0</version>
-    <name>Jakarta XML Binding Specification</name>
 
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <asciidoctor.maven.plugin.version>2.2.4</asciidoctor.maven.plugin.version>
-        <asciidoctorj.pdf.version>2.3.9</asciidoctorj.pdf.version>
-        <spec.name>jakarta-${project.artifactId}-${project.version}</spec.name>
-        <!-- status: DRAFT, BETA, etc., or blank for final -->
-        <status>DRAFT</status>
-        <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
-        <revisiondate>${maven.build.timestamp}</revisiondate>
-    </properties>
+    <name>Jakarta XML Binding Specification</name>
 
     <scm>
         <connection>scm:git:git://github.com/eclipse-ee4j/jaxb-api.git</connection>
@@ -49,28 +40,43 @@
         <url>https://github.com/eclipse-ee4j/jaxb-api.git</url>
         <tag>HEAD</tag>
     </scm>
-
     <distributionManagement>
         <site>
             <url>scm:git:git@github.com:eclipse-ee4j/jaxb-api.git</url>
         </site>
     </distributionManagement>
 
+    <properties>
+        <site.output.dir>${project.build.directory}/staging</site.output.dir>
+        <maven.site.skip>true</maven.site.skip>
+        <asciidoctor.maven.plugin.version>2.2.4</asciidoctor.maven.plugin.version>
+        <asciidoctorj.pdf.version>2.3.9</asciidoctorj.pdf.version>
+        <spec.name>jakarta-${project.artifactId}-${project.version}</spec.name>
+        <!-- status: DRAFT, BETA, etc., or blank for final -->
+        <status>DRAFT</status>
+        <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
+        <revisiondate>${maven.build.timestamp}</revisiondate>
+    </properties>
+
     <build>
         <defaultGoal>package</defaultGoal>
         <plugins>
+            <!-- Sets minimal Maven version -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <version>3.4.0</version>
                 <executions>
                     <execution>
-                        <id>enforce-versions</id>
+                        <id>enforce-env</id>
                         <goals>
                             <goal>enforce</goal>
                         </goals>
                         <configuration>
                             <rules>
+                                <requireMavenVersion>
+                                    <version>3.6.0</version>
+                                </requireMavenVersion>
                                 <requireJavaVersion>
                                     <version>[11,)</version>
                                     <message>You need Java SE 11 or newer</message>
@@ -146,12 +152,14 @@
                 <configuration>
                     <sourceDocumentName>${project.artifactId}.adoc</sourceDocumentName>
                     <attributes>
-                        <revnumber>${project.version}</revnumber>
+                        <sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
+                        <imagesdir>images</imagesdir>
+                        <source-highlighter>coderay</source-highlighter>
                         <revremark>${status}</revremark>
                         <revdate>${revisiondate}</revdate>
+                        <revnumber>${project.version}</revnumber>
                     </attributes>
                 </configuration>
-
             </plugin>
             <!--
                 This is the rule that builds the zip file for download.
diff --git a/spec/src/main/asciidoc/appH-binary_data.adoc b/spec/src/main/asciidoc/appH-binary_data.adoc
index 0b54c50..2b14bbe 100644
--- a/spec/src/main/asciidoc/appH-binary_data.adoc
+++ b/spec/src/main/asciidoc/appH-binary_data.adoc
@@ -243,5 +243,5 @@ schema customization @attachmentRef of <jaxb:property>, specified in
 
 .JAXB marshal/unmarshalling of optimized binary content.
 [[opbin]]
-image::images/xmlb-23.svg[image]
+image::xmlb-23.png[image]
 
diff --git a/spec/src/main/asciidoc/ch01-introduction.adoc b/spec/src/main/asciidoc/ch01-introduction.adoc
index 7d97c99..89d523f 100644
--- a/spec/src/main/asciidoc/ch01-introduction.adoc
+++ b/spec/src/main/asciidoc/ch01-introduction.adoc
@@ -120,7 +120,7 @@ to check incoming XML documents for validity with respect to the
 schema. +
 
 .Binding XML to Java objects
-image::images/xmlb-2.svg[image]
+image::xmlb-2.png[image]
 
 To sum up: Schemas describe the structure and
 meaning of an XML document, in much the same way that a class describes
diff --git a/spec/src/main/asciidoc/ch03-architecture.adoc b/spec/src/main/asciidoc/ch03-architecture.adoc
index 6f1050c..43b15a8 100644
--- a/spec/src/main/asciidoc/ch03-architecture.adoc
+++ b/spec/src/main/asciidoc/ch03-architecture.adoc
@@ -48,7 +48,7 @@ between concepts introduced in this section.
 
 .Non-Normative Jakarta XML Binding Architecture diagram
 [[a210]]
-image::images/xmlb-3.svg[image]
+image::xmlb-3.png[image]
 
 JAXB-annotated classes are common to both
 binding schemes. They are either generated by a schema compiler or the
@@ -62,7 +62,7 @@ within the schema or they can appear in an external binding file that is
 associated with the source schema.
 
 .JAXB 1.0 style binding of schema to interface/implementation classes.
-image::images/xmlb-4.svg[image]
+image::xmlb-4.png[image]
 
 Note that the application accesses only the
 schema-derived interfaces, factory methods and `jakarta.xml.bind` APIs
diff --git a/spec/src/main/asciidoc/ch05-java_representation.adoc b/spec/src/main/asciidoc/ch05-java_representation.adoc
index a571c43..66c13c4 100644
--- a/spec/src/main/asciidoc/ch05-java_representation.adoc
+++ b/spec/src/main/asciidoc/ch05-java_representation.adoc
@@ -636,7 +636,7 @@ value.
 
 .States of a Property Value
 [[a623]]
-image::images/xmlb-8.svg[image]
+image::xmlb-8.png[image]
 
 *_Example:_* +
 In the purchase order schema, the `partNum`
@@ -873,13 +873,13 @@ illustrate the binding changes for the following schema fragment:
 ----
 
 .JAXB 1.0: isA Relationship between generated element interface and its type
-image::images/xmlb-9.svg[image]
+image::xmlb-9.png[image]
 
 .Jakarta XML Binding: hasA Relationship between element instance and its type as described in <<Named Java Element instance>>
-image::images/xmlb-10.svg[image]
+image::xmlb-10.png[image]
 
 .Jakarta XML Binding: hasA Relationship between generated element class and its type as described in <<Java Element Class>>
-image::images/xmlb-11.svg[image]
+image::xmlb-11.png[image]
 
 While a JAXB 1.0 Element interface implemented its type’s interface,
 a Jakarta XML Binding Element instance has a
@@ -902,10 +902,10 @@ Java components introduced in this section are reflected in the
 following diagram.
 
 .UML diagram of Java Representationfootnote:[See next figure fordefault binding for anonymous type definition.]
-image::images/xmlb-12.svg[image]
+image::xmlb-12.png[image]
 
 .UML diagram when xs:element is bound to schema-derived Element class
-image::images/xmlb-13.svg[image]
+image::xmlb-13.png[image]
 
 See also <<table614>>.
 
diff --git a/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc b/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc
index 738d92f..fd28e8f 100644
--- a/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc
+++ b/spec/src/main/asciidoc/ch06-binding_xml_schema.adoc
@@ -107,7 +107,7 @@ The base type is derived upon the XML
 built-in type hierarchy [XSD PART2, Section 3] reproduced below.
 
 .XML Built-In Type Hierarchy
-image::images/xmlb-15.png[image]
+image::xmlb-15.png[image]
 
 
 The above diagram is the same as the one in
@@ -1045,7 +1045,7 @@ illustrated in <<a999>>.
 
 .Binding for a reference to a model group definition.
 [[a999]]
-image::images/xmlb-16.svg[image]
+image::xmlb-16.png[image]
 
 This binding style results in the same
 properties occurring within both Java value class’s A and C to represent
@@ -1155,7 +1155,7 @@ is bound to a Java value class with the name _FooBar_. The following
 figure illustrates this example.
 
 .Default binding for anonymous type def within a model group definition.
-image::images/xmlb-17.svg[image]
+image::xmlb-17.png[image]
 
 
 Note that even customization specified Java
diff --git a/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc b/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc
index a15a564..45166a3 100644
--- a/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc
+++ b/spec/src/main/asciidoc/ch07-customize_xml_schema.adoc
@@ -287,7 +287,7 @@ applies only to the schema element that was annotated with the binding
 declaration.
 
 .Scoping Inheritance and Overriding For Binding Declarations
-image:images/xmlb-18.svg[image]
+image::xmlb-18.png[image]
 
 The different scopes form a taxonomy. The
 taxonomy defines both the inheritance and overriding semantics of
diff --git a/spec/src/main/asciidoc/xml-binding-spec.adoc b/spec/src/main/asciidoc/xml-binding-spec.adoc
index aa59c25..bd9165d 100644
--- a/spec/src/main/asciidoc/xml-binding-spec.adoc
+++ b/spec/src/main/asciidoc/xml-binding-spec.adoc
@@ -16,7 +16,7 @@
 ifdef::backend-pdf[]
 :pagenums:
 :numbered:
-:title-logo-image: image:images/jakarta_ee_logo_schooner_color_stacked_default.png[pdfwidth=4.25in,align=right]
+:title-logo-image: image:jakarta_ee_logo_schooner_color_stacked_default.png[pdfwidth=4.25in,align=right]
 endif::[]
 
 // == License