From: Dan Timoney <dtimoney@att.com>
Date: Thu, 28 Sep 2017 11:41:12 +0000 (+0000)
Subject: Merge "Setup ReadTheDocs"
X-Git-Tag: v0.1.0~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=720cc98ae85ab45b94e00d07aa0504b85ba98f58;hp=67d4bc68a3f11cc5aff0132482d29d68ed7c3ba9;p=ccsdk%2Fdistribution.git

Merge "Setup ReadTheDocs"
---

diff --git a/odlsli/src/main/properties/dblib.properties b/odlsli/src/main/properties/dblib.properties
index d6d9f34e..9506ac8d 100644
--- a/odlsli/src/main/properties/dblib.properties
+++ b/odlsli/src/main/properties/dblib.properties
@@ -24,7 +24,7 @@ org.onap.ccsdk.sli.dbtype=jdbc
 
 org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01
 org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
-org.openecomp.sdnc.sli.jdbc.driver=org.mariadb.jdbc.Driver
+org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver
 org.onap.ccsdk.sli.jdbc.database=sdnctl
 org.onap.ccsdk.sli.jdbc.user=sdnctl
 org.onap.ccsdk.sli.jdbc.password=gamma
diff --git a/odlsli/src/main/scripts/installFeatures.sh b/odlsli/src/main/scripts/installFeatures.sh
index 6695ebba..37532e7d 100644
--- a/odlsli/src/main/scripts/installFeatures.sh
+++ b/odlsli/src/main/scripts/installFeatures.sh
@@ -27,6 +27,7 @@ SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
 SDNC_FEATURE_DIR=${SDNC_FEATURE_DIR:-${SDNC_HOME}/features}
 
 SDNC_CORE_FEATURES=" \
+ slicore-utils \
  dblib \
  filters \
  sli \
diff --git a/odlsli/src/main/scripts/installZips.sh b/odlsli/src/main/scripts/installZips.sh
index 8abf172f..85e33800 100644
--- a/odlsli/src/main/scripts/installZips.sh
+++ b/odlsli/src/main/scripts/installZips.sh
@@ -34,6 +34,7 @@ targetDir=${1:-${SDNC_HOME}}
 featureDir=${targetDir}/features
 
 SDNC_CORE_FEATURES=" \
+ utils \
  dblib \
  filters \
  sli \
@@ -54,12 +55,10 @@ SDNC_PLUGINS_FEATURES=" \
   properties-node \
   restapi-call-node"
 
-
-SDNC_CORE_VERSION=${SDNC_CORE_VERSION:-0.1.1}
+SDNC_CORE_VERSION=${SDNC_CORE_VERSION:-0.1.2}
 SDNC_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.1.1}
 SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.1.1}
 SDNC_PLUGINS_VERSION=${SDNC_PLUGINS_VERSION:-0.1.1}
-SDNC_OAM_VERSION=${SDNC_OAM_VERSION:-0.1.1}
 
 if [ ! -d ${targetDir} ]
 then
diff --git a/pom.xml b/pom.xml
index fce592ff..215196b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-carbon-sr1</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -26,6 +26,22 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
+    <build>
+        <plugins>
+	    <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <nexusUrl>https://${onap.nexus.host}</nexusUrl>
+                    <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
+                    <serverId>${onap.nexus.staging.server-id}</serverId>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <modules>
         <module>platform-logic</module>
         <module>ubuntu</module>
diff --git a/src/main/yaml/docker-compose.yml b/src/main/yaml/docker-compose.yml
index 352057de..f65a5100 100644
--- a/src/main/yaml/docker-compose.yml
+++ b/src/main/yaml/docker-compose.yml
@@ -38,7 +38,7 @@ services:
     container_name: ccsdk_odlsli_container
     entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
     ports:
-      - "8282:8181"
+      - "8383:8181"
     links:
       - db:dbhost
       - db:sdnctldb01