Fix versions

Fix versions in properties to match what is preloaded in ODL
and remove karaf4-parent, which contains security vulnerabilties

Change-Id: Ief514a209e7c483e15007a1c464059f91859f82e
Issue-ID: CCSDK-195
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>

8 files changed, 40 insertions, 19 deletions

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 84aea68b..101ea6d6 100755
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -96,6 +96,7 @@
         <ccsdk.sli.adaptors.version>0.2.1-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>0.2.1-SNAPSHOT</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>0.2.1-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdl.distribution.version>0.2.1-SNAPSHOT</ccsdl.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
@@ -162,7 +163,7 @@
         <slf4j.version>1.7.21</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn,
             toolkit, tsdr, ttp -->
-        <spring.version>3.2.17.RELEASE</spring.version>
+        <spring.version>5.0.4.RELEASE</spring.version>
 
 
 
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index fa7f265b..a82bd083 100755
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -96,13 +96,16 @@
         <ccsdk.sli.adaptors.version>0.2.1-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>0.2.1-SNAPSHOT</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>0.2.1-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdl.distribution.version>0.2.1-SNAPSHOT</ccsdl.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
         <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
         <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
+
         <!-- Support libraries used by OpenDaylight -->
+        <odl.mdsal.version>1.6.1</odl.mdsal.version>
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.10</commons.codec.version>
         <!-- Used by netconf, ovsdb -->
@@ -160,7 +163,7 @@
         <slf4j.version>1.7.21</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn,
             toolkit, tsdr, ttp -->
-        <spring.version>3.2.17.RELEASE</spring.version>
+        <spring.version>5.0.4.RELEASE</spring.version>
 
 
 
@@ -170,7 +173,7 @@
         <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
         <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
-        <antlr.version>4.5.1</antlr.version>
+        <antlr.version>4.7</antlr.version>
         <mysql.connector.version>5.1.39</mysql.connector.version>
         <mariadb.connector.version>2.1.1</mariadb.connector.version>
         <h2database.version>1.4.186</h2database.version>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index f2407821..258a0785 100755
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -27,7 +27,7 @@
         <url>https://jira.onap.org/</url>
     </issueManagement>
 
-    <properties>
+   <properties>
 
         <!--- properties from oparent -->
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -96,13 +96,16 @@
         <ccsdk.sli.adaptors.version>0.2.1-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>0.2.1-SNAPSHOT</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>0.2.1-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdl.distribution.version>0.2.1-SNAPSHOT</ccsdl.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
         <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
         <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
+
         <!-- Support libraries used by OpenDaylight -->
+        <odl.mdsal.version>1.6.1</odl.mdsal.version>
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.10</commons.codec.version>
         <!-- Used by netconf, ovsdb -->
@@ -160,7 +163,7 @@
         <slf4j.version>1.7.21</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn,
             toolkit, tsdr, ttp -->
-        <spring.version>3.2.17.RELEASE</spring.version>
+        <spring.version>5.0.4.RELEASE</spring.version>
 
 
 
@@ -170,7 +173,7 @@
         <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
         <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
-        <antlr.version>4.5.1</antlr.version>
+        <antlr.version>4.7</antlr.version>
         <mysql.connector.version>5.1.39</mysql.connector.version>
         <mariadb.connector.version>2.1.1</mariadb.connector.version>
         <h2database.version>1.4.186</h2database.version>
@@ -178,7 +181,6 @@
         <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
     </properties>
 
-
     <profiles>
         <!-- Profiles from ONAP oparent -->
         <profile>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index cdffb18a..7947e71b 100755
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -27,7 +27,7 @@
         <url>https://jira.onap.org/</url>
     </issueManagement>
 
-    <properties>
+   <properties>
 
         <!--- properties from oparent -->
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -96,13 +96,16 @@
         <ccsdk.sli.adaptors.version>0.2.1-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>0.2.1-SNAPSHOT</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>0.2.1-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdl.distribution.version>0.2.1-SNAPSHOT</ccsdl.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
         <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
         <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
+
         <!-- Support libraries used by OpenDaylight -->
+        <odl.mdsal.version>1.6.1</odl.mdsal.version>
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.10</commons.codec.version>
         <!-- Used by netconf, ovsdb -->
@@ -160,7 +163,7 @@
         <slf4j.version>1.7.21</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn,
             toolkit, tsdr, ttp -->
-        <spring.version>3.2.17.RELEASE</spring.version>
+        <spring.version>5.0.4.RELEASE</spring.version>
 
 
 
@@ -170,7 +173,7 @@
         <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
         <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
-        <antlr.version>4.5.1</antlr.version>
+        <antlr.version>4.7</antlr.version>
         <mysql.connector.version>5.1.39</mysql.connector.version>
         <mariadb.connector.version>2.1.1</mariadb.connector.version>
         <h2database.version>1.4.186</h2database.version>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index d444be52..556fe2ca 100755
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -27,7 +27,7 @@
         <url>https://jira.onap.org/</url>
     </issueManagement>
 
-    <properties>
+   <properties>
 
         <!--- properties from oparent -->
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -96,13 +96,16 @@
         <ccsdk.sli.adaptors.version>0.2.1-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>0.2.1-SNAPSHOT</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>0.2.1-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdl.distribution.version>0.2.1-SNAPSHOT</ccsdl.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
         <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
         <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
+
         <!-- Support libraries used by OpenDaylight -->
+        <odl.mdsal.version>1.6.1</odl.mdsal.version>
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.10</commons.codec.version>
         <!-- Used by netconf, ovsdb -->
@@ -160,7 +163,7 @@
         <slf4j.version>1.7.21</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn,
             toolkit, tsdr, ttp -->
-        <spring.version>3.2.17.RELEASE</spring.version>
+        <spring.version>5.0.4.RELEASE</spring.version>
 
 
 
@@ -170,7 +173,7 @@
         <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
         <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
-        <antlr.version>4.5.1</antlr.version>
+        <antlr.version>4.7</antlr.version>
         <mysql.connector.version>5.1.39</mysql.connector.version>
         <mariadb.connector.version>2.1.1</mariadb.connector.version>
         <h2database.version>1.4.186</h2database.version>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 68ebef12..8a470e6e 100755
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -27,7 +27,7 @@
         <url>https://jira.onap.org/</url>
     </issueManagement>
 
-    <properties>
+   <properties>
 
         <!--- properties from oparent -->
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -96,13 +96,16 @@
         <ccsdk.sli.adaptors.version>0.2.1-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>0.2.1-SNAPSHOT</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>0.2.1-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdl.distribution.version>0.2.1-SNAPSHOT</ccsdl.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
         <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
         <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
+
         <!-- Support libraries used by OpenDaylight -->
+        <odl.mdsal.version>1.6.1</odl.mdsal.version>
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.10</commons.codec.version>
         <!-- Used by netconf, ovsdb -->
@@ -160,7 +163,7 @@
         <slf4j.version>1.7.21</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn,
             toolkit, tsdr, ttp -->
-        <spring.version>3.2.17.RELEASE</spring.version>
+        <spring.version>5.0.4.RELEASE</spring.version>
 
 
 
@@ -170,7 +173,7 @@
         <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
         <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
-        <antlr.version>4.5.1</antlr.version>
+        <antlr.version>4.7</antlr.version>
         <mysql.connector.version>5.1.39</mysql.connector.version>
         <mariadb.connector.version>2.1.1</mariadb.connector.version>
         <h2database.version>1.4.186</h2database.version>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index f4c66fa5..c289b37c 100755
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -25,7 +25,10 @@
 		<module>binding-parent</module>
 		<module>bundle-parent</module>
 		<module>feature-repo-parent</module>
+		<!-- Version 2.0.5 of karaf4-parent includes
+                jars with known security vulnerabilities.
 		<module>karaf4-parent</module>
+		-->
 		<module>mdsal-it-parent</module>
 		<module>odlparent</module>
 		<module>odlparent-lite</module>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 96c5251f..a5b14022 100755
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -27,7 +27,7 @@
         <url>https://jira.onap.org/</url>
     </issueManagement>
 
-    <properties>
+   <properties>
 
         <!--- properties from oparent -->
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -96,13 +96,16 @@
         <ccsdk.sli.adaptors.version>0.2.1-SNAPSHOT</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>0.2.1-SNAPSHOT</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>0.2.1-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdl.distribution.version>0.2.1-SNAPSHOT</ccsdl.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
         <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
         <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
+
         <!-- Support libraries used by OpenDaylight -->
+        <odl.mdsal.version>1.6.1</odl.mdsal.version>
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.10</commons.codec.version>
         <!-- Used by netconf, ovsdb -->
@@ -160,7 +163,7 @@
         <slf4j.version>1.7.21</slf4j.version>
         <!-- Used in integration/distribution; see also affinity, snmp4sdn,
             toolkit, tsdr, ttp -->
-        <spring.version>3.2.17.RELEASE</spring.version>
+        <spring.version>5.0.4.RELEASE</spring.version>
 
 
 
@@ -170,7 +173,7 @@
         <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
         <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
-        <antlr.version>4.5.1</antlr.version>
+        <antlr.version>4.7</antlr.version>
         <mysql.connector.version>5.1.39</mysql.connector.version>
         <mariadb.connector.version>2.1.1</mariadb.connector.version>
         <h2database.version>1.4.186</h2database.version>