Code Review / ccsdk / parent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 670e057)
Fix versions of netty and jersey-guava 73/95173/2
authorTimoney, Dan (dt5972) <dtimoney@att.com>
Fri, 6 Sep 2019 16:16:00 +0000 (12:16 -0400)
committerTimoney, Dan (dt5972) <dtimoney@att.com>
Mon, 9 Sep 2019 14:48:26 +0000 (10:48 -0400)
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>
dependencies-odl-bom/pom.xml patch | blob | history
odlparent/binding-parent/pom.xml patch | blob | history
odlparent/bundle-parent/pom.xml patch | blob | history
odlparent/feature-repo-parent/pom.xml patch | blob | history
odlparent/mdsal-it-parent/pom.xml patch | blob | history
odlparent/odlparent-lite/pom.xml patch | blob | history
odlparent/odlparent/pom.xml patch | blob | history
odlparent/setup/src/main/resources/pom-template.xml patch | blob | history
odlparent/single-feature-parent/pom.xml patch | blob | history

diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index b5eef1a..0035d6e 100644 (file)
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -190,6 +190,12 @@
                 <artifactId>dom4j</artifactId>
                 <version>1.6.1</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-bom</artifactId>
+                <version>4.1.34.Final</version>
+                <type>pom</type>
+            </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-netty</artifactId>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 70a077f..d4b9b84 100644 (file)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-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>
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>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index d9b3dd5..8f92e6a 100644 (file)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-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>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 55d95cb..bc12177 100644 (file)
--- 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>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index a501bb5..5c19fea 100644 (file)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/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>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 95ba2c2..b85cc6d 100644 (file)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/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>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 942b1f1..d1f73ef 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.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>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 2df5745..5ccf47e 100644 (file)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-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>
Parent POMs to be used by CCSDK clients