From 275ccba3fcd4291182c3d73803bb320f5b08b709 Mon Sep 17 00:00:00 2001
From: Lina George <lg941u@att.com>
Date: Tue, 3 Oct 2017 14:18:35 -0400
Subject: [PATCH] Config pom and feature changes

Issue-ID: APPC-219
Change-Id: I407dd3781edcc6b06c598bc7fa1d57fc024c2648
Signed-off-by: Lina George <lg941u@att.com>
---
 appc-config/appc-config-adaptor/features/pom.xml                        | 1 -
 .../appc-config-adaptor/features/src/main/resources/features.xml        | 2 +-
 appc-config/appc-config-audit/features/pom.xml                          | 1 -
 appc-config/appc-config-audit/features/src/main/resources/features.xml  | 2 +-
 appc-config/appc-config-generator/features/pom.xml                      | 1 -
 .../appc-config-generator/features/src/main/resources/features.xml      | 2 +-
 appc-config/appc-config-params/features/pom.xml                         | 1 -
 appc-config/appc-config-params/features/src/main/resources/features.xml | 2 +-
 appc-config/appc-data-services/features/pom.xml                         | 1 -
 appc-config/appc-data-services/features/src/main/resources/features.xml | 2 +-
 appc-config/appc-encryption-tool/features/pom.xml                       | 1 -
 .../appc-encryption-tool/features/src/main/resources/features.xml       | 2 +-
 appc-config/appc-flow-controller/features/pom.xml                       | 1 -
 .../appc-flow-controller/features/src/main/resources/features.xml       | 2 +-
 appc-config/pom.xml                                                     | 1 -
 15 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/appc-config/appc-config-adaptor/features/pom.xml b/appc-config/appc-config-adaptor/features/pom.xml
index d8b954f28..03fd731d3 100644
--- a/appc-config/appc-config-adaptor/features/pom.xml
+++ b/appc-config/appc-config-adaptor/features/pom.xml
@@ -24,7 +24,6 @@
             <!-- <groupId>org.opendaylight.controller</groupId>  -->
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>features-mdsal</artifactId>
-            <version>${odl.mdsal.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
 
diff --git a/appc-config/appc-config-adaptor/features/src/main/resources/features.xml b/appc-config/appc-config-adaptor/features/src/main/resources/features.xml
index 910ab40df..ff24b9db2 100644
--- a/appc-config/appc-config-adaptor/features/src/main/resources/features.xml
+++ b/appc-config/appc-config-adaptor/features/src/main/resources/features.xml
@@ -24,7 +24,7 @@
 	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.version}/xml/features</repository>
+	<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
 
 	<feature name='appc-config-adaptor' description="Application Controller Config Adaptor"
 		version='${project.version}'>
diff --git a/appc-config/appc-config-audit/features/pom.xml b/appc-config/appc-config-audit/features/pom.xml
index 4197f94ff..e318b8d17 100644
--- a/appc-config/appc-config-audit/features/pom.xml
+++ b/appc-config/appc-config-audit/features/pom.xml
@@ -29,7 +29,6 @@
 		<dependency>
 			<groupId>org.opendaylight.mdsal</groupId>
 			<artifactId>features-mdsal</artifactId>
-			<version>${odl.mdsal.version}</version>
 			<classifier>features</classifier>
 			<type>xml</type>
 
diff --git a/appc-config/appc-config-audit/features/src/main/resources/features.xml b/appc-config/appc-config-audit/features/src/main/resources/features.xml
index 5c07c6d0c..c6d618efb 100644
--- a/appc-config/appc-config-audit/features/src/main/resources/features.xml
+++ b/appc-config/appc-config-audit/features/src/main/resources/features.xml
@@ -24,7 +24,7 @@
 	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.version}/xml/features</repository>
+	<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
 
 	<feature name='appc-config-audit' description="Application Controller Config Audit"
 		version='${project.version}'>
diff --git a/appc-config/appc-config-generator/features/pom.xml b/appc-config/appc-config-generator/features/pom.xml
index d9a9dda91..5ca18b342 100644
--- a/appc-config/appc-config-generator/features/pom.xml
+++ b/appc-config/appc-config-generator/features/pom.xml
@@ -31,7 +31,6 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>features-mdsal</artifactId>
-            <version>${odl.mdsal.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
 
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 5d8f9ae98..ed0ff8008 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
@@ -24,7 +24,7 @@
 	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.version}/xml/features</repository>
+	<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
 
 	<feature name='appc-config-generator' description="Application Controller Config Generator"
 		version='${project.version}'>
diff --git a/appc-config/appc-config-params/features/pom.xml b/appc-config/appc-config-params/features/pom.xml
index 52b7587a4..273da5df8 100644
--- a/appc-config/appc-config-params/features/pom.xml
+++ b/appc-config/appc-config-params/features/pom.xml
@@ -28,7 +28,6 @@
 		<dependency>
 			<groupId>org.opendaylight.mdsal</groupId>
 			<artifactId>features-mdsal</artifactId>
-			<version>${odl.mdsal.version}</version>
 			<classifier>features</classifier>
 			<type>xml</type>
 
diff --git a/appc-config/appc-config-params/features/src/main/resources/features.xml b/appc-config/appc-config-params/features/src/main/resources/features.xml
index 88f410019..a12abedf0 100644
--- a/appc-config/appc-config-params/features/src/main/resources/features.xml
+++ b/appc-config/appc-config-params/features/src/main/resources/features.xml
@@ -28,7 +28,7 @@
 	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.version}/xml/features</repository>
+	<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
 
 	<feature name='appc-config-params' description="Application Controller Config Params"
 		version='${project.version}'>
diff --git a/appc-config/appc-data-services/features/pom.xml b/appc-config/appc-data-services/features/pom.xml
index ca74c67e9..7d1935155 100644
--- a/appc-config/appc-data-services/features/pom.xml
+++ b/appc-config/appc-data-services/features/pom.xml
@@ -28,7 +28,6 @@
 		<dependency>
 			<groupId>org.opendaylight.mdsal</groupId>
 			<artifactId>features-mdsal</artifactId>
-			<version>${odl.mdsal.version}</version>
 			<classifier>features</classifier>
 			<type>xml</type>
 
diff --git a/appc-config/appc-data-services/features/src/main/resources/features.xml b/appc-config/appc-data-services/features/src/main/resources/features.xml
index 4546a8164..2f99eb3ad 100644
--- a/appc-config/appc-data-services/features/src/main/resources/features.xml
+++ b/appc-config/appc-data-services/features/src/main/resources/features.xml
@@ -24,7 +24,7 @@
 	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.version}/xml/features</repository>
+	<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
 
 	<feature name='appc-config-data-services' description="Application Controller Config Data Service"
 		version='${project.version}'>
diff --git a/appc-config/appc-encryption-tool/features/pom.xml b/appc-config/appc-encryption-tool/features/pom.xml
index 581517444..dcaeef249 100644
--- a/appc-config/appc-encryption-tool/features/pom.xml
+++ b/appc-config/appc-encryption-tool/features/pom.xml
@@ -25,7 +25,6 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>features-mdsal</artifactId>
-            <version>${odl.mdsal.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
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 ddb1a8526..6138f53c4 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
@@ -24,7 +24,7 @@
     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.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}'>
diff --git a/appc-config/appc-flow-controller/features/pom.xml b/appc-config/appc-flow-controller/features/pom.xml
index 9db5fee14..8351c7acc 100644
--- a/appc-config/appc-flow-controller/features/pom.xml
+++ b/appc-config/appc-flow-controller/features/pom.xml
@@ -28,7 +28,6 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>features-mdsal</artifactId>
-            <version>${odl.mdsal.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
 
diff --git a/appc-config/appc-flow-controller/features/src/main/resources/features.xml b/appc-config/appc-flow-controller/features/src/main/resources/features.xml
index 76161bd18..ccbf2e1c4 100644
--- a/appc-config/appc-flow-controller/features/src/main/resources/features.xml
+++ b/appc-config/appc-flow-controller/features/src/main/resources/features.xml
@@ -24,7 +24,7 @@
 	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.version}/xml/features</repository>
+	<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
 
 	<feature name='appc-config-flow-controller' description="Application Controller Flow Executor"
 		version='${project.version}'>
diff --git a/appc-config/pom.xml b/appc-config/pom.xml
index d9f3b2f89..6ad77b8d8 100644
--- a/appc-config/pom.xml
+++ b/appc-config/pom.xml
@@ -14,7 +14,6 @@
     <description>Application Controller Config</description>
 
     <properties>
-        <odl.mdsal.version>2.1.1-Boron-SR1</odl.mdsal.version>
         <jackson.version>2.3.2</jackson.version>
         <snakeyaml.version>1.12</snakeyaml.version>
         <velocity.version>1.7</velocity.version>
-- 
2.16.6