From f78a101bd0214fbb2a2bb6c0e225c76ccd0d64c7 Mon Sep 17 00:00:00 2001
From: Thad Guidry <thadguidry@gmail.com>
Date: Tue, 12 Nov 2024 23:11:20 +0800
Subject: [PATCH] fix poms for publishing and... - also fix pom-oracle9i.xml
 dependencies versions

---
 .gitignore                |  1 +
 api-rest/pom-oracle9i.xml | 19 ++++++++++---------
 api-rest/pom.xml          |  1 +
 auth/pom.xml              |  1 +
 db2rest-common/pom.xml    |  1 +
 mariadb-dialect/pom.xml   |  1 +
 mongo-support/pom.xml     |  1 +
 mssql-dialect/pom.xml     |  1 +
 mysql-dialect/pom.xml     |  1 +
 oracle-dialect/pom.xml    |  1 +
 oracle9i-dialect/pom.xml  |  1 +
 pom.xml                   | 31 +++++++++++++++++++++++++++++--
 12 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 34f21492..fb3b4c54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
+.flattened-pom.xml
 pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
diff --git a/api-rest/pom-oracle9i.xml b/api-rest/pom-oracle9i.xml
index b15c78a4..0ea7050f 100644
--- a/api-rest/pom-oracle9i.xml
+++ b/api-rest/pom-oracle9i.xml
@@ -11,10 +11,11 @@
         <!-- lookup parent from repository -->
     </parent>
 
+    <groupId>io.9tiger</groupId>
     <artifactId>db2rest-oracle9i</artifactId>
-    <packaging>jar</packaging>
     <name>db2rest-oracle9i</name>
     <description>db2rest-oracle9i</description>
+    <packaging>jar</packaging>
     <properties>
         <java.version>21</java.version>
         <spring-restdocs.version>3.0.1</spring-restdocs.version>
@@ -25,50 +26,50 @@
         <dependency>
             <groupId>io.9tiger</groupId>
             <artifactId>auth</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.9tiger</groupId>
             <artifactId>rest-common</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.9tiger</groupId>
             <artifactId>mongo-support</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.9tiger</groupId>
             <artifactId>rdbms-support</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!--TODO - Remove -->
         <dependency>
             <groupId>io.9tiger</groupId>
             <artifactId>pg-dialect</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.9tiger</groupId>
             <artifactId>mysql-dialect</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.9tiger</groupId>
             <artifactId>mariadb-dialect</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.9tiger</groupId>
             <artifactId>oracle9i-dialect</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
diff --git a/api-rest/pom.xml b/api-rest/pom.xml
index c3c70b05..b1ebc112 100644
--- a/api-rest/pom.xml
+++ b/api-rest/pom.xml
@@ -11,6 +11,7 @@
         <!-- lookup parent from repository -->
     </parent>
 
+    <groupId>io.9tiger</groupId>
     <artifactId>db2rest</artifactId>
     <packaging>jar</packaging>
     <name>db2rest</name>
diff --git a/auth/pom.xml b/auth/pom.xml
index 9e1d645a..008c8d32 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -11,6 +11,7 @@
         <!-- lookup parent from repository -->
     </parent>
 
+    <groupId>io.9tiger</groupId>
     <artifactId>auth</artifactId>
     <name>auth</name>
     <description>auth</description>
diff --git a/db2rest-common/pom.xml b/db2rest-common/pom.xml
index 55f947b6..8d261c9c 100644
--- a/db2rest-common/pom.xml
+++ b/db2rest-common/pom.xml
@@ -11,6 +11,7 @@
         <!-- lookup parent from repository -->
     </parent>
 
+    <groupId>io.9tiger</groupId>
     <artifactId>db2rest-common</artifactId>
     <name>db2rest-common</name>
     <description>db2rest-common</description>
diff --git a/mariadb-dialect/pom.xml b/mariadb-dialect/pom.xml
index b164d7d9..bc179ade 100644
--- a/mariadb-dialect/pom.xml
+++ b/mariadb-dialect/pom.xml
@@ -11,6 +11,7 @@
         <!-- lookup parent from repository -->
     </parent>
 
+    <groupId>io.9tiger</groupId>
     <artifactId>mariadb-dialect</artifactId>
     <name>mariadb-dialect</name>
     <description>mariadb-dialect</description>
diff --git a/mongo-support/pom.xml b/mongo-support/pom.xml
index 3e2c8690..f2fa2791 100644
--- a/mongo-support/pom.xml
+++ b/mongo-support/pom.xml
@@ -11,6 +11,7 @@
         <!-- lookup parent from repository -->
     </parent>
 
+    <groupId>io.9tiger</groupId>
     <artifactId>mongo-support</artifactId>
     <name>mongo-support</name>
     <description>mongo-support</description>
diff --git a/mssql-dialect/pom.xml b/mssql-dialect/pom.xml
index 9f09dd1e..230c0b28 100644
--- a/mssql-dialect/pom.xml
+++ b/mssql-dialect/pom.xml
@@ -11,6 +11,7 @@
         <!-- lookup parent from repository -->
     </parent>
 
+    <groupId>io.9tiger</groupId>
     <artifactId>mssql-dialect</artifactId>
     <name>mssql-dialect</name>
     <description>Microsoft SQL server dialect</description>
diff --git a/mysql-dialect/pom.xml b/mysql-dialect/pom.xml
index e8f02352..113d9fe6 100644
--- a/mysql-dialect/pom.xml
+++ b/mysql-dialect/pom.xml
@@ -11,6 +11,7 @@
         <!-- lookup parent from repository -->
     </parent>
 
+    <groupId>io.9tiger</groupId>
     <artifactId>mysql-dialect</artifactId>
     <name>mysql-dialect</name>
     <description>mysql-dialect</description>
diff --git a/oracle-dialect/pom.xml b/oracle-dialect/pom.xml
index 8a9cbdd6..89a8eb9c 100644
--- a/oracle-dialect/pom.xml
+++ b/oracle-dialect/pom.xml
@@ -11,6 +11,7 @@
         <!-- lookup parent from repository -->
     </parent>
 
+    <groupId>io.9tiger</groupId>
     <artifactId>oracle-dialect</artifactId>
     <name>oracle-dialect</name>
     <description>oracle-dialect</description>
diff --git a/oracle9i-dialect/pom.xml b/oracle9i-dialect/pom.xml
index eba5c9e9..762d8711 100644
--- a/oracle9i-dialect/pom.xml
+++ b/oracle9i-dialect/pom.xml
@@ -11,6 +11,7 @@
         <!-- lookup parent from repository -->
     </parent>
 
+    <groupId>io.9tiger</groupId>
     <artifactId>oracle9i-dialect</artifactId>
     <name>oracle9i-dialect</name>
     <description>oracle9i-dialect</description>
diff --git a/pom.xml b/pom.xml
index 8e9cbc9a..e0737fa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,9 +12,10 @@
 
     <groupId>io.9tiger</groupId>
     <artifactId>db2rest-parent</artifactId>
+    <name>db2rest-parent</name>
     <version>${revision}</version>
     <packaging>pom</packaging>
-    <name>DB2Rest parent</name>
+
     <description>An Open Source instant REST Data API for databases. This is the DB2Rest parent Maven project.</description>
 
     <!-- PROJECT ORGANIZATION METADATA -->
@@ -74,7 +75,7 @@
     <!-- BEGIN MODULE LAYOUT -->
 
     <properties>
-        <revision>1.3.0</revision>
+        <revision>1.3.0-SNAPSHOT</revision>
         <java.version>21</java.version>
         <spring-restdocs.version>3.0.1</spring-restdocs.version>
     </properties>
@@ -161,6 +162,32 @@
             <id>release</id>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>flatten-maven-plugin</artifactId>
+                        <version>1.6.0</version>
+                        <configuration>
+                            <updatePomFile>true</updatePomFile>
+                            <flattenMode>oss</flattenMode>
+                            <flattenDependencyMode>all</flattenDependencyMode>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>flatten</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>flatten</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>flatten.clean</id>
+                                <phase>clean</phase>
+                                <goals>
+                                    <goal>clean</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <!-- Plugin to generate release source -->
                         <groupId>org.apache.maven.plugins</groupId>