Merge "Bug 4846 odl-mdsal-apidocs swagger UI uses deprecated TokenAuthFilter"

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index d130180040ce8048b0015ab189f71ed9f336d6b0..df2201cc2ed524891c2eff50b16299d08b846726 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -24,7 +24,6 @@
     <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
     <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
     <features.test.version>1.6.0-SNAPSHOT</features.test.version>
-    <jersey-servlet.version>1.17</jersey-servlet.version>
     <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
     <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     <restconf.version>1.3.0-SNAPSHOT</restconf.version>

diff --git a/pom.xml b/pom.xml
index 3ee16d98b480fe96ec663798b679f7eccc38e41b..51077a81914b108f74b4b3958912907da00b3d18 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,6 @@
         <ietf-restconf.version>2013.10.19.8-SNAPSHOT</ietf-restconf.version>
         <ietf-topology.version>2013.10.21.8-SNAPSHOT</ietf-topology.version>
         <ietf-yang-types.version>2010.09.24.8-SNAPSHOT</ietf-yang-types.version>
-        <jersey-servlet.version>1.17</jersey-servlet.version>
 
         <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
         <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>