diff --git a/xplan-api/xplan-api-dokumente/Dockerfile b/xplan-api/xplan-api-dokumente/Dockerfile index aa8aa56441931585e819af929aa29f408d782643..1a69e8c573e21d234655eae7ae143b955fd15277 100644 --- a/xplan-api/xplan-api-dokumente/Dockerfile +++ b/xplan-api/xplan-api-dokumente/Dockerfile @@ -7,7 +7,7 @@ FROM eclipse-temurin:11.0.21_9-jre-alpine ARG BUILD_DATE=? ARG DOCKER_IMAGE_NAME=? ARG GIT_REVISION=? -ARG JAR_FILE=target/*.jar +ARG WAR_FILE=target/*-repackaged.war ARG XPLANBOX_VERSION=latest # see https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys @@ -34,7 +34,7 @@ ENV JAVA_ADDITIONAL_ARG_JMX_EXPORTER='-javaagent:$JMX_EXPORTER_DIR/jmx_prometheu ENV JAVA_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-dokumenten-config/ -Duser.timezone=Europe/Berlin" ENV DEEGREE_WORKSPACE_ROOT=/xplanbox/deegree -COPY ${JAR_FILE} /xplanbox/app.jar +COPY ${WAR_FILE} /xplanbox/app.war COPY run.sh /xplanbox/ USER 1001 diff --git a/xplan-api/xplan-api-dokumente/pom.xml b/xplan-api/xplan-api-dokumente/pom.xml index 9077b397a8a9e1fe9792c8f090fad96ec24b296f..f548a13ffc5d862a6f7234a61c50c8c3489432c6 100755 --- a/xplan-api/xplan-api-dokumente/pom.xml +++ b/xplan-api/xplan-api-dokumente/pom.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>xplan-api-dokumente</artifactId> - <packaging>jar</packaging> + <packaging>war</packaging> <parent> <groupId>de.latlon.product.xplanbox</groupId> @@ -21,12 +22,15 @@ </dependency> </dependencies> </dependencyManagement> - + <build> - <plugins> + <plugins> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <configuration> + <classifier>repackaged</classifier> + </configuration> <executions> <execution> <goals> @@ -51,16 +55,16 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> </plugins> </build> @@ -199,10 +203,10 @@ <artifactId>jersey-test-framework-core</artifactId> <scope>test</scope> <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -210,10 +214,10 @@ <artifactId>jersey-test-framework-provider-inmemory</artifactId> <scope>test</scope> <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/xplan-api/xplan-api-dokumente/run.sh b/xplan-api/xplan-api-dokumente/run.sh index d12d67ccd8497bb2b4bc582a7eb5b75e5160e792..9da77a35839ad040f46d7781afa3084db7bb46af 100755 --- a/xplan-api/xplan-api-dokumente/run.sh +++ b/xplan-api/xplan-api-dokumente/run.sh @@ -7,4 +7,4 @@ if [ -n "${ALL_ADDITIONAL_ARGS}" ]; then echo "xPlanBox JAVA_OPTS set: $JAVA_OPTS" fi -exec java $JAVA_OPTS -jar /xplanbox/app.jar +exec java $JAVA_OPTS -jar /xplanbox/app.war