From: Dan Timoney <dtimoney@att.com>
Date: Wed, 29 Apr 2020 15:16:09 +0000 (+0000)
Subject: Merge "Added missing line in Optical DG properties file" into frankfurt
X-Git-Tag: 1.8.2~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fd4c22c59c85b5f29613e1db48c4835a9511af47;hp=f6ccad341b14cb16fecf38953c7dcb97face5434;p=sdnc%2Foam.git

Merge "Added missing line in Optical DG properties file" into frankfurt

Former-commit-id: 5a78f4767c22709f389ced156bc24005cc771bf6
---

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index 127b6259..1b9e37de 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>0.7.2</ccsdk.features.version>
+		<ccsdk.features.version>0.7.3-SNAPSHOT</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/pom.xml b/installation/sdnc/pom.xml
index a1325afd..a50fe753 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -24,6 +24,7 @@
         <sdnc.northbound.version>1.8.0</sdnc.northbound.version>
         <ccsdk.docker.version>0.7.2</ccsdk.docker.version>
         <ccsdk.features.version>0.7.2</ccsdk.features.version>
+        <ccsdk.features.sdnr.wt.version>0.7.3-SNAPSHOT</ccsdk.features.sdnr.wt.version>
         <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
         <sdnc.keypass><![CDATA[ff^G9D]yf&r}Ktum@BJ0YB?N]]></sdnc.keypass>
         <sdnc.secureport>8443</sdnc.secureport>
@@ -88,7 +89,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
+            <version>${ccsdk.features.sdnr.wt.version}</version>
             <classifier>repo</classifier>
             <type>zip</type>
         </dependency>
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index a22c0e23..2066a5c5 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -28,11 +28,11 @@ ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
 ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
 ENV SSL_CERTS_DIR /etc/ssl/certs
 ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java
-ENV CCSDKFEATUREVERSION ${ccsdk.features.version}
+ENV CCSDKFEATUREVERSION ${ccsdk.features.sdnr.wt.version}
 ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features
 ENV SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features
-ENV SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features
-ENV SDNR_DM_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features
+ENV SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.sdnr.wt.version}/xml/features
+ENV SDNR_DM_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.sdnr.wt.version}/xml/features
 ENV SDNC_KEYSTORE ${sdnc.keystore}
 ENV SDNC_KEYPASS ${sdnc.keypass}
 ENV SDNC_SECUREPORT ${sdnc.secureport}
diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile
index 8f4669ad..8d046e55 100755
--- a/installation/sdnc/src/main/docker/standalone.Dockerfile
+++ b/installation/sdnc/src/main/docker/standalone.Dockerfile
@@ -28,11 +28,11 @@ ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
 ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
 ENV SSL_CERTS_DIR /etc/ssl/certs
 ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java
-ENV CCSDKFEATUREVERSION ${ccsdk.features.version}
+ENV CCSDKFEATUREVERSION ${ccsdk.features.sdnr.wt.version}
 ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features
 ENV SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features
-ENV SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features
-ENV SDNR_DM_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features
+ENV SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.sdnr.wt.version}/xml/features
+ENV SDNR_DM_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.sdnr.wt.version}/xml/features
 ENV SDNC_KEYSTORE ${sdnc.keystore}
 ENV SDNC_KEYPASS ${sdnc.keypass}
 ENV SDNC_SECUREPORT ${sdnc.secureport}
diff --git a/installation/sdnc/src/main/resources/aaa-app-config.xml b/installation/sdnc/src/main/resources/aaa-app-config.xml
index 86e66674..c54fef89 100644
--- a/installation/sdnc/src/main/resources/aaa-app-config.xml
+++ b/installation/sdnc/src/main/resources/aaa-app-config.xml
@@ -4,7 +4,10 @@
 
      This program and the accompanying materials are made available under the
      terms of the Eclipse Public License v1.0 which accompanies this distribution,
-     and is available at http://www.eclipse.org/legal/epl-v10.html
+     and is available at http://www.eclipse.org/legal/epl-v10.html , or the Apache License,
+     Version 2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0
+
+     SPDX-License-Identifier: EPL-1.0 OR Apache-2.0
 -->
 
 <!--