From 5b81764739425ccb4a418947e1565a7f691f4204 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Thu, 22 Mar 2018 15:12:48 -0700 Subject: ODL Upgrade Method 2 Changes necessary to support upgrade to ODL Nitrogen, while continuing to use Karaf 3 style features Change-Id: I2edf619e0b889420c32793b958c0926b0311e71d Signed-off-by: Patrick Brady Issue-ID: APPC-403 --- appc-config/appc-config-generator/features/pom.xml | 15 --------- .../features/src/main/resources/features.xml | 20 +++--------- .../src/main/resources/scripts/install-feature.sh | 8 ++--- appc-config/appc-config-generator/provider/pom.xml | 36 +++++++++++++--------- 4 files changed, 29 insertions(+), 50 deletions(-) (limited to 'appc-config/appc-config-generator') diff --git a/appc-config/appc-config-generator/features/pom.xml b/appc-config/appc-config-generator/features/pom.xml index 8dfd5aab1..afcdd3355 100644 --- a/appc-config/appc-config-generator/features/pom.xml +++ b/appc-config/appc-config-generator/features/pom.xml @@ -18,7 +18,6 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= - ECOMP is a trademark and service mark of AT&T Intellectual Property. --> @@ -59,22 +58,8 @@ - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - org.opendaylight.odlparent - features-test - ${odl.commons.opendaylight.version} - test - diff --git a/appc-config/appc-config-generator/features/src/main/resources/features.xml b/appc-config/appc-config-generator/features/src/main/resources/features.xml index a039b5081..5840fcc10 100644 --- a/appc-config/appc-config-generator/features/src/main/resources/features.xml +++ b/appc-config/appc-config-generator/features/src/main/resources/features.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APP-C ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,26 +24,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features + - odl-mdsal-broker - sdnc-sli - - wrap:mvn:org.codehaus.jettison/jettison/${jettison.version} + odl-mdsal-broker + ccsdk-sli mvn:commons-lang/commons-lang/2.6 - wrap:mvn:commons-io/commons-io/${common.io.version} - wrap:mvn:org.apache.velocity/velocity/${velocity.version} - wrap:mvn:commons-collections/commons-collections/${common.collections.version} - wrap:mvn:com.att.eelf/eelf-core/${eelf.version} - - wrap:mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version} - wrap:mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} - wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} - mvn:ch.qos.logback/logback-core/${logback.version} - mvn:ch.qos.logback/logback-classic/${logback.version} mvn:org.onap.appc/appc-config-generator-provider/${project.version} diff --git a/appc-config/appc-config-generator/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-config-generator/installer/src/main/resources/scripts/install-feature.sh index 0dad46d81..cd1b4d973 100644 --- a/appc-config/appc-config-generator/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-config/appc-config-generator/installer/src/main/resources/scripts/install-feature.sh @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Copyright (C) 2017 Amdocs # ============================================================================= @@ -18,16 +18,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= -# ECOMP is a trademark and service mark of AT&T Intellectual Property. ### #!/bin/bash ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"} +ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-""} INSTALLERDIR=$(dirname $0) REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip @@ -41,4 +39,4 @@ else fi ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} + diff --git a/appc-config/appc-config-generator/provider/pom.xml b/appc-config/appc-config-generator/provider/pom.xml index 50a016608..e7a1e6b34 100644 --- a/appc-config/appc-config-generator/provider/pom.xml +++ b/appc-config/appc-config-generator/provider/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. Copyright (C) 2017 Amdocs ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,6 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= - ECOMP is a trademark and service mark of AT&T Intellectual Property. --> @@ -53,6 +52,14 @@ com.fasterxml.jackson.core jackson-annotations + + org.apache.commons + commons-lang3 + + + org.onap.ccsdk.sli.core + dblib-provider + com.fasterxml.jackson.core jackson-core @@ -96,17 +103,17 @@ junit test - - org.powermock - powermock-api-mockito - 1.6.4 - test - - - org.mockito - mockito-core - test - + + org.powermock + powermock-api-mockito + 1.6.4 + test + + + org.mockito + mockito-core + test + @@ -124,7 +131,8 @@ org.onap.sdnc.config.generator,org.onap.sdnc.config.generator.compare,org.onap.sdnc.config.generator.convert, org.onap.sdnc.config.generator.merge,org.onap.sdnc.config.generator.pattern,org.onap.sdnc.config.generator.tool, org.onap.sdnc.config.generator.transform - * + !com.werken.xpath,!com.google.common.collect,*;resolution:=optional + guava,jackson-databind,jackson-annotations,jackson-core,eelf-core,logback-core,logback-classic,commons-io,jettison,velocity,commons-collections * ${project.basedir}/src/main/resources/META-INF -- cgit 1.2.3-korg