From 3f574ee55b1e07e4658aa6b408300fab7640dc51 Mon Sep 17 00:00:00 2001
From: Gerard Bosch <gerard.bosch@gmail.com>
Date: Wed, 25 Nov 2020 13:17:57 +0100
Subject: [PATCH] Update project structure to mimic real use case

---
 .../framework/framework-lib/pom.xml           |  3 +-
 .../framework-microservice-parent/pom.xml     | 38 +++++++++++++++++++
 .../framework/framework-parent/pom.xml        | 23 -----------
 external-microservice/framework/pom.xml       | 26 ++++++++-----
 external-microservice/microservice/pom.xml    |  8 ++--
 5 files changed, 60 insertions(+), 38 deletions(-)
 create mode 100644 external-microservice/framework/framework-microservice-parent/pom.xml
 delete mode 100644 external-microservice/framework/framework-parent/pom.xml

diff --git a/external-microservice/framework/framework-lib/pom.xml b/external-microservice/framework/framework-lib/pom.xml
index 84140ee..d783ffc 100644
--- a/external-microservice/framework/framework-lib/pom.xml
+++ b/external-microservice/framework/framework-lib/pom.xml
@@ -4,9 +4,8 @@
 
     <parent>
         <groupId>com.example.framework</groupId>
-        <artifactId>framework-parent</artifactId>
+        <artifactId>framework-agg</artifactId>
         <version>0</version>
-        <relativePath>../framework-parent</relativePath>
     </parent>
 
     <artifactId>framework-lib</artifactId>
diff --git a/external-microservice/framework/framework-microservice-parent/pom.xml b/external-microservice/framework/framework-microservice-parent/pom.xml
new file mode 100644
index 0000000..23a49a3
--- /dev/null
+++ b/external-microservice/framework/framework-microservice-parent/pom.xml
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.example.framework</groupId>
+        <artifactId>framework-agg</artifactId>
+        <version>0</version>
+    </parent>
+
+    <artifactId>framework-microservice-parent</artifactId>
+    <packaging>pom</packaging>
+    <description>A parent for the microservices developed under this framework.</description>
+
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.example.framework</groupId>
+                <artifactId>framework-lib</artifactId>
+                <!--
+                 |   Using ${project.version} here will not work, as when microservice project is being built, the value
+                 |   resolves to `1` (which is the microservice version), instead of `0` (which is the framework one).
+                 |
+                 |   Using ${project.parent.version} will work instead, but ONLY as long as, microservice does not
+                 |   define its own parent proxying this one (which would have a diff version). So looks like a fragile
+                 |   workaround.
+                 |
+                 |   This is not related to JGitVer, but Maven itself. But could be a use case to integrate everything
+                 |   together :)
+                 |   * Is there any way to solve this use-case in Maven? Maybe doing something different?
+                 |-->
+                <!-- <version>${project.version}</version> -->
+                <version>${project.parent.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/external-microservice/framework/framework-parent/pom.xml b/external-microservice/framework/framework-parent/pom.xml
deleted file mode 100644
index b9916ae..0000000
--- a/external-microservice/framework/framework-parent/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.example.framework</groupId>
-        <artifactId>framework-agg</artifactId>
-        <version>0</version>
-    </parent>
-
-    <artifactId>framework-parent</artifactId>
-    <packaging>pom</packaging>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>framework-lib</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/external-microservice/framework/pom.xml b/external-microservice/framework/pom.xml
index 84438bf..f6b3ade 100644
--- a/external-microservice/framework/pom.xml
+++ b/external-microservice/framework/pom.xml
@@ -2,13 +2,21 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-<groupId>com.example.framework</groupId>
-<artifactId>framework-agg</artifactId>
-<version>0</version>
-<packaging>pom</packaging>
-
-<modules>
-    <module>framework-parent</module>
-    <module>framework-lib</module>
-</modules>
+    <groupId>com.example.framework</groupId>
+    <artifactId>framework-agg</artifactId>
+    <version>0</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>11</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+    </properties>
+
+    <modules>
+        <module>framework-lib</module>
+        <module>framework-microservice-parent</module>
+    </modules>
+
 </project>
diff --git a/external-microservice/microservice/pom.xml b/external-microservice/microservice/pom.xml
index 78c1dd4..1516115 100644
--- a/external-microservice/microservice/pom.xml
+++ b/external-microservice/microservice/pom.xml
@@ -4,19 +4,19 @@
 
     <parent>
         <groupId>com.example.framework</groupId>
-        <artifactId>framework-parent</artifactId>
-        <version>0</version>
+        <artifactId>framework-microservice-parent</artifactId>
+        <version>0</version>    <!-- using framework version F -->
     </parent>
 
     <groupId>com.example.application</groupId>
     <artifactId>microservice</artifactId>
-    <version>1</version>
+    <version>1</version>        <!-- but microservice application will have its own version M -->
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>com.example.framework</groupId>
-            <artifactId>framework-lib</artifactId>
+            <artifactId>framework-lib</artifactId>      <!-- expected always to be framework version F -->
         </dependency>
     </dependencies>
 </project>