[highsource#425] upgrade to jaxb-ri 4.0.4 (add test project for javadoc)

laurentschoelens · Oct 20, 2023 · a7a0655 · a7a0655
1 parent 2474c7b
commit a7a0655
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 17 deletions.
diff --git a/jaxb-annotate-parent/tests/base-dependent/pom.xml b/jaxb-annotate-parent/tests/base-dependent/pom.xml
@@ -14,12 +14,10 @@
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>4.0.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-xjc</artifactId>
-      <version>4.0.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
@@ -42,18 +40,6 @@
       <plugin>
         <groupId>org.jvnet.jaxb</groupId>
         <artifactId>jaxb-maven-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-runtime</artifactId>
-            <version>4.0.4-SNAPSHOT</version>
-          </dependency>
-          <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-            <version>4.0.4-SNAPSHOT</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <id>base</id>

diff --git a/jaxb-annotate-parent/tests/pom.xml b/jaxb-annotate-parent/tests/pom.xml
@@ -45,6 +45,7 @@
     <module>annotations</module>
     <module>annox</module>
     <module>annotate</module>
+    <module>base-dependent</module>
     <module>issues</module>
     <module>one</module>
   </modules>

diff --git a/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/AbstractXJCMojo.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/AbstractXJCMojo.java
@@ -925,9 +925,13 @@ public void setEpisode(boolean episode) {
 	 * (via <code>scd="x-schema::..."</code>) in the generated episode files.
 	 * This is necessary to avoid the annoying `SCD "x-schema::tns" didn't
 	 * match any schema component` errors.
+     *
+     * @deprecated this is kept for retro-compatibility but will be removed since
+     * original bug has been resolved in 4.0.4 JAXB-RI
 	 */
-	@Parameter(property = "maven.xjc2.addIfExistsToEpisodeSchemaBindings", defaultValue = "true")
-	private boolean addIfExistsToEpisodeSchemaBindings = true;
+    @Deprecated(since = "4.0.1", forRemoval = true)
+	@Parameter(property = "maven.xjc2.addIfExistsToEpisodeSchemaBindings", defaultValue = "false")
+	private boolean addIfExistsToEpisodeSchemaBindings = false;
 
 	public boolean isAddIfExistsToEpisodeSchemaBindings() {
 		return this.addIfExistsToEpisodeSchemaBindings;

diff --git a/maven-plugin/tests/javadoc/pom.xml b/maven-plugin/tests/javadoc/pom.xml
@@ -0,0 +1,30 @@
+<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 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jaxb-maven-plugin-tests-javadoc</artifactId>
+  <parent>
+    <groupId>org.jvnet.jaxb</groupId>
+    <artifactId>jaxb-maven-plugin-tests</artifactId>
+    <version>4.0.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <packaging>jar</packaging>
+  <name>JAXB Tools :: Maven Plugin :: Test [javadoc]</name>
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/maven-plugin/tests/javadoc/src/main/resources/schema.xsd b/maven-plugin/tests/javadoc/src/main/resources/schema.xsd
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb">
+  <xs:element name="Lison" type="Lison"/>
+  <xs:complexType name="Lison">
+    <xs:annotation>
+      <xs:documentation>My awesome complex type comment.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="Truck" type="xs:string" minOccurs="1" maxOccurs="1">
+        <xs:annotation>
+          <xs:documentation>My awesome element comment.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
diff --git a/maven-plugin/tests/javadoc/src/test/resources/log4j.properties b/maven-plugin/tests/javadoc/src/test/resources/log4j.properties
@@ -0,0 +1,8 @@
+log4j.rootCategory=DEBUG, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.target=system.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%m%n	%c%n%n
+log4j.logger.org.apache.commons.digester=INFO
+log4j.logger.org.jvnet.hyperjaxb3=DEBUG
+log4j.logger.org.hibernate=WARN
diff --git a/maven-plugin/tests/pom.xml b/maven-plugin/tests/pom.xml
@@ -31,6 +31,7 @@
     <module>catalog-xml</module>
     <module>episodes</module>
     <module>issues</module>
+    <module>javadoc</module>
     <module>p_o</module>
     <module>po-2.3</module>
     <module>po-scd</module>

diff --git a/pom.xml b/pom.xml
@@ -64,7 +64,7 @@
 
     <!-- Dependencies versions -->
     <ant.version>1.10.12</ant.version>
-    <jaxb.version>4.0.2</jaxb.version>
+    <jaxb.version>4.0.4</jaxb.version>
 
     <commons-beanutils.version>1.9.4</commons-beanutils.version>
     <commons-io.version>2.11.0</commons-io.version>