diff --git a/jaxb-ri/boms/bom-ext/pom.xml b/jaxb-ri/boms/bom-ext/pom.xml
index 54e1c18..dd43686 100644
--- a/jaxb-ri/boms/bom-ext/pom.xml
+++ b/jaxb-ri/boms/bom-ext/pom.xml
@@ -19,7 +19,7 @@
         <groupId>org.glassfish.jaxb</groupId>
         <artifactId>jaxb-bom</artifactId>
         <relativePath>../bom/pom.xml</relativePath>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>com.sun.xml.bind</groupId>
diff --git a/jaxb-ri/boms/bom/pom.xml b/jaxb-ri/boms/bom/pom.xml
index a753112..adb5faa 100644
--- a/jaxb-ri/boms/bom/pom.xml
+++ b/jaxb-ri/boms/bom/pom.xml
@@ -24,7 +24,7 @@
 
     <groupId>org.glassfish.jaxb</groupId>
     <artifactId>jaxb-bom</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
     <name>JAXB BOM</name>
diff --git a/jaxb-ri/bundles/core/pom.xml b/jaxb-ri/bundles/core/pom.xml
index c0c7af0..c5431f7 100644
--- a/jaxb-ri/bundles/core/pom.xml
+++ b/jaxb-ri/bundles/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-bundles</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/bundles/jxc/pom.xml b/jaxb-ri/bundles/jxc/pom.xml
index b54faa7..20c7d05 100644
--- a/jaxb-ri/bundles/jxc/pom.xml
+++ b/jaxb-ri/bundles/jxc/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-bundles</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/bundles/osgi/osgi/pom.xml b/jaxb-ri/bundles/osgi/osgi/pom.xml
index 8c803ec..c2993d7 100644
--- a/jaxb-ri/bundles/osgi/osgi/pom.xml
+++ b/jaxb-ri/bundles/osgi/osgi/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-osgi</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/bundles/osgi/pom.xml b/jaxb-ri/bundles/osgi/pom.xml
index 7d04009..b5c7eb1 100644
--- a/jaxb-ri/bundles/osgi/pom.xml
+++ b/jaxb-ri/bundles/osgi/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-bundles</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/bundles/osgi/tests/pom.xml b/jaxb-ri/bundles/osgi/tests/pom.xml
index 11ff1a8..6a4f2fd 100644
--- a/jaxb-ri/bundles/osgi/tests/pom.xml
+++ b/jaxb-ri/bundles/osgi/tests/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-osgi</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>tests</artifactId>
diff --git a/jaxb-ri/bundles/pom.xml b/jaxb-ri/bundles/pom.xml
index 37ccdf1..4929f3f 100644
--- a/jaxb-ri/bundles/pom.xml
+++ b/jaxb-ri/bundles/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/bundles/ri/pom.xml b/jaxb-ri/bundles/ri/pom.xml
index 95e7cac..f92c649 100644
--- a/jaxb-ri/bundles/ri/pom.xml
+++ b/jaxb-ri/bundles/ri/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-bundles</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/bundles/runtime/pom.xml b/jaxb-ri/bundles/runtime/pom.xml
index e7f7602..18bd4c3 100644
--- a/jaxb-ri/bundles/runtime/pom.xml
+++ b/jaxb-ri/bundles/runtime/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-bundles</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/bundles/xjc/pom.xml b/jaxb-ri/bundles/xjc/pom.xml
index 20ad815..a931459 100644
--- a/jaxb-ri/bundles/xjc/pom.xml
+++ b/jaxb-ri/bundles/xjc/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-bundles</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml b/jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml
index ba3e142..17e4cf1 100644
--- a/jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml
+++ b/jaxb-ri/codemodel/codemodel-annotation-compiler/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-codemodel-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.jaxb</groupId>
diff --git a/jaxb-ri/codemodel/codemodel/pom.xml b/jaxb-ri/codemodel/codemodel/pom.xml
index 83a9309..792d0d6 100644
--- a/jaxb-ri/codemodel/codemodel/pom.xml
+++ b/jaxb-ri/codemodel/codemodel/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-codemodel-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/codemodel/pom.xml b/jaxb-ri/codemodel/pom.xml
index ae726e8..f5037c3 100644
--- a/jaxb-ri/codemodel/pom.xml
+++ b/jaxb-ri/codemodel/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>com.sun.xml.bind.mvn</groupId>
     <artifactId>jaxb-codemodel-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Codemodel</name>
     <description>Java source code generation library</description>
diff --git a/jaxb-ri/core/pom.xml b/jaxb-ri/core/pom.xml
index 0e7fba8..301fd50 100644
--- a/jaxb-ri/core/pom.xml
+++ b/jaxb-ri/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/docs/pom.xml b/jaxb-ri/docs/pom.xml
index abfa77c..3e04acd 100644
--- a/jaxb-ri/docs/pom.xml
+++ b/jaxb-ri/docs/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/docs/release-documentation/pom.xml b/jaxb-ri/docs/release-documentation/pom.xml
index cdb292d..8a070fc 100644
--- a/jaxb-ri/docs/release-documentation/pom.xml
+++ b/jaxb-ri/docs/release-documentation/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-docs-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>com.sun.xml.bind</groupId>
diff --git a/jaxb-ri/docs/www/pom.xml b/jaxb-ri/docs/www/pom.xml
index 2d8a08b..91beadf 100644
--- a/jaxb-ri/docs/www/pom.xml
+++ b/jaxb-ri/docs/www/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-docs-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/external/pom.xml b/jaxb-ri/external/pom.xml
index 9b5f451..a05d66a 100644
--- a/jaxb-ri/external/pom.xml
+++ b/jaxb-ri/external/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.sun.xml.bind.mvn</groupId>
     <artifactId>jaxb-external-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <name>JAXB External parent</name>
     <description>JAXB External parent module. Contains sources for external components.</description>
     <url>https://eclipse-ee4j.github.io/jaxb-ri/</url>
diff --git a/jaxb-ri/external/relaxng-datatype/pom.xml b/jaxb-ri/external/relaxng-datatype/pom.xml
index c3459f6..04c18d7 100644
--- a/jaxb-ri/external/relaxng-datatype/pom.xml
+++ b/jaxb-ri/external/relaxng-datatype/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>jaxb-external-parent</artifactId>
         <groupId>com.sun.xml.bind.mvn</groupId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/jaxb-ri/external/rngom/pom.xml b/jaxb-ri/external/rngom/pom.xml
index f2c9958..7ff9a10 100644
--- a/jaxb-ri/external/rngom/pom.xml
+++ b/jaxb-ri/external/rngom/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-external-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/jxc/pom.xml b/jaxb-ri/jxc/pom.xml
index ad70986..8f6ff25 100644
--- a/jaxb-ri/jxc/pom.xml
+++ b/jaxb-ri/jxc/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/pom.xml b/jaxb-ri/pom.xml
index 4b4be0f..3aa799d 100644
--- a/jaxb-ri/pom.xml
+++ b/jaxb-ri/pom.xml
@@ -18,13 +18,13 @@
     <parent>
         <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-bom-ext</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>boms/bom-ext/pom.xml</relativePath>
     </parent>
 
     <groupId>com.sun.xml.bind.mvn</groupId>
     <artifactId>jaxb-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Jakarta XML Binding Implementation</name>
     <description>
diff --git a/jaxb-ri/runtime/impl/pom.xml b/jaxb-ri/runtime/impl/pom.xml
index 1c7b2b8..142f10e 100644
--- a/jaxb-ri/runtime/impl/pom.xml
+++ b/jaxb-ri/runtime/impl/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-runtime-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/runtime/pom.xml b/jaxb-ri/runtime/pom.xml
index c0cb15d..51f1a8c 100644
--- a/jaxb-ri/runtime/pom.xml
+++ b/jaxb-ri/runtime/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/samples/pom.xml b/jaxb-ri/samples/pom.xml
index 315924a..d50e93b 100644
--- a/jaxb-ri/samples/pom.xml
+++ b/jaxb-ri/samples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>com.sun.xml.bind</groupId>
diff --git a/jaxb-ri/tools/osgi_tests/core/pom.xml b/jaxb-ri/tools/osgi_tests/core/pom.xml
index 62a1ed9..04fdac9 100644
--- a/jaxb-ri/tools/osgi_tests/core/pom.xml
+++ b/jaxb-ri/tools/osgi_tests/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>osgi-tests</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/tools/osgi_tests/jxc/pom.xml b/jaxb-ri/tools/osgi_tests/jxc/pom.xml
index a8b394b..84358e4 100644
--- a/jaxb-ri/tools/osgi_tests/jxc/pom.xml
+++ b/jaxb-ri/tools/osgi_tests/jxc/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>osgi-tests</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/tools/osgi_tests/osgi/pom.xml b/jaxb-ri/tools/osgi_tests/osgi/pom.xml
index e6d9edc..b420093 100644
--- a/jaxb-ri/tools/osgi_tests/osgi/pom.xml
+++ b/jaxb-ri/tools/osgi_tests/osgi/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>osgi-tests</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/tools/osgi_tests/parent/pom.xml b/jaxb-ri/tools/osgi_tests/parent/pom.xml
index a268c45..e0e24d3 100644
--- a/jaxb-ri/tools/osgi_tests/parent/pom.xml
+++ b/jaxb-ri/tools/osgi_tests/parent/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>osgi-tests</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/tools/osgi_tests/pom.xml b/jaxb-ri/tools/osgi_tests/pom.xml
index 6f98044..a1a2525 100644
--- a/jaxb-ri/tools/osgi_tests/pom.xml
+++ b/jaxb-ri/tools/osgi_tests/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/tools/osgi_tests/runtime/pom.xml b/jaxb-ri/tools/osgi_tests/runtime/pom.xml
index e716d3a..ad37a68 100644
--- a/jaxb-ri/tools/osgi_tests/runtime/pom.xml
+++ b/jaxb-ri/tools/osgi_tests/runtime/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>osgi-tests</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/tools/osgi_tests/xjc/pom.xml b/jaxb-ri/tools/osgi_tests/xjc/pom.xml
index d45376f..c211b0d 100644
--- a/jaxb-ri/tools/osgi_tests/xjc/pom.xml
+++ b/jaxb-ri/tools/osgi_tests/xjc/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>osgi-tests</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/txw/compiler/pom.xml b/jaxb-ri/txw/compiler/pom.xml
index 3bf3276..d6a3610 100644
--- a/jaxb-ri/txw/compiler/pom.xml
+++ b/jaxb-ri/txw/compiler/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-txw-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/txw/pom.xml b/jaxb-ri/txw/pom.xml
index 2382a2e..4697704 100644
--- a/jaxb-ri/txw/pom.xml
+++ b/jaxb-ri/txw/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/txw/runtime/pom.xml b/jaxb-ri/txw/runtime/pom.xml
index 2a412f1..3607967 100644
--- a/jaxb-ri/txw/runtime/pom.xml
+++ b/jaxb-ri/txw/runtime/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-txw-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/xjc/pom.xml b/jaxb-ri/xjc/pom.xml
index 41d5175..5c84739 100644
--- a/jaxb-ri/xjc/pom.xml
+++ b/jaxb-ri/xjc/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.sun.xml.bind.mvn</groupId>
         <artifactId>jaxb-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jaxb-ri/xsom/pom.xml b/jaxb-ri/xsom/pom.xml
index 7f5615a..b600fa1 100644
--- a/jaxb-ri/xsom/pom.xml
+++ b/jaxb-ri/xsom/pom.xml
@@ -23,7 +23,7 @@
 
     <groupId>org.glassfish.jaxb</groupId>
     <artifactId>xsom</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
 
     <name>XSOM</name>
     <description>XML Schema Object Model (XSOM) is a Java library that allows applications to easily parse XML Schema