From 1f142c672f7c75c618e9f1234eebc8c7e7802342 Mon Sep 17 00:00:00 2001
From: amandilaras <amandilaras@cite.gr>
Date: Fri, 5 Apr 2024 17:52:20 +0300
Subject: [PATCH 1/2] possible fixes for Docker build

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

diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml
index 2a7ec8831..9b09a53f1 100644
--- a/dmp-backend/core/pom.xml
+++ b/dmp-backend/core/pom.xml
@@ -14,9 +14,13 @@
     <version>${revision}</version>
 
     <properties>
+        <java.version>21</java.version>
+		<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>
     </properties>
+    
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml
index fbeddca5c..79a6f2883 100644
--- a/dmp-backend/web/pom.xml
+++ b/dmp-backend/web/pom.xml
@@ -13,8 +13,16 @@
         <groupId>eu.eudat</groupId>
         <artifactId>dmp-backend</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <properties>
+		<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>
         <dependency>
             <groupId>eu.eudat</groupId>
@@ -22,7 +30,6 @@
             <version>${revision}</version>
         </dependency>
 
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

From ad069b5568e3838e3d5c6c84020248cc8a34a59b Mon Sep 17 00:00:00 2001
From: amandilaras <amandilaras@cite.gr>
Date: Fri, 5 Apr 2024 17:55:19 +0300
Subject: [PATCH 2/2] remove duplicate properties

---
 dmp-backend/web/pom.xml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml
index 79a6f2883..79bf497ad 100644
--- a/dmp-backend/web/pom.xml
+++ b/dmp-backend/web/pom.xml
@@ -17,9 +17,10 @@
     </parent>
 
     <properties>
-		<maven.compiler.release>21</maven.compiler.release>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
+        <start-class>eu.eudat.EuDatApplication</start-class>
+        <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>
 
@@ -192,12 +193,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <properties>
-        <start-class>eu.eudat.EuDatApplication</start-class>
-        <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>
 </project>
\ No newline at end of file