From: Dan Timoney <dtimoney@att.com>
Date: Wed, 26 Aug 2020 12:06:59 +0000 (+0000)
Subject: Merge "Remove dependencies provided by odlsli base image"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5a104d283feb11db04b825c4cf10931e655046ba;hp=ef3044c5975c29a408497cefeaf7ff642ad5f1b3;p=sdnc%2Foam.git

Merge "Remove dependencies provided by odlsli base image"
---

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index ee49e7fb..0638beda 100644
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -22,7 +22,7 @@
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
         <ccsdk.groupId>org.onap.ccsdk.features.sdnr.wt</ccsdk.groupId>
-        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.features.version>1.0.0</ccsdk.features.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <docker.push.phase>deploy</docker.push.phase>
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index a22c0e23..d82870b7 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -44,7 +44,7 @@ COPY --from=stage0 --chown=odl:odl /opt /opt
 # Add SDNC repositories to boot repositories
 RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
 RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}, ${SDNR_NORTHBOUND_REPO}, ${SDNR_WT_REPO}, ${SDNR_DM_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all, sdnr-northbound-all|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all, sdnr-northbound-all, a1-adapter-northbound|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 
 # install AAF configs
diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile
index 8f4669ad..36407fd8 100755
--- a/installation/sdnc/src/main/docker/standalone.Dockerfile
+++ b/installation/sdnc/src/main/docker/standalone.Dockerfile
@@ -44,7 +44,7 @@ COPY --from=stage0 --chown=odl:odl /opt /opt
 # Add SDNC repositories to boot repositories
 RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
 RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}, ${SDNR_NORTHBOUND_REPO}, ${SDNR_WT_REPO}, ${SDNR_DM_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all, sdnr-northbound-all|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all, sdnr-northbound-all, a1-adapter-northbound|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 
 # Install ssl and java certificates
diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index 14ba4a33..eadcfbc6 100644
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -17,7 +17,7 @@
     <description>Copies base ONAP platform-logic</description>
 
     <properties>
-        <ccsdk.distribution.version>0.7.2</ccsdk.distribution.version>
+        <ccsdk.distribution.version>1.0.1-SNAPSHOT</ccsdk.distribution.version>
     </properties>
 
     <build>