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 <pb071s@att.com>
Issue-ID: APPC-403

3 files changed, 18 insertions, 20 deletions

diff --git a/appc-config/appc-encryption-tool/features/src/main/resources/features.xml b/appc-config/appc-encryption-tool/features/src/main/resources/features.xml
index 53a3cbbe8..b465669a2 100644
--- a/appc-config/appc-encryption-tool/features/src/main/resources/features.xml
+++ b/appc-config/appc-encryption-tool/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,20 @@
     xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" 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">
 
-    <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
+    <!--<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>-->
 
     <feature name='appc-config-encryption-tool' description="Application Controller Encription Tool"
         version='${project.version}'>
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
+        <feature >odl-mdsal-broker</feature>
 
-        <feature>sdnc-dblib</feature>
-        <feature>sdnc-sli</feature>
-        <feature>sdnc-sql-resource</feature>
+        <feature>ccsdk-dblib</feature>
+        <feature>ccsdk-sli</feature>
+        <feature>ccsdk-sql-resource</feature>
 
         <bundle>mvn:commons-lang/commons-lang/2.6</bundle>
         <bundle>mvn:org.apache.velocity/velocity/${velocity.version}</bundle>
         <bundle>mvn:commons-collections/commons-collections/${common.collections.version}</bundle>
-        <bundle>wrap:mvn:commons-configuration/commons-configuration/1.10</bundle>
-        <bundle>wrap:mvn:org.jasypt/jasypt/1.9.2</bundle>
-        <bundle>mvn:mysql/mysql-connector-java/${mysql.connector.version}</bundle>
-        <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
-        <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
-        <bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
         <bundle>mvn:org.onap.appc/appc-config-encryption-tool-provider/${project.version}</bundle>
     </feature>
 </features>
diff --git a/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh
index b8e924279..3525ba525 100644
--- a/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh
@@ -2,7 +2,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.
@@ -16,14 +16,13 @@
 # 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.
 ###
 
 #!/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
@@ -37,4 +36,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-encryption-tool/provider/pom.xml b/appc-config/appc-encryption-tool/provider/pom.xml
index b79d728da..5df563200 100644
--- a/appc-config/appc-encryption-tool/provider/pom.xml
+++ b/appc-config/appc-encryption-tool/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.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -48,7 +47,7 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sql-resource-provider</artifactId>
-	    <version>${ccsdk.sli.adaptors.version}</version>
+        <version>${ccsdk.sli.adaptors.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -61,6 +60,10 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.att.eelf</groupId>
             <artifactId>eelf-core</artifactId>
         </dependency>
@@ -87,7 +90,9 @@
                         <Bundle-SymbolicName>org.onap.appc.encryptiontool</Bundle-SymbolicName>
                         <Bundle-Activator>org.onap.appc.encryptiontool.EncryptionToolActivator</Bundle-Activator>
                         <Export-Package>org.onap.appc.encryptiontool</Export-Package>
-                        <Import-Package>*</Import-Package>
+                        <Import-Package>!com.google.common.collect,*;resolution:=optional</Import-Package>
+                        <!--  <Embed-Dependency>guava,logback-core,logback-classic,eelf-core,jasypt,commons-configuration</Embed-Dependency> -->
+                        <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis</Embed-Dependency>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
                     <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>