X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlparent%2Fodlparent%2Fpom.xml;h=d2fd57711923be20bfeb18e8fce0ebe519ac5f29;hb=e45b6a2c0f8efcbf73ece25bfebbec8d6624525e;hp=4d1725bc19ae449e5258d7b6249edca4e6926e2c;hpb=bed9588ef11d6b212d3501d1b81ce3a10051a155;p=ccsdk%2Fparent.git

diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 4d1725bc..d2fd5771 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -11,7 +11,7 @@
 	<packaging>pom</packaging>
 	<groupId>org.onap.ccsdk.parent</groupId>
 	<artifactId>odlparent</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.opendaylight.odlparent</groupId>
@@ -93,11 +93,11 @@
 
 
 		<!-- CCSDK component versions -->
-		<ccsdk.sli.core.version>0.6.1-SNAPSHOT</ccsdk.sli.core.version>
-		<ccsdk.sli.adaptors.version>0.6.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-		<ccsdk.sli.northbound.version>0.6.1-SNAPSHOT</ccsdk.sli.northbound.version>
-		<ccsdk.sli.plugins.version>0.6.1-SNAPSHOT</ccsdk.sli.plugins.version>
-		<ccsdk.distribution.version>0.6.1-SNAPSHOT</ccsdk.distribution.version>
+		<ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
+		<ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+		<ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
+		<ccsdk.sli.plugins.version>0.7.0-SNAPSHOT</ccsdk.sli.plugins.version>
+		<ccsdk.distribution.version>0.7.0-SNAPSHOT</ccsdk.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>
@@ -182,7 +182,7 @@
 		<derby.version>10.14.2.0</derby.version>
 		<eelf.version>1.0.0</eelf.version>
 		<grpc.version>1.17.1</grpc.version>
-		<mariadb.connector.version>1.5.9</mariadb.connector.version>
+		<mariadb.connector.version>2.1.1</mariadb.connector.version>
 		<mariadb4j.version>2.2.3</mariadb4j.version>
 		<testng.version>6.11</testng.version>
 		<tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
@@ -503,13 +503,35 @@
 			<dependency>
 				<groupId>org.onap.ccsdk.parent</groupId>
 				<artifactId>dependencies-odl-bom</artifactId>
-				<version>1.4.1-SNAPSHOT</version>
+				<version>1.5.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 
 			<!-- Override incorrect versions in ODL parent poms -->
 			<!-- to match versions actually installed in ODL Neon -->
+			<dependency>
+				<groupId>com.google.protobuf</groupId>
+				<artifactId>protobuf-java</artifactId>
+				<version>3.6.1</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-transport</artifactId>
+				<version>4.1.34.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.1.34.Final</version>
+				<!-- <version>${netty.version}</version> -->
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-server</artifactId>
@@ -521,21 +543,15 @@
 				<version>9.4.12.v20180830</version>
 			</dependency>
 			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-				<scope>test</scope>
+				<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+				<artifactId>jersey-guava</artifactId>
+				<version>2.25.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.jettison</groupId>
 				<artifactId>jettison</artifactId>
 				<version>1.3.8</version>
 			</dependency>
-			<dependency>
-				<groupId>com.google.protobuf</groupId>
-				<artifactId>protobuf-java</artifactId>
-				<version>3.6.1</version>
-			</dependency>
 		</dependencies>
 
 	</dependencyManagement>