Merge "Merge the POMBA code to ONAP AAI data router"

diff --git a/pom.xml b/pom.xml
index 28de9b2..317cd3d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -341,13 +341,6 @@ limitations under the License.
             <groupId>com.spotify</groupId>
             <artifactId>docker-maven-plugin</artifactId>
             <version>0.4.11</version>
-            <dependencies>
-                <dependency>
-                    <groupId>com.github.jnr</groupId>
-                    <artifactId>jnr-unixsocket</artifactId>
-                    <version>0.13</version>
-                </dependency>
-            </dependencies>
             <configuration>
                <verbose>true</verbose>
                <serverId>docker-hub</serverId>

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 6ccffec..e417ead 100644 (file)
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y software-properties-common
 ## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step
 RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
 ## Setup JAVA_HOME, this is useful for docker commandline
-ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
+ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64
 RUN export JAVA_HOME
 
 # Build up the deployment folder structure