From c1c12ded5c33452df2f8971c15efe4d5652aae64 Mon Sep 17 00:00:00 2001
From: amandilaras <amandilaras@cite.gr>
Date: Wed, 21 Feb 2024 10:49:06 +0200
Subject: [PATCH] apply same changes to notification-web

---
 notification-service/Dockerfile               |  4 +++-
 notification-service/notification-web/pom.xml |  5 +++--
 notification-service/notification/pom.xml     | 11 +++++++----
 notification-service/pom.xml                  |  5 +++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/notification-service/Dockerfile b/notification-service/Dockerfile
index 301727af9..744d0f133 100644
--- a/notification-service/Dockerfile
+++ b/notification-service/Dockerfile
@@ -29,7 +29,9 @@ FROM eclipse-temurin:21-jre-ubi9-minimal
 
 ARG PROFILE
 ARG REVISION
+ENV SERVER_PORT=8080
+EXPOSE ${SERVER_PORT}
 
-COPY --from=build-stage /build/notification-web/target/notification-web.jar /app/notification-web.jar
+COPY --from=build-stage /build/notification-web/target/notification-web-${REVISION}.jar /app/notification-web.jar
 
 ENTRYPOINT ["java","-Dspring.config.additional-location=file:/config/","-Dspring.profiles.active=${PROFILE}","-Djava.security.egd=file:/dev/./urandom","-jar","/app/notification-web.jar"]
\ No newline at end of file
diff --git a/notification-service/notification-web/pom.xml b/notification-service/notification-web/pom.xml
index 08dc1ec60..7e6d11adb 100644
--- a/notification-service/notification-web/pom.xml
+++ b/notification-service/notification-web/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>gr.cite</groupId>
 		<artifactId>notification-service-parent</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -15,9 +15,11 @@
 	<packaging>jar</packaging>
 
 	<properties>
+		<java.version>21</java.version>
 		<maven.compiler.release>21</maven.compiler.release>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
+		<revision>1.0.0-SNAPSHOT</revision>
 	</properties>
 
 	<dependencies>
@@ -78,7 +80,6 @@
     </dependencies>
 
 	<build>
-		<finalName>argos-notification-web</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
diff --git a/notification-service/notification/pom.xml b/notification-service/notification/pom.xml
index 391c01a46..d820e9b6f 100644
--- a/notification-service/notification/pom.xml
+++ b/notification-service/notification/pom.xml
@@ -6,16 +6,19 @@
 	<parent>
 		<groupId>gr.cite</groupId>
 		<artifactId>notification-service-parent</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>notification</artifactId>
+	<version>${revision}</version>
 
 	<properties>
-		<java.version>11</java.version>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<java.version>21</java.version>
+		<maven.compiler.release>21</maven.compiler.release>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <revision>1.0.0-SNAPSHOT</revision>
 	</properties>
 
 	<dependencies>
diff --git a/notification-service/pom.xml b/notification-service/pom.xml
index 1bb406abb..044dc8c8f 100644
--- a/notification-service/pom.xml
+++ b/notification-service/pom.xml
@@ -6,8 +6,8 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>gr.cite</groupId>
     <artifactId>notification-service-parent</artifactId>
-    <name>Argos Notification Parent</name>
-    <version>1.0.0</version>
+    <name>OpenDMP Notification Parent</name>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
     <parent>
@@ -26,6 +26,7 @@
         <maven.compiler.release>21</maven.compiler.release>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
+        <revision>1.0.0-SNAPSHOT</revision>
     </properties>
 
     <dependencies>