diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..498ffaf
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,14 @@
+# Highsource Open Source Community Code of Conduct 
+
+## Code of Conduct 
+
+Act appropriately
+
+#### Attribution
+
+The Highsource Open Source Community Code of Conduct is inspired by General Motor's dress code policy updated by GM CEO Mary Barra
+
+[Business Insider article](https://www.businessinsider.com/gm-ceo-mary-barra-on-changing-gms-dress-code-2015-3)
+
+[Fortune article](http://fortune.com/2014/09/18/mary-barra-general-motors/)
+
diff --git a/debian/changelog b/debian/changelog
index 3ab4161..99f7cdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+maven-jaxb2-plugin (0.15.1+git20220427.1.e78fabc-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Thu, 05 May 2022 01:08:25 -0000
+
 maven-jaxb2-plugin (0.15.1-1) unstable; urgency=medium
 
   * New upstream version 0.15.1
diff --git a/debian/patches/0003-Replace-com.sun.org.apache.xml.internal-by-org.apach.patch b/debian/patches/0003-Replace-com.sun.org.apache.xml.internal-by-org.apach.patch
index 0042587..6f8b94e 100644
--- a/debian/patches/0003-Replace-com.sun.org.apache.xml.internal-by-org.apach.patch
+++ b/debian/patches/0003-Replace-com.sun.org.apache.xml.internal-by-org.apach.patch
@@ -9,10 +9,10 @@ Subject: Replace com.sun.org.apache.xml.internal by org.apache.xml
  .../jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java   | 4 ++--
  4 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java
-index 6fb4aae..2f882be 100644
---- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java
-+++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java
+Index: maven-jaxb2-plugin/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java
+===================================================================
+--- maven-jaxb2-plugin.orig/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java
++++ maven-jaxb2-plugin/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/RawXJC2Mojo.java
 @@ -76,8 +76,8 @@ import org.xml.sax.EntityResolver;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXException;
@@ -24,10 +24,10 @@ index 6fb4aae..2f882be 100644
  import com.sun.xml.txw2.annotation.XmlNamespace;
  
  /**
-diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java
-index 764bb69..e5a95c5 100644
---- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java
-+++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java
+Index: maven-jaxb2-plugin/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java
+===================================================================
+--- maven-jaxb2-plugin.orig/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java
++++ maven-jaxb2-plugin/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/ClasspathCatalogResolver.java
 @@ -5,7 +5,7 @@ import java.net.URISyntaxException;
  import java.net.URL;
  
@@ -37,11 +37,11 @@ index 764bb69..e5a95c5 100644
  
  	public static final String URI_SCHEME_CLASSPATH = "classpath";
  
-diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java
-index a95d51b..5a6c558 100644
---- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java
-+++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java
-@@ -10,10 +10,10 @@ import org.jvnet.jaxb2.maven2.DependencyResource;
+Index: maven-jaxb2-plugin/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java
+===================================================================
+--- maven-jaxb2-plugin.orig/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java
++++ maven-jaxb2-plugin/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/resolver/tools/MavenCatalogResolver.java
+@@ -10,10 +10,10 @@ import org.jvnet.jaxb2.maven2.Dependency
  import org.jvnet.jaxb2.maven2.DependencyResourceResolver;
  import org.jvnet.jaxb2.maven2.plugin.logging.NullLog;
  
@@ -54,10 +54,10 @@ index a95d51b..5a6c558 100644
  
  	public static final String URI_SCHEME_MAVEN = "maven";
  	private final DependencyResourceResolver dependencyResourceResolver;
-diff --git a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java b/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java
-index 588be4d..e21fabd 100644
---- a/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java
-+++ b/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java
+Index: maven-jaxb2-plugin/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java
+===================================================================
+--- maven-jaxb2-plugin.orig/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java
++++ maven-jaxb2-plugin/plugin-core/src/test/java/org/jvnet/jaxb2/maven2/resolver/tools/tests/MavenCatalogResolverTest.java
 @@ -7,8 +7,8 @@ import org.junit.Assert;
  import org.junit.Test;
  import org.xml.sax.InputSource;
diff --git a/dist/pom.xml b/dist/pom.xml
index 5e55177..0a7c636 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
diff --git a/plugin-2.0/pom.xml b/plugin-2.0/pom.xml
index fea3600..84e2355 100644
--- 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>0.15.1</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<prerequisites>
 		<maven>${maven.version}</maven>
diff --git a/plugin-2.1/pom.xml b/plugin-2.1/pom.xml
index 9e57c4a..c168a39 100644
--- 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>0.15.1</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<prerequisites>
 		<maven>${maven.version}</maven>
diff --git a/plugin-2.2/pom.xml b/plugin-2.2/pom.xml
index b37cc31..70eb3f4 100644
--- a/plugin-2.2/pom.xml
+++ b/plugin-2.2/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>0.15.1</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<prerequisites>
 		<maven>${maven.version}</maven>
diff --git a/plugin-2.3/pom.xml b/plugin-2.3/pom.xml
index db67bb6..7be9689 100644
--- 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>0.15.1</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<prerequisites>
 		<maven>${maven.version}</maven>
diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml
index e6c49b2..3048749 100644
--- a/plugin-core/pom.xml
+++ b/plugin-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-project</artifactId>
-		<version>0.15.1</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 2f83d8d..453901e 100644
--- 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>0.15.1</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<prerequisites>
 		<maven>${maven.version}</maven>
diff --git a/pom.xml b/pom.xml
index 53d5dac..2ce4dca 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.1</version>
+	<version>2.3.6-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>
@@ -19,7 +19,7 @@
         <scm>
 		<connection>scm:git:https://github.com/highsource/maven-jaxb2-plugin.git</connection>
 		<url>https://github.com/highsource/maven-jaxb2-plugin</url>
-		<tag>0.15.1</tag>
+		<tag>${project.version}</tag>
 	</scm>
 	<developers>
 		<developer>
diff --git a/samples/catalog/pom.xml b/samples/catalog/pom.xml
index f4813f5..30c4123 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
diff --git a/samples/dtd/pom.xml b/samples/dtd/pom.xml
index b1c3e78..63e2de1 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
diff --git a/samples/episode/pom.xml b/samples/episode/pom.xml
index a991bd0..7a58288 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
diff --git a/samples/jaxbplugins/pom.xml b/samples/jaxbplugins/pom.xml
index 28989ba..fdeca28 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
diff --git a/samples/po/pom.xml b/samples/po/pom.xml
index 4163618..aa8411f 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
diff --git a/samples/pom.xml b/samples/pom.xml
index 02b67a8..b6614ae 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<modules>
 		<module>catalog</module>
diff --git a/testing/pom.xml b/testing/pom.xml
index 804bd88..280a63f 100644
--- 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>0.15.1</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
diff --git a/tests/JAXB-1044/pom.xml b/tests/JAXB-1044/pom.xml
index f42a3fe..28fc319 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 a6091a2..8a3a048 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 2f6056e..99c5210 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 653c397..25bd9ea 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 0237e37..9a4a0a2 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 e161bac..d0f6b1f 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 c10925b..e826b97 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 6847d74..00bad18 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 0156642..4d83677 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 005df88..46f1a99 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 5307450..839178e 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 4353e6b..2627019 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 858de8a..4b3ca9f 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 755dffd..e266038 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 3d117fa..f214ddf 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 042cdea..88fc5cb 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 734e3ba..4a4a8ac 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 fc7b2ad..39435f5 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 186ab63..a8fdf4d 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 92c6521..5e43a0f 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 cf36aaf..6746835 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 19eca22..fceae33 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 5efaef8..4de7a95 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 ff68767..e78ad95 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 d640648..810e7cf 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 466ff84..25c2565 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 e39b0fb..c3b05a6 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 10087d4..f9fffa9 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 360144e..06c1676 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 0d4442e..d3c8781 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 dfbd122..8a9d50f 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [GitHub Issue #58]</name>
diff --git a/tests/java-9/pom.xml b/tests/java-9/pom.xml
index 18a40c3..2a20103 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 2dc83dc..7327cf2 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [p o]</name>
diff --git a/tests/po-2.0/pom.xml b/tests/po-2.0/pom.xml
index 27d010d..3f89ce0 100644
--- a/tests/po-2.0/pom.xml
+++ b/tests/po-2.0/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [po-2.0]</name>
diff --git a/tests/po-2.1/pom.xml b/tests/po-2.1/pom.xml
index 6b2e8cd..0edc8e1 100644
--- a/tests/po-2.1/pom.xml
+++ b/tests/po-2.1/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [po-raw]</name>
diff --git a/tests/po-2.3/pom.xml b/tests/po-2.3/pom.xml
index e2a30ad..4695152 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 479a18e..266c472 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [po-scd]</name>
diff --git a/tests/po/pom.xml b/tests/po/pom.xml
index b6f2660..0f1febc 100644
--- a/tests/po/pom.xml
+++ b/tests/po/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.jvnet.jaxb2.maven2</groupId>
 		<artifactId>maven-jaxb2-plugin-tests</artifactId>
-		<version>0.15.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [po]</name>
diff --git a/tests/pom.xml b/tests/pom.xml
index bef8bfa..133d5a6 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<modules>
 		<module>catalog</module>
diff --git a/tests/res/pom.xml b/tests/res/pom.xml
index c7014be..a5df612 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 e738033..a3aae01 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.1-SNAPSHOT</version>
+		<version>2.3.6-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 614e2ce..d8009f6 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
diff --git a/tests/xjc-simple/pom.xml b/tests/xjc-simple/pom.xml
index 669d760..0d6b72e 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.1-SNAPSHOT</version>
+		<version>2.3.6-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Maven JAXB 2.x Plugin Tests [xjc-simple]</name>