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>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index cdffb18..7947e71 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>