Remove odl-jung-2.1

This library is used by any of the active downstream projects. Remove
its declaration and packaging.

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

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index adaf1c58064851bafd7897c6af3b25376232a578..d3d6ef60c4901940d0f272d04b6b1f00c26dccc9 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -87,13 +87,6 @@
             <type>xml</type>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-jung-2.1</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-karaf-feat-jdbc</artifactId>

diff --git a/features/odl-jung-2.1/pom.xml b/features/odl-jung-2.1/pom.xml
deleted file mode 100644 (file)
index c49cc9d..0000000
--- a/features/odl-jung-2.1/pom.xml
+++ /dev/null
@@ -1,55 +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>11.0.0-SNAPSHOT</version>
-        <relativePath>../../single-feature-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odl-jung-2.1</artifactId>
-    <version>11.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>OpenDaylight :: JUNG</name>
-    <description>JUNG: Java Universal Network/Graph Framework</description>
-
-    <properties>
-        <checkDependencyChange>true</checkDependencyChange>
-        <failOnDependencyChange>true</failOnDependencyChange>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-guava</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.jung</groupId>
-            <artifactId>jung-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.jung</groupId>
-            <artifactId>jung-algorithms</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.jung</groupId>
-            <artifactId>jung-graph-impl</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

diff --git a/features/odl-jung-2.1/src/main/history/dependencies.xml b/features/odl-jung-2.1/src/main/history/dependencies.xml
deleted file mode 100644 (file)
index be65a1c..0000000
--- a/features/odl-jung-2.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-jung-2.1">
-    <feature version="0.0.0">
-        <feature>odl-guava</feature>
-        <feature>wrap</feature>
-        <bundle>wrap:mvn:net.sf.jung/jung-algorithms/2.1.1</bundle>
-        <bundle>wrap:mvn:net.sf.jung/jung-api/2.1.1</bundle>
-        <bundle>wrap:mvn:net.sf.jung/jung-graph-impl/2.1.1</bundle>
-    </feature>
-</features>

diff --git a/features/pom.xml b/features/pom.xml
index b2bd367829f8cc918dcc33b88afd2c500bb9cce5..f757fe389d45cd343e368012ca2c2546d2e3269f 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -46,7 +46,6 @@
         <module>odl-jakarta-activation-api</module>
         <module>odl-javassist-3</module>
         <module>odl-jersey-2</module>
-        <module>odl-jung-2.1</module>
         <module>odl-lmax-3</module>
         <module>odl-netty-4</module>
         <module>odl-servlet-api</module>

diff --git a/karaf/test-static/pom.xml b/karaf/test-static/pom.xml
index 955189228e7aeeb5e163726327776102f6d5ba42..0f9be9e036f3ffe69ea329a662244a556e595f5f 100644 (file)
--- a/karaf/test-static/pom.xml
+++ b/karaf/test-static/pom.xml
@@ -38,8 +38,6 @@
                         <startupFeature>odl-jackson-2.13</startupFeature>
                         <startupFeature>odl-jakarta-activation-api</startupFeature>
                         <startupFeature>odl-jetty-2</startupFeature>
-                        <!-- FIXME: needs https://issues.apache.org/jira/browse/KARAF-6573
-                        <startupFeature>odl-jung-2.1</startupFeature-->
                         <startupFeature>odl-lmax-3</startupFeature>
                         <startupFeature>odl-netty-4</startupFeature>
                     </startupFeatures>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index a8ec632597dd5e4732581ac4a019d06cc80669db..eef42cc0dd507df9dd5aa2afdbbc1e7483b83888 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -141,13 +141,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-jung-2.1</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-lmax-3</artifactId>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 7b187268e4f50ad834afaa2f8098aecee380eac2..d8db1bc0921b11375a4f82850ece46664f6e354f 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -135,18 +135,6 @@
             <groupId>net.java.dev.stax-utils</groupId>
             <artifactId>stax-utils</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.sf.jung</groupId>
-            <artifactId>jung-algorithms</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.jung</groupId>
-            <artifactId>jung-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.jung</groupId>
-            <artifactId>jung-graph-impl</artifactId>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.argparse4j</groupId>
             <artifactId>argparse4j</artifactId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index aa90d1b9f4c40880ec49f86b4f97c130f07cdbda..4e6b55f3e409561b73d85742b1f668c0a546ec32 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -718,23 +718,6 @@
         <version>0.9.0</version>
       </dependency>
 
-      <!-- jung, a graph library -->
-      <dependency>
-        <groupId>net.sf.jung</groupId>
-        <artifactId>jung-api</artifactId>
-        <version>2.1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>net.sf.jung</groupId>
-        <artifactId>jung-algorithms</artifactId>
-        <version>2.1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>net.sf.jung</groupId>
-        <artifactId>jung-graph-impl</artifactId>
-        <version>2.1.1</version>
-      </dependency>
-
       <!-- ThreeTen-Extra, date/time complements -->
       <dependency>
         <groupId>org.threeten</groupId>