From 7ac8b9488d889f1d4860f106a99256adb52714cb Mon Sep 17 00:00:00 2001
From: arun chapagain <arun.chapagain@huawei.com>
Date: Mon, 10 Aug 2020 15:28:02 +0530
Subject: build issue for building docker Issue-ID: SO-3073

Signed-off-by: arun chapagain <arun.chapagain@huawei.com>
Change-Id: I000f2127a4e7ac363c9d8869a32a882f596d3f9c
---
 .../appc/orchestrator/client/ApplicationControllerClient.java         | 2 +-
 packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image | 2 +-
 .../docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter   | 2 +-
 pom.xml                                                               | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java b/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java
index 1da6fc096f..65e7b35506 100644
--- a/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java
+++ b/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java
@@ -222,7 +222,7 @@ public class ApplicationControllerClient {
         commonHeader.setOriginatorId(ORIGINATOR_ID);
         commonHeader.setRequestId(requestId == null ? UUID.randomUUID().toString() : requestId);
         commonHeader.setSubRequestId(UUID.randomUUID().toString());
-        commonHeader.setXOnapRequestorid(requestorId);
+        // commonHeader.setXOnapRequestorid(requestorId);
         Flags flags = new Flags();
         String flagsMode = "NORMAL";
         Mode mode = Mode.valueOf(flagsMode);
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
index bf4a2fe01f..db57688dc1 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-base-image
@@ -1,4 +1,4 @@
-FROM docker.io/onap/integration-java11:7.0.0
+FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine
 
 ARG http_proxy
 ARG https_proxy
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter b/packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter
index ef82da4a12..19368fb597 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-nssmf-adapter
@@ -12,7 +12,7 @@ RUN mkdir -p /app/config
 RUN mkdir -p /app/certificates
 RUN mkdir -p /app/logs
 RUN mkdir -p /app/ca-certificates
-RUN apk update && apk add apache2-utils -y
+RUN apk update && apk add apache2-utils 
 
 COPY maven/app.jar /app
 COPY configs/logging/logback-spring.xml /app
diff --git a/pom.xml b/pom.xml
index edca835165..0cefebb712 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
     <jacoco.version>0.8.5</jacoco.version>
     <org.apache.maven.user-settings />
-    <openstack.version>1.6.1-SNAPSHOT</openstack.version>
+    <openstack.version>1.6.1</openstack.version>
     <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
     <originalClassifier>original</originalClassifier>
     <docker.skip>true</docker.skip>
@@ -74,7 +74,7 @@
     <format.skipValidate>false</format.skipValidate>
     <format.skipExecute>true</format.skipExecute>
     <io.fabric8.version>0.33.0</io.fabric8.version>
-    <appc.client.version>1.8.0-SNAPSHOT</appc.client.version>
+    <appc.client.version>1.7.2</appc.client.version>
     <bowman.client.version>0.8.0</bowman.client.version>
     <aaf.cadi.version>2.1.15</aaf.cadi.version>
   </properties>
-- 
cgit 1.2.3-korg