[highsource#251] Upgrade to jaxb 2.3.7

- Remove older jaxb deps pre-2.3 - Remove maven-jaxb22-plugin - Reset version to 0.15.2-SNAPSHOT
mattrpav · Dec 29, 2022 · 06bafe9 · 06bafe9
1 parent e78fabc
commit 06bafe9
Show file tree

Hide file tree

Showing 63 changed files with 99 additions and 96 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>

diff --git a/plugin-2.0/pom.xml b/plugin-2.0/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<prerequisites>
 		<maven>${maven.version}</maven>

diff --git a/plugin-2.1/pom.xml b/plugin-2.1/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<prerequisites>
 		<maven>${maven.version}</maven>

diff --git a/plugin-2.2/pom.xml b/plugin-2.2/pom.xml
@@ -65,10 +65,10 @@
 			<version>${jaxb22.version}</version>
 		</dependency>
 		<!-- Start jaxb-xjc dependencies -->
-		<dependency>
-			<groupId>com.sun.xsom</groupId>
-			<artifactId>xsom</artifactId>
-		</dependency>
+<dependency>
+    <groupId>org.glassfish.jaxb</groupId>
+    <artifactId>xsom</artifactId>
+</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>codemodel</artifactId>

diff --git a/plugin-2.3/pom.xml b/plugin-2.3/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<prerequisites>
 		<maven>${maven.version}</maven>
@@ -21,8 +21,8 @@
 			<artifactId>plexus-utils</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
@@ -32,10 +32,10 @@
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-xjc</artifactId>
 		</dependency>
-                <dependency>
-                        <groupId>com.sun.activation</groupId>
-                        <artifactId>jakarta.activation</artifactId>
-                        <scope>compile</scope>
+        <dependency>
+            <groupId>com.sun.activation</groupId>
+            <artifactId>jakarta.activation</artifactId>
+            <scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.plugin-tools</groupId>

diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<prerequisites>
 		<maven>${maven.version}</maven>

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jvnet.jaxb2.maven2</groupId>
 	<artifactId>maven-jaxb2-plugin-project</artifactId>
-	<version>2.3.6-SNAPSHOT</version>
+	<version>0.15.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Maven JAXB 2.x Plugin Project</name>
 	<description>Maven2 plugin for JAXB 2.x XJC compiler to generate Java sources from XML Schemas.</description>
@@ -43,7 +43,7 @@
 		<module>plugin-core</module>
 		<module>plugin-2.0</module>
 		<module>plugin-2.1</module>
-		<module>plugin-2.2</module>
+		<!-- module>plugin-2.2</module -->
 		<module>plugin-2.3</module>
 		<module>plugin</module>
 		<module>testing</module>
@@ -54,12 +54,11 @@
 		<jaxb20.version>2.0.5</jaxb20.version>
 		<jaxb21.version>2.1.13</jaxb21.version>
 		<jaxb22.version>2.2.11</jaxb22.version>
-		<jaxb23.version>2.3.6</jaxb23.version>
-		<jaxb-api.version>2.3.1</jaxb-api.version>
+		<jaxb23.version>2.3.7</jaxb23.version>
+		<jaxb-api.version>2.3.3</jaxb-api.version>
 		<jaxb.version>${jaxb23.version}</jaxb.version>
 		<stax-ex.version>1.8.3</stax-ex.version>
 		<fastinfoset.version>1.2.18</fastinfoset.version>
-		<xsom.version>20140925</xsom.version>
 		<dtd-parser.version>1.4.5</dtd-parser.version>
 		<istack.version>3.0.12</istack.version>
 		<activation.version>1.2.2</activation.version>
@@ -209,13 +208,8 @@
 			</dependency>
 			<!-- Start of jaxb-runtime dependencies -->
 			<dependency>
-				<groupId>org.glassfish.jaxb</groupId>
-				<artifactId>jaxb-core</artifactId>
-				<version>2.3.0.1</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.xml.bind</groupId>
-				<artifactId>jaxb-api</artifactId>
+				<groupId>jakarta.xml.bind</groupId>
+				<artifactId>jakarta.xml.bind-api</artifactId>
 				<version>${jaxb-api.version}</version>
 			</dependency>
 			<dependency>
@@ -247,10 +241,10 @@
 			</dependency>
 
 			<!-- Start jaxb-xjc dependencies -->
-			<dependency>
-				<groupId>com.sun.xsom</groupId>
+                        <dependency>
+                                <groupId>org.glassfish.jaxb</groupId>
 				<artifactId>xsom</artifactId>
-				<version>${xsom.version}</version>
+			 	<version>${jaxb.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.glassfish.jaxb</groupId>
@@ -313,11 +307,13 @@
 				<artifactId>maven-jaxb21-plugin</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+                        <!--
 			<dependency>
 				<groupId>org.jvnet.jaxb2.maven2</groupId>
 				<artifactId>maven-jaxb22-plugin</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+                        -->
 			<dependency>
 				<groupId>org.jvnet.jaxb2.maven2</groupId>
 				<artifactId>maven-jaxb23-plugin</artifactId>

diff --git a/samples/catalog/pom.xml b/samples/catalog/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-samples</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>

diff --git a/samples/dtd/pom.xml b/samples/dtd/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-samples</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>

diff --git a/samples/episode/pom.xml b/samples/episode/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-samples</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>

diff --git a/samples/jaxbplugins/pom.xml b/samples/jaxbplugins/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-samples</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>

diff --git a/samples/po/pom.xml b/samples/po/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-samples</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>

diff --git a/samples/pom.xml b/samples/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<modules>
 		<module>catalog</module>

diff --git a/testing/pom.xml b/testing/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>

diff --git a/tests/JAXB-1044/pom.xml b/tests/JAXB-1044/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-JAXB-1044]</name>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-49/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-49/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-49]</name>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53-a</artifactId>
 	<packaging>jar</packaging>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53-b</artifactId>
 	<packaging>jar</packaging>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-53</artifactId>
 	<packaging>pom</packaging>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-69]</name>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-70]</name>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77</artifactId>
-		<version>0.14.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77-common-types</artifactId>
 	<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-77:common-types]</name>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.14.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77</artifactId>
 	<packaging>pom</packaging>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77</artifactId>
-		<version>0.14.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77-service</artifactId>
 	<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-77:service]</name>
@@ -26,18 +26,14 @@
 				<groupId>org.jvnet.jaxb2.maven2</groupId>
 				<artifactId>maven-jaxb23-plugin</artifactId>
 				<configuration>
+					<episode>true</episode>
+        				<useDependenciesAsEpisodes>true</useDependenciesAsEpisodes>
 					<schemaDirectory>src/main/resources/META-INF/project/schemas</schemaDirectory>
 					<generatePackage>com.company.project.service.types</generatePackage>
 					<catalog>src/main/jaxb/catalog.cat</catalog>
 					<catalogResolver>org.jvnet.jaxb2.maven2.resolver.tools.ClasspathCatalogResolver</catalogResolver>
 					<extension>true</extension>
 					<strict>false</strict>
-					<plugins>
-						<plugin>
-							<groupId>org.jvnet.jaxb2.maven2</groupId>
-							<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-77-common-types</artifactId>
-						</plugin>
-					</plugins>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79-a</artifactId>
 	<packaging>jar</packaging>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79-b</artifactId>
 	<packaging>jar</packaging>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-79</artifactId>
 	<packaging>pom</packaging>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82-a</artifactId>
 	<packaging>jar</packaging>

diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82</artifactId>
-		<version>2.3.6-SNAPSHOT</version>
+		<version>0.15.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82-b</artifactId>
 	<packaging>jar</packaging>