Update appc/deployment to ccsdk parent

Also updating what seem like disused version numbers
in pom and sdnc install script for documentation purposes.
Though these should probably be removed if they are
not used.

Issue-Id: CCSDK-104
Change-Id: Icdb2a456bf45e36f19c0644b3ce4357b4161e764
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

diff --git a/installation/appc/src/main/resources/sdncInstallFeatures.sh b/installation/appc/src/main/resources/sdncInstallFeatures.sh
index a119d57..b224344 100644 (file)
--- a/installation/appc/src/main/resources/sdncInstallFeatures.sh
+++ b/installation/appc/src/main/resources/sdncInstallFeatures.sh
@@ -43,10 +43,10 @@ SDNC_PLUGINS_FEATURES=" \
   restapi-call-node"
 
 
-SDNC_CORE_VERSION=${SDNC_CORE_VERSION:-0.0.1-SNAPSHOT}
-SDNC_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.0.1-SNAPSHOT}
-SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT}
-SDNC_PLUGINS_VERSION=${SDNC_PLUGINS_VERSION:-0.0.1-SNAPSHOT}
+SDNC_CORE_VERSION=${SDNC_CORE_VERSION:-0.1.2-SNAPSHOT}
+SDNC_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.1.1-SNAPSHOT}
+SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.1.1-SNAPSHOT}
+SDNC_PLUGINS_VERSION=${SDNC_PLUGINS_VERSION:-0.1.1-SNAPSHOT}
 
 echo "Enabling core features"
 ${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-all

diff --git a/pom.xml b/pom.xml
index 021982a..989d345 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>org.openecomp.sdnc.core</groupId>
-        <artifactId>root</artifactId>
-        <version>1.1.0</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-carbon-sr1</artifactId>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
@@ -21,11 +21,11 @@
 
         <!-- Setting absolute sdnc versions because the ranges defined in the sdnc root pom cause problems.
              These values override those in the parent pom (org.openecomp.sdnc.core.root). -->
-        <sdnc.core.version>1.1.2-SNAPSHOT</sdnc.core.version>
-        <sdnc.adaptors.version>1.1.2-SNAPSHOT</sdnc.adaptors.version>
-        <sdnc.northbound.version>1.1.2-SNAPSHOT</sdnc.northbound.version>
-        <sdnc.oam.version>1.1.2-SNAPSHOT</sdnc.oam.version>
-        <sdnc.plugins.version>1.1.2-SNAPSHOT</sdnc.plugins.version>
+        <sdnc.core.version>0.1.2-SNAPSHOT</sdnc.core.version>
+        <sdnc.adaptors.version>0.1.1-SNAPSHOT</sdnc.adaptors.version>
+        <sdnc.northbound.version>0.1.1-SNAPSHOT</sdnc.northbound.version>
+        <sdnc.oam.version>1.2.0-SNAPSHOT</sdnc.oam.version>
+        <sdnc.plugins.version>0.1.1-SNAPSHOT</sdnc.plugins.version>
         <sdnctl.sli.version>${sdnc.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${sdnc.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${sdnc.core.version}</sdnctl.dblib.version>