From 93ebb3d9db31747fcccd1d6dcb98566e7084cef4 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Fri, 6 Sep 2019 12:16:00 -0400
Subject: Fix versions of netty and jersey-guava

Fix versions of netty and jersey-guava to match what is
pre-installed in ODL Neon release.

Change-Id: I1092c553420548f17ac7e5aff6317aff6502b9bd
Issue-ID: SDNC-903
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 odlparent/mdsal-it-parent/pom.xml | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'odlparent/mdsal-it-parent')

diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 55d95cba..bc12177b 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -510,6 +510,28 @@
 
 			<!-- 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>
-- 
cgit 1.2.3-korg