commit 313c27b0a34da13a61c8ce6db431a05125b470ed
author Jian Li <pyguni@gmail.com> Thu Mar 24 14:13:25 2016 -0700
committer Jian Li <pyguni@gmail.com> Thu Mar 24 14:13:25 2016 -0700
tree 5b84ebf245cc2da59911879b553d25d844439717
parent 3eb4619e69745edebd238c69361c0920ba0c1cdd

Fix build error due to Jersey bump up

Change-Id: Ic5e7bf3fe4e911bf4aaa7aefe9907b15aafb6370

calendar/pom.xml

diff --git a/calendar/pom.xml b/calendar/pom.xml
index 6034afe..01fe3fe 100644
--- a/calendar/pom.xml
+++ b/calendar/pom.xml
@@ -29,7 +29,8 @@
     <artifactId>onos-app-calendar</artifactId>
     <packaging>bundle</packaging>
 
-    <description>ONOS simple calendaring REST interface for intents</description>
+    <description>ONOS simple calendaring REST interface for intents
+    </description>
 
     <properties>
         <onos.app.name>org.onosproject.calendar</onos.app.name>
@@ -48,39 +49,39 @@
         </dependency>
 
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-servlet</artifactId>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
 
-    <dependency>
-      <groupId>org.onosproject</groupId>
-      <artifactId>onlab-thirdparty</artifactId>
-    </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onlab-thirdparty</artifactId>
+        </dependency>
 
-    <dependency>
-      <groupId>org.onosproject</groupId>
-      <artifactId>onlab-misc</artifactId>
-    </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onlab-misc</artifactId>
+        </dependency>
 
-    <dependency>
-      <groupId>org.onosproject</groupId>
-      <artifactId>onlab-junit</artifactId>
-      <scope>test</scope>
-    </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onlab-junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-    <dependency>
-      <groupId>org.onosproject</groupId>
-      <artifactId>onos-cli</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.karaf.shell</groupId>
-      <artifactId>org.apache.karaf.shell.console</artifactId>
-    </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-cli</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.console</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -99,9 +100,8 @@
                             org.slf4j,
                             org.osgi.framework,
                             javax.ws.rs,javax.ws.rs.core,
-                            com.sun.jersey.api.core,
-                            com.sun.jersey.spi.container.servlet,
-                            com.sun.jersey.server.impl.container.servlet,
+                            org.glassfish.jersey,
+                            org.glassfish.jersey.servlet,
                             org.onlab.packet.*,
                             org.onlab.rest.*,
                             org.onosproject.*