diff options
| -rw-r--r-- | installation/sdnc-web/pom.xml | 4 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/scripts/startODL.sh | 4 | ||||
| -rwxr-xr-x | pom.xml | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 939c7771..3a096ffd 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -25,8 +25,8 @@ <dependencies> <dependency> - <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> - <artifactId>sdnr-wt-odlux-installer</artifactId> + <groupId>org.onap.ccsdk.features.sdnr.odlux</groupId> + <artifactId>sdnr-odlux-installer</artifactId> <version>${ccsdk.features.version}</version> <type>zip</type> <classifier>repo</classifier> diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index 644ec50f..eb27e0f8 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -104,9 +104,6 @@ install_sdnrwt_features() { cleanupFeatureBoot fi addToFeatureBoot "$SDNRDM_BOOTFEATURES" - if ! $SDNRDM; then - addToFeatureBoot "$SDNRODLUX_BOOTFEATURES" - fi if $SDNR_NETCONF_CALLHOME_ENABLED; then addToFeatureBoot "$SDNR_NETCONF_CALLHOME_FEATURE" fi @@ -247,7 +244,6 @@ GEO_ENABLED=${GEO_ENABLED:-false} SDNRWT=${SDNRWT:-false} SDNRDM=${SDNRDM:-false} -SDNRODLUX_BOOTFEATURES=${SDNRODLUX_BOOTFEATURES:-sdnr-wt-helpserver-feature,sdnr-wt-odlux-core-feature,sdnr-wt-odlux-apps-feature} SDNROAUTH_BOOTFEATURES=${SDNROAUTH_BOOTFEATURES:-sdnr-wt-feature-aggregator-oauth} SDNR_NETCONF_CALLHOME_ENABLED=${SDNR_NETCONF_CALLHOME_ENABLED:-false} @@ -27,9 +27,9 @@ <!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite --> <ccsdk.oran.a1adapter.version>1.6.0</ccsdk.oran.a1adapter.version> <sdnc.northbound.version>2.6.0</sdnc.northbound.version> <!-- Used by installation/sdnc --> - <ccsdk.distribution.version>1.6.1-SNAPSHOT</ccsdk.distribution.version> + <ccsdk.distribution.version>1.6.2-SNAPSHOT</ccsdk.distribution.version> <ccsdk.sli.version>1.7.1</ccsdk.sli.version> - <ccsdk.features.version>1.6.1</ccsdk.features.version> + <ccsdk.features.version>1.7.0-SNAPSHOT</ccsdk.features.version> <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> <ccsdk.bierman.api.version>1.0.0</ccsdk.bierman.api.version> <!-- docker images versions --> |