Fix versions of netty and jersey-guava

[ccsdk/parent.git] / odlparent / bundle-parent / pom.xml

diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 4ea1c6b..2155cf4 100644 (file)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-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>