diff --git a/dist/pom.xml b/dist/pom.xml
index 5633da331..e6fc6cdbf 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
diff --git a/plugin-2.3/pom.xml b/plugin-2.3/pom.xml
index 0a7b7f5a9..f94809e9f 100644
--- a/plugin-2.3/pom.xml
+++ b/plugin-2.3/pom.xml
@@ -6,8 +6,14 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
+  <distributionManagement>
+    <relocation>
+      <groupId>org.jvnet.jaxb</groupId>
+      <artifactId>jaxb-maven-plugin</artifactId>
+    </relocation>
+  </distributionManagement>
 	<prerequisites>
 		<maven>${maven.version}</maven>
 	</prerequisites>
diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml
index 32675d37d..d55725069 100644
--- a/plugin-core/pom.xml
+++ b/plugin-core/pom.xml
@@ -6,8 +6,14 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
+  <distributionManagement>
+    <relocation>
+      <groupId>org.jvnet.jaxb</groupId>
+      <artifactId>jaxb-maven-plugin-core</artifactId>
+    </relocation>
+  </distributionManagement>
 	<dependencies>
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index ef9260880..31fd2e4f2 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -7,8 +7,14 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
+  <distributionManagement>
+    <relocation>
+      <groupId>org.jvnet.jaxb</groupId>
+      <artifactId>jaxb-maven-plugin</artifactId>
+    </relocation>
+  </distributionManagement>
 	<prerequisites>
 		<maven>${maven.version}</maven>
 	</prerequisites>
diff --git a/pom.xml b/pom.xml
index 04b28cf19..de0d6cb0c 100644
--- 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>0.15.4-SNAPSHOT</version>
+	<version>0.16.0-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>
@@ -184,6 +184,10 @@
 			<id>ossrh</id>
 			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
+    <relocation>
+      <groupId>org.jvnet.jaxb</groupId>
+      <artifactId>jaxb-maven-plugin-project</artifactId>
+    </relocation>
 	</distributionManagement>
 	<dependencies>
 		<!-- JUnit -->
diff --git a/samples/catalog/pom.xml b/samples/catalog/pom.xml
index 2779bcda6..dc480aa23 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
diff --git a/samples/dtd/pom.xml b/samples/dtd/pom.xml
index e671fe852..e589165a9 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
diff --git a/samples/episode/pom.xml b/samples/episode/pom.xml
index b95b123f7..7a46a3602 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
diff --git a/samples/jaxbplugins/pom.xml b/samples/jaxbplugins/pom.xml
index 17795755d..c465d9ff3 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
diff --git a/samples/po/pom.xml b/samples/po/pom.xml
index 577ff956b..4609c283f 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
diff --git a/samples/pom.xml b/samples/pom.xml
index b98d58fd2..3368366d0 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<modules>
 		<module>catalog</module>
diff --git a/testing/pom.xml b/testing/pom.xml
index 8a288468c..1a12c2688 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -6,8 +6,14 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
+  <distributionManagement>
+    <relocation>
+      <groupId>org.jvnet.jaxb</groupId>
+      <artifactId>jaxb-maven-plugin-testing</artifactId>
+    </relocation>
+  </distributionManagement>
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/tests/JAXB-1044/pom.xml b/tests/JAXB-1044/pom.xml
index b215ab6eb..89c987b63 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-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
index 60f6f94e7..1b42bc6bc 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-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
index 19ee434b2..4244e470c 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-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
index 8c1fc30a8..549df4247 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-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
index 3cc51dbe5..a202f8555 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-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
index 38fd4618e..71ca31020 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-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
index 900175fdd..bce0a5b34 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-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-79/a/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml
index ddc821d0c..ff5704e3d 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-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
index 2d30e0dd2..f4f0acee1 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-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
index 072502563..dfdcee987 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-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
index a09287652..18d56ccbf 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-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
index 887d70262..6bee7702f 100644
--- 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>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82-b</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml
index df21f5001..72348cd32 100644
--- a/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml
+++ b/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-MAVEN_JAXB2_PLUGIN-82</artifactId>
 	<packaging>pom</packaging>
diff --git a/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml
index 576357c61..37f6c8b40 100644
--- a/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml
+++ b/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-86]</name>
diff --git a/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml b/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml
index 8ea734b07..4ce765348 100644
--- a/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml
+++ b/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [MAVEN_JAXB2_PLUGIN-87]</name>
diff --git a/tests/catalog-xml/pom.xml b/tests/catalog-xml/pom.xml
index a40961214..7014c5098 100644
--- a/tests/catalog-xml/pom.xml
+++ b/tests/catalog-xml/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-catalog-xml</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/catalog/pom.xml b/tests/catalog/pom.xml
index ea5760532..a94620a47 100644
--- a/tests/catalog/pom.xml
+++ b/tests/catalog/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-catalog</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/episodes/a/pom.xml b/tests/episodes/a/pom.xml
index eadd8a277..32121b293 100644
--- a/tests/episodes/a/pom.xml
+++ b/tests/episodes/a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-episodes-a</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/episodes/b/pom.xml b/tests/episodes/b/pom.xml
index 167981e4b..c444460fd 100644
--- a/tests/episodes/b/pom.xml
+++ b/tests/episodes/b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-episodes-b</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/episodes/c/pom.xml b/tests/episodes/c/pom.xml
index a62fae453..9847b1c5c 100644
--- a/tests/episodes/c/pom.xml
+++ b/tests/episodes/c/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-episodes-c</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/episodes/d/pom.xml b/tests/episodes/d/pom.xml
index 325f24f1b..c250d2e00 100644
--- a/tests/episodes/d/pom.xml
+++ b/tests/episodes/d/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-episodes-d</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/episodes/e/pom.xml b/tests/episodes/e/pom.xml
index f95c30ee1..758087218 100644
--- a/tests/episodes/e/pom.xml
+++ b/tests/episodes/e/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-episodes-e</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/episodes/pom.xml b/tests/episodes/pom.xml
index aceedb46a..1044253e0 100644
--- a/tests/episodes/pom.xml
+++ b/tests/episodes/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-episodes</artifactId>
 	<packaging>pom</packaging>
diff --git a/tests/gh-issue-16/pom.xml b/tests/gh-issue-16/pom.xml
index 0641fc48c..90e49e59a 100644
--- a/tests/gh-issue-16/pom.xml
+++ b/tests/gh-issue-16/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [GitHub Issue #16]</name>
diff --git a/tests/gh-issue-22/a/pom.xml b/tests/gh-issue-22/a/pom.xml
index de522b96f..043ce395c 100644
--- a/tests/gh-issue-22/a/pom.xml
+++ b/tests/gh-issue-22/a/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-gh-issue-22</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-gh-issue-22-a</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/gh-issue-22/b/pom.xml b/tests/gh-issue-22/b/pom.xml
index c84cb8ddd..f4c5ad96c 100644
--- a/tests/gh-issue-22/b/pom.xml
+++ b/tests/gh-issue-22/b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-gh-issue-22</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-gh-issue-22-b</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/gh-issue-22/pom.xml b/tests/gh-issue-22/pom.xml
index 900d58313..b0e351227 100644
--- a/tests/gh-issue-22/pom.xml
+++ b/tests/gh-issue-22/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-gh-issue-22</artifactId>
 	<packaging>pom</packaging>
diff --git a/tests/gh-issue-23/one-non-strict/pom.xml b/tests/gh-issue-23/one-non-strict/pom.xml
index a8395aa2f..1d4f4bfa4 100644
--- a/tests/gh-issue-23/one-non-strict/pom.xml
+++ b/tests/gh-issue-23/one-non-strict/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-gh-issue-23</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-gh-issue-23-one-non-strict</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/gh-issue-23/pom.xml b/tests/gh-issue-23/pom.xml
index 9791bfdf9..e12a7669e 100644
--- a/tests/gh-issue-23/pom.xml
+++ b/tests/gh-issue-23/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-gh-issue-23</artifactId>
 	<packaging>pom</packaging>
diff --git a/tests/gh-issue-23/two-non-strict/pom.xml b/tests/gh-issue-23/two-non-strict/pom.xml
index cb6e91c38..3b559012c 100644
--- a/tests/gh-issue-23/two-non-strict/pom.xml
+++ b/tests/gh-issue-23/two-non-strict/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests-gh-issue-23</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>maven-jaxb2-plugin-tests-gh-issue-23-two-non-strict</artifactId>
 	<packaging>jar</packaging>
diff --git a/tests/gh-issue-58/pom.xml b/tests/gh-issue-58/pom.xml
index f0e0db1ba..5a85fa0df 100644
--- a/tests/gh-issue-58/pom.xml
+++ b/tests/gh-issue-58/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [GitHub Issue #58]</name>
diff --git a/tests/issues/pom.xml b/tests/issues/pom.xml
index f59d82b70..3e50f54ed 100644
--- a/tests/issues/pom.xml
+++ b/tests/issues/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [issues]</name>
diff --git a/tests/java-9/pom.xml b/tests/java-9/pom.xml
index 476e99244..d72677b38 100644
--- a/tests/java-9/pom.xml
+++ b/tests/java-9/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [Java 9]</name>
diff --git a/tests/p o/pom.xml b/tests/p o/pom.xml
index 0e989e62c..6426aca4f 100644
--- a/tests/p o/pom.xml	
+++ b/tests/p o/pom.xml	
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [p o]</name>
diff --git a/tests/po-2.3/pom.xml b/tests/po-2.3/pom.xml
index 21de07d37..bc321d373 100644
--- a/tests/po-2.3/pom.xml
+++ b/tests/po-2.3/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [po-2.3]</name>
diff --git a/tests/po-scd/pom.xml b/tests/po-scd/pom.xml
index 8c66db652..237841c8e 100644
--- a/tests/po-scd/pom.xml
+++ b/tests/po-scd/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [po-scd]</name>
diff --git a/tests/pom.xml b/tests/pom.xml
index b93035bb4..d2d229a70 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<modules>
 		<module>catalog</module>
diff --git a/tests/res/pom.xml b/tests/res/pom.xml
index dfb2df6c6..db9801ed8 100644
--- a/tests/res/pom.xml
+++ b/tests/res/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [res]</name>
diff --git a/tests/tse/pom.xml b/tests/tse/pom.xml
index b9e63c56c..59a170594 100644
--- a/tests/tse/pom.xml
+++ b/tests/tse/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [tse]</name>
diff --git a/tests/two/pom.xml b/tests/two/pom.xml
index fa1c9410e..bdbeb9f66 100644
--- a/tests/two/pom.xml
+++ b/tests/two/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
diff --git a/tests/xjc-simple/pom.xml b/tests/xjc-simple/pom.xml
index 7137362ab..d47e0d0d9 100644
--- a/tests/xjc-simple/pom.xml
+++ b/tests/xjc-simple/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.4-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [xjc-simple]</name>