From dd060b825b03d94e3722f5c58788f5e0655cc390 Mon Sep 17 00:00:00 2001
From: elinuxhenrik <henrik.b.andersson@est.tech>
Date: Tue, 24 Aug 2021 13:26:10 +0200
Subject: [PATCH] Improvements of builds

Helm Manager Dockerfile now uses "apt get update" in the same command as it installs to avoid intermittent problems.
The Policy Agent pom now has a version for the org.codehaus.mojo:exec-maven-plugin to avoid warning during build.

Issue-ID: NONRTRIC-572
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: I144b9e3cbbc66673ce4e71973329e08dcb54649b
---
 helm-manager/Dockerfile | 5 ++---
 policy-agent/pom.xml    | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/helm-manager/Dockerfile b/helm-manager/Dockerfile
index cd44c909..96a58319 100644
--- a/helm-manager/Dockerfile
+++ b/helm-manager/Dockerfile
@@ -20,9 +20,8 @@ FROM openjdk:11-jre-slim
 ARG JAR
 
 #Install curl
-RUN apt-get update
-RUN apt-get install -y curl
-RUN apt-get install -y wget
+RUN apt-get update && apt-get install -y curl \
+    wget
 
 #Install helm
 RUN wget -O helm.tar.gz https://get.helm.sh/helm-v3.6.1-linux-amd64.tar.gz
diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml
index e66e3c3e..986b95a4 100644
--- a/policy-agent/pom.xml
+++ b/policy-agent/pom.xml
@@ -61,6 +61,7 @@
         <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
         <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
+        <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
     </properties>
     <dependencies>
         <dependency>
@@ -365,6 +366,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
+                <version>${exec-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>git submodule update</id>
-- 
2.16.6