Remove netty-config-api

This artifact does not contain anything, serving only to pull in
netty-transport. Remove it and adjust its users to pul in what they
need, which ends up lowering dependencies in some cases.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index e8b2c0f09811cd6e6ac1a08f443ae3ebf74ca211..8a009390f58330830b1625c30b0549575a712db6 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -337,11 +337,6 @@
             </dependency>
 
             <!-- Config remnants -->
-            <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>netty-config-api</artifactId>
-                 <version>0.13.0-SNAPSHOT</version>
-             </dependency>
              <dependency>
                  <groupId>${project.groupId}</groupId>
                  <artifactId>netty-event-executor-config</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
index fbc24a7b8961e74c6b53f660d9d973822accab99..4448b3c06bf5d9fbc408d20dc44b5c0a68a02f7c 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -37,10 +37,6 @@
 
     <dependencies>
         <!-- Config Subsystem remnants -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-config-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>netty-event-executor-config</artifactId>

diff --git a/opendaylight/config/netty-config-api/pom.xml b/opendaylight/config/netty-config-api/pom.xml
deleted file mode 100644 (file)
index c86c1f7..0000000
--- a/opendaylight/config/netty-config-api/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<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.controller</groupId>
-    <artifactId>config-subsystem</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <artifactId>netty-config-api</artifactId>
-  <packaging>bundle</packaging>
-  <name>${project.artifactId}</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-  </dependencies>
-</project>

diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml
index ddf4139ef72362652b731c2b521a037a20b3b78c..f7ef225d8852e1799a232ce8fb15842cd96941e7 100644 (file)
--- a/opendaylight/config/netty-event-executor-config/pom.xml
+++ b/opendaylight/config/netty-event-executor-config/pom.xml
@@ -19,8 +19,8 @@
       <artifactId>guava</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>netty-config-api</artifactId>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml
index 6151931f5c3641a383f02156c298af0f7b820a49..318b797cafb7f0e8bef7b05218ceb753b88dfbae 100644 (file)
--- a/opendaylight/config/netty-threadgroup-config/pom.xml
+++ b/opendaylight/config/netty-threadgroup-config/pom.xml
@@ -17,8 +17,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>netty-config-api</artifactId>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml
index 7fa3587d4e3bbd693c7e4b0d602b5b2fc71f1f8d..e94753a1b7a4bffba6bbddd219a7bed025866428 100644 (file)
--- a/opendaylight/config/netty-timer-config/pom.xml
+++ b/opendaylight/config/netty-timer-config/pom.xml
@@ -15,8 +15,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>netty-config-api</artifactId>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index ec7e8c58ee7d25d4a1f5b25b1e4521084914b916..f28b56bfb1c44dcde1e4014b5efebf3e26b628b8 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -17,7 +17,6 @@
 
   <modules>
     <module>threadpool-config-api</module>
-    <module>netty-config-api</module>
     <module>threadpool-config-impl</module>
     <module>netty-threadgroup-config</module>
     <module>netty-event-executor-config</module>