From eb5b12c7ce09506af6923c1c7bb58dc060514a37 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Fri, 18 Jun 2021 11:23:23 -0400
Subject: [PATCH] Replacing maven-exec-plugin with maven-antrun-plugin

Adding docker.skip.run property which can be used to skip docker run during merge/stage jenkins run

Adding PATH to have JAVA_HOME added

Issue-ID: CCSDK-3226
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Iabc4132f7022c265a98cd6c39dc30d075772ff42
---
 odlsli/odlsli-alpine/pom.xml                    | 2 +-
 odlsli/odlsli-alpine/src/main/docker/Dockerfile | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 9f6a986b..aa96b8a8 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -516,7 +516,7 @@
                 <version>1.8</version>
                 <executions>
                     <execution>
-                        <id>change shell permissions</id>
+                        <id>change-shell-permissions</id>
                         <phase>process-sources</phase>
                         <configuration>
                             <target>
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index 0b6dbbf7..be93e531 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -56,6 +56,7 @@ LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)"
 USER root
 
 ENV JAVA_HOME /opt/java/openjdk
+ENV PATH ${JAVA_HOME}/bin:$PATH
 ENV ODL_HOME /opt/opendaylight/current
 ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
 ENV ANSIBLE_GPG_KEY ${ansible.gpg.key}
-- 
2.16.6