diff --git a/admin/Dockerfile b/admin/Dockerfile index 381c97a62..3a73777f9 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -21,7 +21,7 @@ ARG DOCKER_BASE_IMAGE_PREFIX= FROM "$DOCKER_BASE_IMAGE_PREFIX"adoptopenjdk/openjdk11:jdk-11.0.10_9-alpine-slim -ARG VERSION +ARG PROJECT_BUILD_FINAL_NAME LABEL \ vendor="ABSA" \ @@ -29,7 +29,7 @@ LABEL \ license="Apache License, version 2.0" \ name="Spline Admin Tool" -COPY target/admin-$VERSION.jar ./admin.jar +COPY target/$PROJECT_BUILD_FINAL_NAME.jar ./admin.jar ENTRYPOINT ["java", "-jar", "admin.jar"] CMD ["--help"] diff --git a/admin/pom.xml b/admin/pom.xml index 15b0a0242..eb5b7bb7e 100644 --- a/admin/pom.xml +++ b/admin/pom.xml @@ -1,18 +1,18 @@ @@ -70,7 +70,9 @@ + org.apache.maven.plugins maven-assembly-plugin + 3.3.0 jar-with-dependencies @@ -97,9 +99,6 @@ dockerfile-maven-plugin false - - ${project.version} - diff --git a/build/parent-pom/pom.xml b/build/parent-pom/pom.xml index 640d8b0b9..5c4bdad51 100644 --- a/build/parent-pom/pom.xml +++ b/build/parent-pom/pom.xml @@ -19,11 +19,12 @@ 4.0.0 - za.co.absa.spline - package-pom - 0.6.1 + za.co.absa + root-pom + 1.0.0 + za.co.absa.spline parent-pom pom @@ -54,6 +55,7 @@ net.alchim31.maven scala-maven-plugin + 4.5.0 ${scala.version} @@ -94,6 +96,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true @@ -102,6 +105,7 @@ com.github.cerveada scalatest-maven-plugin + 2.0.1 ${project.build.directory}/surefire-reports . diff --git a/kafka-gateway/pom.xml b/kafka-gateway/pom.xml index fc5794c9d..df5d3c53f 100644 --- a/kafka-gateway/pom.xml +++ b/kafka-gateway/pom.xml @@ -78,6 +78,19 @@ + + org.apache.maven.plugins + maven-war-plugin + 3.2.3 + + false + + + ${maven.build.timestamp} + + + + com.spotify dockerfile-maven-plugin diff --git a/pom.xml b/pom.xml index bd1939e2b..13f4db54b 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ 4.0.0 + za.co.absa.spline spline 1.0.0-SNAPSHOT @@ -31,11 +32,33 @@ - za.co.absa.spline - package-pom - 0.6.1 + za.co.absa + root-pom + 1.0.0 + + + wajda + Oleksandr Vayda + + Tech Lead + Full-stack developer + + Europe/Prague + https://github.com/wajda + + + cerveada + Adam Červenka + + Back-end developer + + Europe/Prague + https://github.com/cerveada + + + build/parent-pom diff --git a/rest-gateway/pom.xml b/rest-gateway/pom.xml index cb2ffc595..baba98bab 100644 --- a/rest-gateway/pom.xml +++ b/rest-gateway/pom.xml @@ -68,6 +68,7 @@ org.codehaus.mojo exec-maven-plugin + 1.5.0 gen-swagger-consumer-json @@ -121,7 +122,9 @@ + org.apache.maven.plugins maven-antrun-plugin + 1.8 prepare-package @@ -144,7 +147,9 @@ + org.apache.maven.plugins maven-war-plugin + 3.2.3 false