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 diff --git a/dmp-backend/Dockerfile b/dmp-backend/Dockerfile index 0377f3cf3..6f0795f2d 100644 --- a/dmp-backend/Dockerfile +++ b/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"] \ 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 9536dcc03..542d63b2e 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"> 4.0.0 + + core + 1.0-SNAPSHOT + ${packaging.type} + eu.eudat dmp-backend @@ -10,17 +15,14 @@ ../pom.xml - eu.eudat - core - ${revision} - ${packaging.type} - 21 + 21 21 21 UTF-8 1.0.0-SNAPSHOT + jar 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 @@ 4.0.0 eu.eudat dmp-backend + OpenDMP Backend Parent ${revision} pom @@ -293,6 +294,19 @@ + + cite-dev + + + cite-maven + CITE Maven Repository + https://crepo.cite.gr/repository/cite-maven/ + + + + true + + \ No newline at end of file diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml index 79bf497ad..9259a9eb0 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"> 4.0.0 - dmp-backend web ${revision} ${packaging.type} @@ -22,13 +21,14 @@ 21 21 1.0.0-SNAPSHOT + jar eu.eudat core - ${revision} + 1.0-SNAPSHOT