From bf3f1b548126f0833e0b1319a406c2e6d4f1f8b5 Mon Sep 17 00:00:00 2001
From: Javier Roman <javier.rmgz@gmail.com>
Date: Fri, 13 Dec 2024 13:12:12 +0100
Subject: [PATCH] Change version strategy and include the privacy plugin in the
 server module

---
 .github/workflows/main.yml |  2 +-
 core/pom.xml               |  3 +--
 coverage/pom.xml           |  8 +++----
 pom.xml                    |  4 ++--
 privacy-plugin/pom.xml     |  4 ++--
 server/pom.xml             | 47 +++++++++++++++++++++-----------------
 6 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8c372da8..3d5680d0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -59,6 +59,6 @@ jobs:
         run: mvn install -N
 
       - name: Publish to GitHub Packages
-        run: mvn deploy -pl core -am -DskipTests
+        run: mvn deploy -DskipTests
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/core/pom.xml b/core/pom.xml
index fcdd511d..fa7ebbe2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,11 +20,10 @@
     <parent>
         <groupId>io.eventeum</groupId>
         <artifactId>eventeum</artifactId>
-        <version>2.0.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>eventeum-core</artifactId>
-    <version>${eventeum.core.version}</version>
 
     <dependencies>
         <dependency>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index f6271f5a..5cc81dc4 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.eventeum</groupId>
         <artifactId>eventeum</artifactId>
-        <version>2.0.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>coverage</artifactId>
@@ -21,17 +21,17 @@
         <dependency>
             <groupId>io.eventeum</groupId>
             <artifactId>eventeum-core</artifactId>
-            <version>${eventeum.core.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>io.eventeum</groupId>
             <artifactId>eventeum-privacy-plugin</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>io.eventeum</groupId>
             <artifactId>eventeum-server</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index e0f8ab9e..d4636384 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>io.eventeum</groupId>
     <artifactId>eventeum</artifactId>
-    <version>2.0.0</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -36,7 +36,7 @@
     </modules>
 
     <properties>
-        <eventeum.core.version>2.0.1</eventeum.core.version>
+        <revision>2.0.1</revision>
         <java.version>21</java.version>
         <web3j.version>4.12.0</web3j.version>
         <springcloud.version>4.1.2</springcloud.version>
diff --git a/privacy-plugin/pom.xml b/privacy-plugin/pom.xml
index a9140afc..966a8fad 100644
--- a/privacy-plugin/pom.xml
+++ b/privacy-plugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.eventeum</groupId>
         <artifactId>eventeum</artifactId>
-        <version>2.0.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>eventeum-privacy-plugin</artifactId>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>io.eventeum</groupId>
             <artifactId>eventeum-core</artifactId>
-            <version>${eventeum.core.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index c8aa4aff..b834816c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.eventeum</groupId>
         <artifactId>eventeum</artifactId>
-        <version>2.0.0</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>eventeum-server</artifactId>
@@ -39,26 +39,37 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.eventeum</groupId>
-            <artifactId>eventeum-core</artifactId>
-            <version>${eventeum.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>
         </dependency>
-        <!-- Micrometer Prometheus registry  -->
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
             <version>${micrometer.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.pulsar</groupId>
+            <artifactId>pulsar-client</artifactId>
+            <version>${pulsar.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.web3j</groupId>
+            <artifactId>besu</artifactId>
+            <version>${web3j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.eventeum</groupId>
+            <artifactId>eventeum-core</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.eventeum</groupId>
+            <artifactId>eventeum-privacy-plugin</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <!-- Test dependencies -->
         <dependency>
             <groupId>de.flapdoodle.embed</groupId>
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
@@ -95,15 +106,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.pulsar</groupId>
-            <artifactId>pulsar-client</artifactId>
-            <version>${pulsar.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.web3j</groupId>
-            <artifactId>besu</artifactId>
-            <version>${web3j.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>