Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring

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
 

dmp-backend/Dockerfile

@@ -33,6 +33,6 @@ 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=/files/config/", "-cp", "/app/app.jar", "-Dloader.path=/files/repo-jars", "org.springframework.boot.loader.PropertiesLauncher"]
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROFILE}", "-Dspring.config.additional-location=file:/config/", "-jar", "/app/app.jar"]

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>1.0-SNAPSHOT</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>

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>

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,13 +21,14 @@
         <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>
             <artifactId>core</artifactId>
-            <version>${revision}</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>