From b676bafdab488eec724e2f8110b9c13277f9df19 Mon Sep 17 00:00:00 2001
From: amandilaras <amandilaras@cite.gr>
Date: Mon, 8 Apr 2024 09:50:16 +0300
Subject: [PATCH 1/6] try more fixes

---
 dmp-backend/core/pom.xml | 12 +++++++-----
 dmp-backend/web/pom.xml  |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml
index 9536dcc03..fce7f5b87 100644
--- a/dmp-backend/core/pom.xml
+++ b/dmp-backend/core/pom.xml
@@ -3,6 +3,11 @@
          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>
+    
+    <artifactId>core</artifactId>
+    <version>${revision}</version>
+    <packaging>${packaging.type}</packaging>
+    
     <parent>
         <groupId>eu.eudat</groupId>
         <artifactId>dmp-backend</artifactId>
@@ -10,17 +15,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>eu.eudat</groupId>
-    <artifactId>core</artifactId>
-    <version>${revision}</version>
-    <packaging>${packaging.type}</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>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <revision>1.0.0-SNAPSHOT</revision>
+        <packaging.type>jar</packaging.type>
     </properties>
     
     <dependencies>
diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml
index 79bf497ad..0bb04e4d9 100644
--- a/dmp-backend/web/pom.xml
+++ b/dmp-backend/web/pom.xml
@@ -4,7 +4,6 @@
          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>dmp-backend</groupId>
     <artifactId>web</artifactId>
     <version>${revision}</version>
     <packaging>${packaging.type}</packaging>
@@ -22,11 +21,12 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
 		<revision>1.0.0-SNAPSHOT</revision>
+        <packaging.type>jar</packaging.type>
 	</properties>
 
     <dependencies>
         <dependency>
-            <groupId>eu.eudat</groupId>
+            <!-- <groupId>eu.eudat</groupId> -->
             <artifactId>core</artifactId>
             <version>${revision}</version>
         </dependency>

From 565e8a3b1efc0abcd91fecb3a6d2e204d1fa9ae1 Mon Sep 17 00:00:00 2001
From: amandilaras <amandilaras@cite.gr>
Date: Mon, 8 Apr 2024 09:52:49 +0300
Subject: [PATCH 2/6] uncomment the groupID

---
 dmp-backend/web/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml
index 0bb04e4d9..505adb18a 100644
--- a/dmp-backend/web/pom.xml
+++ b/dmp-backend/web/pom.xml
@@ -26,7 +26,7 @@
 
     <dependencies>
         <dependency>
-            <!-- <groupId>eu.eudat</groupId> -->
+            <groupId>eu.eudat</groupId>
             <artifactId>core</artifactId>
             <version>${revision}</version>
         </dependency>

From 8833905325aff799569d8b343f9e6f9e395162e9 Mon Sep 17 00:00:00 2001
From: amandilaras <amandilaras@cite.gr>
Date: Mon, 8 Apr 2024 10:09:19 +0300
Subject: [PATCH 3/6] Dockerfile updates

---
 dmp-backend/Dockerfile   |  4 +---
 dmp-backend/core/pom.xml |  2 +-
 dmp-backend/pom.xml      | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/Dockerfile b/dmp-backend/Dockerfile
index 0377f3cf3..87a74372d 100644
--- a/dmp-backend/Dockerfile
+++ b/dmp-backend/Dockerfile
@@ -26,8 +26,6 @@ RUN mvn -Drevision=${REVISION} -DdevProfileUrl=${DEV_PROFILE_URL} -P${PROFILE} c
 ######################################## Run Stage ########################################
 FROM eclipse-temurin:21-jre-alpine
 
-WORKDIR /app
-
 ARG PROFILE
 ARG REVISION
 ENV SERVER_PORT=8080
@@ -35,4 +33,4 @@ EXPOSE ${SERVER_PORT}
 
 COPY --from=build-stage /build/web/target/web-${REVISION}.jar /app.jar
 
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROFILE}", "-Dspring.config.additional-location=/files/config/", "-cp", "/app/app.jar", "-Dloader.path=/files/repo-jars", "org.springframework.boot.loader.PropertiesLauncher"]
\ No newline at end of file
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROFILE}", "-Dspring.config.additional-location=file:/config/", "-jar", "/app/app.jar"]
\ No newline at end of file
diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml
index fce7f5b87..2aa4c67ac 100644
--- a/dmp-backend/core/pom.xml
+++ b/dmp-backend/core/pom.xml
@@ -3,7 +3,7 @@
          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>
-    
+
     <artifactId>core</artifactId>
     <version>${revision}</version>
     <packaging>${packaging.type}</packaging>
diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index 4aa20dc3b..f8044b48d 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -4,6 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.eudat</groupId>
     <artifactId>dmp-backend</artifactId>
+    <name>OpenDMP Backend Parent</name>
     <version>${revision}</version>
     <packaging>pom</packaging>
 
@@ -293,6 +294,19 @@
                 </property>
             </activation>
         </profile>
+        <profile>
+            <id>cite-dev</id>
+            <repositories>
+                <repository>
+                    <id>cite-maven</id>
+                    <name>CITE Maven Repository</name>
+                    <url>https://crepo.cite.gr/repository/cite-maven/</url>
+                </repository>
+            </repositories>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
     </profiles>
 
 </project>
\ No newline at end of file

From ef5125bb0424590a34e4319f1f2be637c10d148d Mon Sep 17 00:00:00 2001
From: amandilaras <amandilaras@cite.gr>
Date: Mon, 8 Apr 2024 10:21:56 +0300
Subject: [PATCH 4/6] rm -devel configs

---
 annotation-service/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/annotation-service/Dockerfile b/annotation-service/Dockerfile
index 1e0a28fda..b5c4d6f33 100644
--- a/annotation-service/Dockerfile
+++ b/annotation-service/Dockerfile
@@ -14,7 +14,7 @@ COPY annotation /build/annotation/
 COPY annotation-web /build/annotation-web/
 COPY settings.xml /root/.m2/settings.xml
 RUN rm -f /build/annotation-web/src/main/resources/config/app.env
-RUN rm -f /build/annotation-web/src/main/resources/config/*-dev.yml
+RUN rm -f /build/annotation-web/src/main/resources/config/*-devel.yml
 RUN rm -f /build/annotation-web/src/main/resources/logging/*.xml
 RUN rm -f /build/annotation-web/src/main/resources/certificates/*.crt
 

From c0ac0bb72874a97fb545b7c4575de6221544d667 Mon Sep 17 00:00:00 2001
From: amandilaras <amandilaras@cite.gr>
Date: Mon, 8 Apr 2024 10:29:05 +0300
Subject: [PATCH 5/6] correct path

---
 dmp-backend/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/Dockerfile b/dmp-backend/Dockerfile
index 87a74372d..6f0795f2d 100644
--- a/dmp-backend/Dockerfile
+++ b/dmp-backend/Dockerfile
@@ -26,11 +26,13 @@ RUN mvn -Drevision=${REVISION} -DdevProfileUrl=${DEV_PROFILE_URL} -P${PROFILE} c
 ######################################## Run Stage ########################################
 FROM eclipse-temurin:21-jre-alpine
 
+WORKDIR /app
+
 ARG PROFILE
 ARG REVISION
 ENV SERVER_PORT=8080
 EXPOSE ${SERVER_PORT}
 
-COPY --from=build-stage /build/web/target/web-${REVISION}.jar /app.jar
+COPY --from=build-stage /build/web/target/web-${REVISION}.jar /app/app.jar
 
 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROFILE}", "-Dspring.config.additional-location=file:/config/", "-jar", "/app/app.jar"]
\ No newline at end of file

From c1a241e4a81d2e4af978902e73d13d7f359e5549 Mon Sep 17 00:00:00 2001
From: amandilaras <amandilaras@cite.gr>
Date: Mon, 8 Apr 2024 10:34:21 +0300
Subject: [PATCH 6/6] try not use revision variable

---
 dmp-backend/core/pom.xml | 2 +-
 dmp-backend/web/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml
index 2aa4c67ac..542d63b2e 100644
--- a/dmp-backend/core/pom.xml
+++ b/dmp-backend/core/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>core</artifactId>
-    <version>${revision}</version>
+    <version>1.0-SNAPSHOT</version>
     <packaging>${packaging.type}</packaging>
     
     <parent>
diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml
index 505adb18a..9259a9eb0 100644
--- a/dmp-backend/web/pom.xml
+++ b/dmp-backend/web/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>eu.eudat</groupId>
             <artifactId>core</artifactId>
-            <version>${revision}</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>