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, 12 insertions, 21 deletions

diff --git a/appc-provider/appc-provider-features/src/main/resources/features.xml b/appc-provider/appc-provider-features/src/main/resources/features.xml
index 2e2b759f8..2b0344ed5 100644
--- a/appc-provider/appc-provider-features/src/main/resources/features.xml
+++ b/appc-provider/appc-provider-features/src/main/resources/features.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
   =============================================================================
@@ -19,7 +19,6 @@
   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=========================================================
   -->
 
@@ -28,10 +27,10 @@
     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-provider' description="application controller" version='${project.version}'>
-        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
+        <feature >odl-mdsal-broker</feature>
         <bundle>mvn:org.onap.appc/appc-provider-model/${project.version}</bundle>
         <bundle>mvn:org.onap.appc/appc-provider-bundle/${project.version}</bundle>
         <configfile finalname="etc/opendaylight/karaf/200-appc-provider.xml">mvn:org.onap.appc/appc-provider-bundle/${project.version}/xml/config</configfile>
diff --git a/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh b/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh
index 13d41ca56..6c2a50317 100644
--- a/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-provider/appc-provider-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,7 +18,6 @@
 # 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=========================================================
 ###
 
@@ -26,7 +25,7 @@
 
 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
@@ -50,14 +49,3 @@ while [ $COUNT -lt 10 ]; do
 	fi
 	let COUNT=COUNT+1
 done
-COUNT=0
-while [ $COUNT -lt 10 ]; do
-	${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} 2> /tmp/installErr
-		cat /tmp/installErr
-	if grep -q 'Failed to get the session' /tmp/installErr; then
-		sleep 10
-	else
-		let COUNT=10
-	fi
-	let COUNT=COUNT+1
-done
diff --git a/appc-provider/appc-provider-model/pom.xml b/appc-provider/appc-provider-model/pom.xml
index 771ea9876..a1da4ddea 100644
--- a/appc-provider/appc-provider-model/pom.xml
+++ b/appc-provider/appc-provider-model/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">
@@ -40,7 +39,8 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Import-Package>*</Import-Package>
+                        <Import-Package>!com.google.common.collect,!com.google.common.base,*</Import-Package>
+                        <Embed-Dependency>guava</Embed-Dependency>
                     </instructions>
                 </configuration>
             </plugin>
@@ -135,5 +135,9 @@
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file