From: Stephen Kitt <skitt@redhat.com>
Date: Mon, 25 Apr 2016 07:52:11 +0000 (+0000)
Subject: Merge "Bug 5787 Upgrade for Jersey from 2.8 to 2.22.2, the latest version"
X-Git-Tag: odlparent-aggregator-1.7.0~33
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7c1a10962bba1ef6be7f998c3afeeb5c70cb1c81;p=odlparent.git

Merge "Bug 5787 Upgrade for Jersey from 2.8 to 2.22.2, the latest version"
---

7c1a10962bba1ef6be7f998c3afeeb5c70cb1c81
diff --cc odlparent/pom.xml
index 590c3ef02,6c0c2cfbe..6aaeda22f
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@@ -283,13 -283,8 +283,13 @@@
        <dependency>
          <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
          <artifactId>jersey-guava</artifactId>
-         <version>2.8</version>
+         <version>2.22.2</version>
        </dependency>
 +      <dependency>
 +        <groupId>org.glassfish</groupId>
 +        <artifactId>javax.json</artifactId>
 +        <version>1.0.4</version>
 +      </dependency>
        <dependency>
          <groupId>com.eclipsesource.jaxrs</groupId>
          <artifactId>jersey-all</artifactId>