Update java 11 base image

- replace onap/integration-java11 base image with eclipse-temurin image
- exclude powermock from being a compile time dependency of ONAP-Logging

Issue-ID: MULTICLOUD-1512
Change-Id: I6bcb97cd3808596d3af42bf15d1538b893a60fd4
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/artifactbroker/packages/docker/Dockerfile b/artifactbroker/packages/docker/Dockerfile
index 53f23a7..d8140a0 100644 (file)
--- a/artifactbroker/packages/docker/Dockerfile
+++ b/artifactbroker/packages/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM nexus3.onap.org:10001/onap/integration-java11:9.0.0
+FROM eclipse-temurin:11-jre-alpine
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -17,7 +17,8 @@ USER root
 
 EXPOSE 9014
 
-RUN apk add --no-cache mlocate zip unzip jq procps \
+RUN adduser -G onap -D onap && \
+    apk add --no-cache mlocate zip unzip jq procps \
                        curl openssh
 
 RUN mkdir -p ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS} ${ARTIFACT_HOME}/etc/ssl && \

diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
index 29a7f6e..66e518d 100644 (file)
--- a/artifactbroker/pom.xml
+++ b/artifactbroker/pom.xml
@@ -109,6 +109,10 @@
                     <groupId>org.powermock</groupId>
                     <artifactId>powermock-module-junit4</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.powermock</groupId>
+                    <artifactId>powermock-api-mockito</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>