diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-09-06 12:16:00 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-09-09 10:48:26 -0400 |
| commit | 93ebb3d9db31747fcccd1d6dcb98566e7084cef4 (patch) | |
| tree | 57c0afd5fc247625806455d3b8fa893277f5af7e /odlparent/setup/src/main/resources | |
| parent | 670e057714983c10e41e90b4da2714a5421d70aa (diff) | |
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>
Diffstat (limited to 'odlparent/setup/src/main/resources')
| -rwxr-xr-x | odlparent/setup/src/main/resources/pom-template.xml | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 942b1f10..d1f73ef9 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -511,6 +511,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> <version>9.4.12.v20180830</version> @@ -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> |