diff options
| author |   herbert <herbert.eiselt@highstreet-technologies.com> | 2020-04-21 21:19:55 +0200 |
|---|---|---|
| committer | herbert <herbert.eiselt@highstreet-technologies.com> | 2020-04-28 17:06:54 +0200 |
| commit | e7844f3fc813e4e5eb3b4070830d17561e044b6e (patch) | |
| tree | 8acbfce7a6fb2a97f26e1f2f4338d83aa1faea12 | |
| parent | e2ad43f208af3c91d7b0f6788c1d9da5e5833f1a (diff) | |
Update sdnc-oam for sdnc and sdnc-web to use frankfurt head version
Issue-ID: SDNC-1178
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I580e409dc78ef151f3304186288e4a66d6085f44
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
(cherry picked from commit b0b2b0a05048f21f6c0e9d4d40b6ca5eb3bb93e7 [formerly dde982c3aaef26b518080d27dba4925e33409056])
Former-commit-id: 08dc77b82a57a825c4e1a75206a630317ac6569d
| -rw-r--r-- | installation/sdnc-web/pom.xml | 2 | ||||
| -rw-r--r-- | installation/sdnc/pom.xml | 3 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 6 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/standalone.Dockerfile | 6 |
4 files changed, 9 insertions, 8 deletions
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} |