Remove Jersey-1 support

We have migrated to Jersey-2 and have provided a migration grace
period. We now remove support for Jersey-1.

JIRA: ODLPARENT-191
Change-Id: I85eac8a3df66640c15add56676952298112a8de1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index f13a656a70a6c3d379a087ba99ea8fb95477f3fc..f63d935103abcf7cf77e80f23cde000fa8e1b37e 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -104,12 +104,6 @@
             <type>xml</type>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-jersey-1</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-jersey-2</artifactId>

diff --git a/features/odl-jersey-1/pom.xml b/features/odl-jersey-1/pom.xml
deleted file mode 100644 (file)
index a563c0e..0000000
--- a/features/odl-jersey-1/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016 Red Hat, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>5.0.0-SNAPSHOT</version>
-        <relativePath>../../single-feature-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odl-jersey-1</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>OpenDaylight :: Jersey 1.x</name>
-    <description>Jersey 1.x (legacy)</description>
-
-    <properties>
-        <checkDependencyChange>true</checkDependencyChange>
-        <failOnDependencyChange>true</failOnDependencyChange>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-servlet</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

diff --git a/features/odl-jersey-1/src/main/history/dependencies.xml b/features/odl-jersey-1/src/main/history/dependencies.xml
deleted file mode 100644 (file)
index 78d26ad..0000000
--- a/features/odl-jersey-1/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-jersey-1">
-    <feature version="0.0.0">
-        <bundle>mvn:com.sun.jersey/jersey-client/1.19.4</bundle>
-        <bundle>mvn:com.sun.jersey/jersey-core/1.19.4</bundle>
-        <bundle>mvn:com.sun.jersey/jersey-server/1.19.4</bundle>
-        <bundle>mvn:com.sun.jersey/jersey-servlet/1.19.4</bundle>
-        <bundle>mvn:javax.ws.rs/jsr311-api/1.1.1</bundle>
-    </feature>
-</features>

diff --git a/features/pom.xml b/features/pom.xml
index 4c4251e8f2024fd97f948353be4ef2b233ef3145..13043f2b7b1a5b545dcb22be9684baf1dc87c6b6 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -58,7 +58,6 @@
         <module>odl-guava-25</module>
         <module>odl-jackson-2.9</module>
         <module>odl-javassist-3</module>
-        <module>odl-jersey-1</module>
         <module>odl-jersey-2</module>
         <module>odl-jung-2.1</module>
         <module>odl-lmax-3</module>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index d758ae078efe7d9fa7d9e2ef62ba3a057e92ddf9..f7489470e8cbcd3cbe83dd23fd2fbe064ee2d5e2 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -189,13 +189,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-jersey-1</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-jersey-2</artifactId>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 95ab765df76605b96ec16bf1bdd3a1a6b3e9835a..9c9c9f3d2a5120f75353546fbd0d34e0e8ab6e81 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -127,34 +127,6 @@
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-servlet</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey.jersey-test-framework</groupId>
-            <artifactId>jersey-test-framework-grizzly2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey.jersey-test-framework</groupId>
-            <artifactId>jersey-test-framework-inmemory</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 845d71b031b681923c539d65f6858392ca971e07..5108ea7ba68b76c550d86728f74be99bec191d10 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -398,45 +398,6 @@
         <version>1.4.01</version>
       </dependency>
 
-      <!-- servlet 3.x support -->
-      <!-- FIXME : remove all dependencies for jersey 1.17 -->
-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-core</artifactId>
-        <version>1.19.4</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-json</artifactId>
-        <version>1.19.4</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-server</artifactId>
-        <version>1.19.4</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-servlet</artifactId>
-        <version>1.19.4</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.jersey.jersey-test-framework</groupId>
-        <artifactId>jersey-test-framework-grizzly2</artifactId>
-        <version>1.19.4</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.jersey.jersey-test-framework</groupId>
-        <artifactId>jersey-test-framework-inmemory</artifactId>
-        <version>1.19.4</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-client</artifactId>
-        <version>1.19.4</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.shiro</groupId>
         <artifactId>shiro-core</artifactId>