[jOOQ#9487] Consistently use <parent> in pom.xml files

All jOOQ Maven projects now use a jOOQ <parent> project (either `jooq-parent` or `jooq-examples`).
wyddwps · Nov 13, 2019 · 5ae89a4 · 5ae89a4
1 parent f501ea8
commit 5ae89a4
Show file tree

Hide file tree

Showing 15 changed files with 97 additions and 35 deletions.
diff --git a/jOOQ-examples/jOOQ-academy/pom.xml b/jOOQ-examples/jOOQ-academy/pom.xml
@@ -3,9 +3,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-academy</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Academy</name>
 
     <licenses>

diff --git a/jOOQ-examples/jOOQ-checker-framework-example/pom.xml b/jOOQ-examples/jOOQ-checker-framework-example/pom.xml
@@ -3,9 +3,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-checker-framework-example</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Checker Framework Example</name>
 
     <licenses>

diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/pom.xml b/jOOQ-examples/jOOQ-flyway-ddl-example/pom.xml
@@ -9,7 +9,6 @@
         <version>3.13.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.jooq</groupId>
     <artifactId>jooq-flyway-ddl-example</artifactId>
     <name>jOOQ Flyway DDL Example</name>
 
@@ -24,7 +23,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>
     </properties>
 
     <dependencies>

diff --git a/jOOQ-examples/jOOQ-javaee-example/pom.xml b/jOOQ-examples/jOOQ-javaee-example/pom.xml
@@ -3,9 +3,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-javaee-example</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>jOOQ JavaEE Example</name>
 

diff --git a/jOOQ-examples/jOOQ-javafx-example/pom.xml b/jOOQ-examples/jOOQ-javafx-example/pom.xml
@@ -3,9 +3,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-javafx-example</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ JavaFX Example</name>
 
     <licenses>

diff --git a/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml b/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml
@@ -3,9 +3,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-jpa-example-entities</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ JPA Example (Entities)</name>
 
     <licenses>

diff --git a/jOOQ-examples/jOOQ-jpa-example/pom.xml b/jOOQ-examples/jOOQ-jpa-example/pom.xml
@@ -3,9 +3,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-jpa-example</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ JPA Example</name>
 
     <licenses>

diff --git a/jOOQ-examples/jOOQ-kotlin-example/pom.xml b/jOOQ-examples/jOOQ-kotlin-example/pom.xml
@@ -4,9 +4,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-kotlin-example</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Kotlin Example</name>
 
     <licenses>

diff --git a/jOOQ-examples/jOOQ-oracle-example/pom.xml b/jOOQ-examples/jOOQ-oracle-example/pom.xml
@@ -3,9 +3,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-oracle-example</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Oracle Example</name>
 
     <licenses>

diff --git a/jOOQ-examples/jOOQ-spark-chart-example/pom.xml b/jOOQ-examples/jOOQ-spark-chart-example/pom.xml
@@ -4,9 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-spark-chart-example</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
 
     <build>
         <plugins>

diff --git a/jOOQ-examples/jOOQ-spark-example/pom.xml b/jOOQ-examples/jOOQ-spark-example/pom.xml
@@ -3,9 +3,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-spark-example</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Spark Example</name>
 
     <licenses>

diff --git a/jOOQ-examples/jOOQ-spring-boot-example/pom.xml b/jOOQ-examples/jOOQ-spring-boot-example/pom.xml
@@ -4,14 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.6.RELEASE</version>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.jooq</groupId>
     <artifactId>jooq-spring-boot-example</artifactId>
-    <version>${jooq.version}</version>
     <packaging>jar</packaging>
     <name>jOOQ Spring Boot Example</name>
 
@@ -26,14 +24,22 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <start-class>org.jooq.example.spring.Application</start-class>
-        <jooq.version>3.13.0-SNAPSHOT</jooq.version>
         <java.version>1.8</java.version>
+        <spring-boot.version>2.1.6.RELEASE</spring-boot.version>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-dependencies</artifactId>
+            <version>${spring-boot.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jooq</artifactId>
+            <version>${spring-boot.version}</version>
 
             <!-- Exclude the default jOOQ dependency if
 
@@ -52,7 +58,7 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>${jooq.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -63,6 +69,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -140,7 +147,7 @@
             <plugin>
                 <groupId>org.jooq</groupId>
                 <artifactId>jooq-codegen-maven</artifactId>
-                <version>${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
@@ -3,9 +3,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-spring-example</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Spring Example</name>
 
     <licenses>

diff --git a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml
@@ -3,9 +3,13 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jooq</groupId>
+    <parent>
+        <groupId>org.jooq</groupId>
+        <artifactId>jooq-examples</artifactId>
+        <version>3.13.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>jooq-spring-guice-example</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
     <name>jOOQ Spring Guice Example</name>
 
     <licenses>

diff --git a/jOOQ-scala_2.13/pom.xml b/jOOQ-scala_2.13/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <scala.version>2.13.0</scala.version>
-        <jdbc-url-postfix>default</jdbc-url-postfix>
+        <jooq-testdata-dir>${project.basedir}/../.data</jooq-testdata-dir>
     </properties>
 
     <build>
@@ -118,6 +118,15 @@
 
 
 
+
+
+
+
+
+
+
+
+