Remove unneeded jersey-2.25.1 hacks

odlparent now imports jersey-bom and includes a correct packaging
of jersey-2.25.1, hence we do not need to over-specify features
and dependencies -- making future upgrades easier.

Change-Id: Ifaae956751a93eb4564255167d3079893669756a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index 810d5448da3b0d8b1741af813c69e367b141ed03..e5759f54f6eacb4a1b10ed76eeb2ffbaa76e6296 100644 (file)
--- a/features/odl-aaa-web/pom.xml
+++ b/features/odl-aaa-web/pom.xml
@@ -55,6 +55,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-karaf-feat-jetty</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-util</artifactId>
@@ -65,22 +71,9 @@
             <groupId>${project.groupId}.web</groupId>
             <artifactId>web-osgi-impl</artifactId>
         </dependency>
-
         <dependency>
             <groupId>${project.groupId}.web</groupId>
             <artifactId>servlet-jersey2</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-            <artifactId>jersey-guava</artifactId>
-            <version>2.25.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-karaf-feat-jetty</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
     </dependencies>
 </project>

diff --git a/web/servlet-jersey2/pom.xml b/web/servlet-jersey2/pom.xml
index 31fa5fca9bdaafe4e2be366f496b3aa48fab059d..8e2e9bb31375fc975210f55afdbac46ea1bee622 100644 (file)
--- a/web/servlet-jersey2/pom.xml
+++ b/web/servlet-jersey2/pom.xml
@@ -21,20 +21,6 @@
     <name>ODL :: aaa :: ${project.artifactId}</name>
     <packaging>bundle</packaging>
 
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.glassfish.jersey</groupId>
-                <artifactId>jersey-bom</artifactId>
-                <version>2.25.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.aaa.web</groupId>
@@ -43,8 +29,6 @@
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>
-            <!-- Override the odlparent version -->
-            <version>2.25.1</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>