commit 9d61649f0f5b318cbbf650d90b4fd681770e429f
author Jian Li <pyguni@gmail.com> Wed Mar 09 10:52:49 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Mar 24 18:54:28 2016 +0000
tree acf79d758aa01fefdc896933e50da9d0f6e891cd
parent b1681bda109d5d53a0447be3696c5ef9a1a6a672

[ONOS-4042] Bump up Jersey from 1.19 to 2.22.2

- Fix unit test errors of web/api
- Fix default page redirection problem
- Fix compilation errors of web/gui
- Fix configuration of aaa, acl, cordfabric, cord-gui, dhcp, mfwd,
  olt, openstack, segmentrouting, vtn, virtualbng, xos-integration
- Fix unit test errors of cpman, vtn, acl, faultmanagement
- Fix compilation errors of openstack, virtualbng, xos-integration,
  REST SB controller
- Rearrange features.xml to resolve bundle dependencies
- Remove all of stale Jersey 1.x libraries
- Rearrange web.xml to point new Jersey 2.x servlet

Change-Id: Ic17f461ede0aa36fa8d470546d8069152dc1d134

features/features.xml

diff --git a/features/features.xml b/features/features.xml
index 01ea081..a112db7 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -56,7 +56,7 @@
         <bundle>mvn:com.typesafe/config/1.2.1</bundle>
         <bundle>mvn:org.onosproject/onlab-thirdparty/@ONOS-VERSION</bundle>
 
-        <bundle>mvn:com.sun.jersey/jersey-client/1.19</bundle>
+        <bundle>mvn:org.glassfish.jersey.core/jersey-client/2.22.2</bundle>
 
         <bundle>mvn:org.mapdb/mapdb/1.0.7</bundle>
     </feature>
@@ -65,13 +65,27 @@
              description="ONOS 3rd party dependencies for web apps">
         <feature>war</feature>
         <feature>onos-thirdparty-base</feature>
-        <!-- FIXME: we should upgrade our jersey eventually -->
-        <bundle>mvn:com.sun.jersey/jersey-core/1.19</bundle>
-        <bundle>mvn:com.sun.jersey/jersey-server/1.19</bundle>
-        <bundle>mvn:com.sun.jersey/jersey-servlet/1.19</bundle>
-        <bundle>mvn:com.sun.jersey.contribs/jersey-multipart/1.19</bundle>
-        <bundle>mvn:org.jvnet.mimepull/mimepull/1.9.3</bundle>
-        <bundle>mvn:javax.ws.rs/jsr311-api/1.1.1</bundle>
+        <!-- Bundles for jersey-common 2.x -->
+        <bundle>mvn:org.glassfish.jersey.core/jersey-common/2.22.2</bundle>
+        <bundle>mvn:javax.annotation/javax.annotation-api/1.2</bundle>
+        <bundle>mvn:javax.ws.rs/javax.ws.rs-api/2.0.1</bundle>
+        <bundle>mvn:org.glassfish.hk2/hk2-api/2.4.0</bundle>
+        <bundle>mvn:org.glassfish.hk2/hk2-locator/2.4.0</bundle>
+        <bundle>mvn:org.glassfish.hk2/osgi-resource-locator/1.0.1</bundle>
+        <bundle>mvn:org.glassfish.hk2.external/javax.inject/2.4.0</bundle>
+        <bundle>mvn:org.glassfish.jersey.bundles.repackaged/jersey-guava/2.22.2</bundle>
+        <!-- Bundles for jersey-server -->
+        <bundle>mvn:org.glassfish.jersey.core/jersey-server/2.22.2</bundle>
+        <bundle>mvn:org.glassfish.hk2.external/aopalliance-repackaged/2.4.0</bundle>
+        <bundle>mvn:org.glassfish.hk2/hk2-utils/2.4.0</bundle>
+        <bundle>mvn:javax.validation/validation-api/1.1.0.Final</bundle>
+        <bundle>mvn:org.javassist/javassist/3.18.1-GA</bundle>
+        <!-- Bundles for jersey-servlet -->
+        <bundle>mvn:org.glassfish.jersey.containers/jersey-container-servlet/2.22.2</bundle>
+        <bundle>mvn:org.glassfish.jersey.containers/jersey-container-servlet-core/2.22.2</bundle>
+        <!-- Bundles for jersey-media-multipart -->
+        <bundle>mvn:org.glassfish.jersey.media/jersey-media-multipart/2.22.2</bundle>
+        <bundle>mvn:org.jvnet.mimepull/mimepull/1.9.6</bundle>
     </feature>
 
     <feature name="onos-api" version="@FEATURE-VERSION"