diff --git a/jOOQ-examples/jOOQ-academy/pom.xml b/jOOQ-examples/jOOQ-academy/pom.xml
index 41fd6d9a40..9f9d3892e5 100644
--- a/jOOQ-examples/jOOQ-academy/pom.xml
+++ b/jOOQ-examples/jOOQ-academy/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-academy</artifactId>
-    <version>1.0</version>
+    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Academy</name>
 
     <licenses>
@@ -18,7 +18,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>3.13.0-SNAPSHOT</org.jooq.version>
         <h2.version>1.4.199</h2.version>
     </properties>
 
@@ -28,7 +27,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -172,7 +171,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>${org.jooq.version}</version>
+                <version>${project.version}</version>
 
                 <executions>
                     <execution>
diff --git a/jOOQ-examples/jOOQ-checker-framework-example/pom.xml b/jOOQ-examples/jOOQ-checker-framework-example/pom.xml
index bdb549c0f5..ef4d28c276 100644
--- a/jOOQ-examples/jOOQ-checker-framework-example/pom.xml
+++ b/jOOQ-examples/jOOQ-checker-framework-example/pom.xml
@@ -18,7 +18,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>${project.version}</org.jooq.version>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
     </properties>
@@ -29,12 +28,12 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq-checker</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -114,12 +113,12 @@
                             <dependency>
                                 <groupId>org.jooq</groupId>
                                 <artifactId>jooq</artifactId>
-                                <version>${org.jooq.version}</version>
+                                <version>${project.version}</version>
                             </dependency>
                             <dependency>
                                 <groupId>org.jooq</groupId>
                                 <artifactId>jooq-checker</artifactId>
-                                <version>${org.jooq.version}</version>
+                                <version>${project.version}</version>
                             </dependency>
                         </dependencies>
                     </plugin>
diff --git a/jOOQ-examples/jOOQ-javaee-example/pom.xml b/jOOQ-examples/jOOQ-javaee-example/pom.xml
index ac1f94d277..bf62a25bc2 100644
--- a/jOOQ-examples/jOOQ-javaee-example/pom.xml
+++ b/jOOQ-examples/jOOQ-javaee-example/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-javaee-example</artifactId>
-    <version>${org.jooq.version}</version>
+    <version>3.13.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>jOOQ JavaEE Example</name>
 
@@ -19,7 +19,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>3.13.0-SNAPSHOT</org.jooq.version>
         <org.h2.version>1.4.199</org.h2.version>
         <java.version>1.8</java.version>
 
@@ -66,7 +65,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -203,7 +202,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>${org.jooq.version}</version>
+                <version>${project.version}</version>
 
                 <executions>
                     <execution>
diff --git a/jOOQ-examples/jOOQ-javafx-example/pom.xml b/jOOQ-examples/jOOQ-javafx-example/pom.xml
index 3a95f6ecec..081895571f 100644
--- a/jOOQ-examples/jOOQ-javafx-example/pom.xml
+++ b/jOOQ-examples/jOOQ-javafx-example/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-javafx-example</artifactId>
-    <version>1.0</version>
+    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ JavaFX Example</name>
 
     <licenses>
@@ -19,7 +19,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.jooq.version>3.13.0-SNAPSHOT</org.jooq.version>
         <org.h2.version>1.4.199</org.h2.version>
     </properties>
 
@@ -29,7 +28,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -181,7 +180,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>${org.jooq.version}</version>
+                <version>${project.version}</version>
 
                 <executions>
                     <execution>
diff --git a/jOOQ-examples/jOOQ-jpa-example/pom.xml b/jOOQ-examples/jOOQ-jpa-example/pom.xml
index f2864ef36e..1388651f01 100644
--- a/jOOQ-examples/jOOQ-jpa-example/pom.xml
+++ b/jOOQ-examples/jOOQ-jpa-example/pom.xml
@@ -18,7 +18,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>${project.version}</org.jooq.version>
         <org.h2.version>1.4.199</org.h2.version>
         <org.hibernate.version>5.4.4.Final</org.hibernate.version>
         <org.springframework.version>5.0.7.RELEASE</org.springframework.version>
@@ -30,14 +29,14 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq-jpa-example-entities</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Database access -->
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.persistence</groupId>
@@ -122,7 +121,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>${org.jooq.version}</version>
+                <version>${project.version}</version>
 
                 <executions>
                     <execution>
@@ -162,7 +161,7 @@
                     <dependency>
                         <groupId>org.jooq</groupId>
                         <artifactId>jooq-meta-extensions</artifactId>
-                        <version>${org.jooq.version}</version>
+                        <version>${project.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>javax.persistence</groupId>
diff --git a/jOOQ-examples/jOOQ-kotlin-example/pom.xml b/jOOQ-examples/jOOQ-kotlin-example/pom.xml
index 4c9c737800..0f1df1f346 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/pom.xml
+++ b/jOOQ-examples/jOOQ-kotlin-example/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-kotlin-example</artifactId>
-    <version>${org.jooq.version}</version>
+    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Kotlin Example</name>
 
     <licenses>
@@ -20,7 +20,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.version>1.2.30</kotlin.version>
-        <org.jooq.version>3.13.0-SNAPSHOT</org.jooq.version>
         <org.h2.version>1.4.199</org.h2.version>
     </properties>
 
@@ -30,7 +29,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -142,7 +141,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>${org.jooq.version}</version>
+                <version>${project.version}</version>
 
                 <executions>
                     <execution>
diff --git a/jOOQ-examples/jOOQ-oracle-example/pom.xml b/jOOQ-examples/jOOQ-oracle-example/pom.xml
index 3d2bcd5b70..ebb6854c0e 100644
--- a/jOOQ-examples/jOOQ-oracle-example/pom.xml
+++ b/jOOQ-examples/jOOQ-oracle-example/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-oracle-example</artifactId>
-    <version>1.0</version>
+    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Oracle Example</name>
 
     <licenses>
@@ -18,7 +18,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.jooq.version>3.13.0-SNAPSHOT</org.jooq.version>
         <db.oracle.version>19.3.0.0</db.oracle.version>
     </properties>
 
@@ -28,7 +27,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.oracle.ojdbc</groupId>
@@ -146,7 +145,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>${org.jooq.version}</version>
+                <version>${project.version}</version>
 
                 <executions>
                     <execution>
diff --git a/jOOQ-examples/jOOQ-spark-chart-example/pom.xml b/jOOQ-examples/jOOQ-spark-chart-example/pom.xml
index 3f7c4636f3..996b1c5ee0 100644
--- a/jOOQ-examples/jOOQ-spark-chart-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spark-chart-example/pom.xml
@@ -6,11 +6,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-spark-chart-example</artifactId>
-    <version>1.0</version>
-
-    <properties>
-        <org.jooq.version>3.13.0-SNAPSHOT</org.jooq.version>
-    </properties>
+    <version>3.13.0-SNAPSHOT</version>
 
     <build>
         <plugins>
@@ -77,7 +73,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>${org.jooq.version}</version>
+                <version>${project.version}</version>
 
                 <executions>
                     <execution>
@@ -150,7 +146,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
diff --git a/jOOQ-examples/jOOQ-spark-example/pom.xml b/jOOQ-examples/jOOQ-spark-example/pom.xml
index 1ad29928e5..7c5611b8c9 100644
--- a/jOOQ-examples/jOOQ-spark-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spark-example/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-spark-example</artifactId>
-    <version>1.0</version>
+    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Spark Example</name>
 
     <licenses>
@@ -19,7 +19,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>3.2.6.RELEASE</org.springframework.version>
-        <org.jooq.version>3.13.0-SNAPSHOT</org.jooq.version>
         <org.h2.version>1.4.199</org.h2.version>
     </properties>
 
@@ -29,7 +28,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -177,7 +176,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>${org.jooq.version}</version>
+                <version>${project.version}</version>
 
                 <executions>
                     <execution>
diff --git a/jOOQ-examples/jOOQ-spring-example/pom.xml b/jOOQ-examples/jOOQ-spring-example/pom.xml
index 8eee8564bb..5a86f41692 100644
--- a/jOOQ-examples/jOOQ-spring-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-example/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-spring-example</artifactId>
-    <version>${org.jooq.version}</version>
+    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Spring Example</name>
 
     <licenses>
@@ -19,7 +19,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>4.3.10.RELEASE</org.springframework.version>
-        <org.jooq.version>3.13.0-SNAPSHOT</org.jooq.version>
         <org.h2.version>1.4.199</org.h2.version>
     </properties>
 
@@ -29,7 +28,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
@@ -187,7 +186,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>${org.jooq.version}</version>
+                <version>${project.version}</version>
 
                 <executions>
                     <execution>
diff --git a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
index ea6dcbb9e8..ea26e8e234 100644
--- a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.jooq</groupId>
     <artifactId>jooq-spring-guice-example</artifactId>
-    <version>${org.jooq.version}</version>
+    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Spring Guice Example</name>
 
     <licenses>
@@ -19,7 +19,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.springframework.version>4.2.4.RELEASE</org.springframework.version>
-        <org.jooq.version>3.13.0-SNAPSHOT</org.jooq.version>
         <org.h2.version>1.4.199</org.h2.version>
     </properties>
 
@@ -29,7 +28,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${org.jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.jolbox</groupId>
@@ -174,7 +173,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>${org.jooq.version}</version>
+                <version>${project.version}</version>
 
                 <executions>
                     <execution>