Simplify feature dependencies

Our Karaf 4 features include a number of dependencies which are also
transitive dependencies, and which don’t constitute the primary
API/runtime we’re interested in providing. This patch removes these
features (the generated features are identical).

Once we remove the corresponding Karaf 3 features we’ll also be able
to remove some of these dependencies from dependency management
altogether.

Change-Id: Ifaa7db8afc1128c331b2cdb710dd95887c55788d
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features4/odl-akka-clustering-2.4/pom.xml b/features4/odl-akka-clustering-2.4/pom.xml
index 5bbf3c43180d5c4a8e3cecea39c344d8ea55d83e..58bd28274a7b713d31d56fee848a6a58760b504f 100644 (file)
--- a/features4/odl-akka-clustering-2.4/pom.xml
+++ b/features4/odl-akka-clustering-2.4/pom.xml
@@ -38,33 +38,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.uncommons.maths</groupId>
-            <artifactId>uncommons-maths</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>jfree</groupId>
-                    <artifactId>jcommon</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jfree</groupId>
-                    <artifactId>jfreechart</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-protobuf_${scala.version}</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-            <version>3.10.6.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-remote_${scala.version}</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-cluster_${scala.version}</artifactId>

diff --git a/features4/odl-akka-persistence-2.4/pom.xml b/features4/odl-akka-persistence-2.4/pom.xml
index bea85601fd0daa1914ce97fea8b655f7150447ba..f11efec9ba00a033c6fc955df16424da007009d4 100644 (file)
--- a/features4/odl-akka-persistence-2.4/pom.xml
+++ b/features4/odl-akka-persistence-2.4/pom.xml
@@ -45,10 +45,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-protobuf_${scala.version}</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-persistence_${scala.version}</artifactId>

diff --git a/features4/odl-akka-system-2.4/pom.xml b/features4/odl-akka-system-2.4/pom.xml
index a769d162110a78edf4fc5be8ce8ef550e20c5305..a4d705ca27bb6722d5fada72c37f6755fc954454 100644 (file)
--- a/features4/odl-akka-system-2.4/pom.xml
+++ b/features4/odl-akka-system-2.4/pom.xml
@@ -38,10 +38,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>com.typesafe</groupId>
-            <artifactId>config</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-actor_${scala.version}</artifactId>

diff --git a/features4/odl-netty-4/pom.xml b/features4/odl-netty-4/pom.xml
index 4175f1da57f16d5ee5383440d8e18b40cf15ff7e..284b2cee1dc3a426966935908622180f31d9fa28 100644 (file)
--- a/features4/odl-netty-4/pom.xml
+++ b/features4/odl-netty-4/pom.xml
@@ -31,22 +31,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-buffer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-codec</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec-http</artifactId>