General cleanup of pom files under protocols.
Change-Id: I461f55665fc57057261bdd81f6bbe8258ee7b49b
diff --git a/protocols/bgp/api/pom.xml b/protocols/bgp/api/pom.xml
index 6fa1cc7..2390e5f 100755
--- a/protocols/bgp/api/pom.xml
+++ b/protocols/bgp/api/pom.xml
@@ -44,11 +44,6 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-misc</artifactId>
- </dependency>
-
</dependencies>
<build>
diff --git a/protocols/bgp/ctl/pom.xml b/protocols/bgp/ctl/pom.xml
index 5cefd73..629e9ee 100755
--- a/protocols/bgp/ctl/pom.xml
+++ b/protocols/bgp/ctl/pom.xml
@@ -47,10 +47,6 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-misc</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/protocols/bgp/pom.xml b/protocols/bgp/pom.xml
index 7649b58..3b28181 100755
--- a/protocols/bgp/pom.xml
+++ b/protocols/bgp/pom.xml
@@ -37,24 +37,4 @@
<module>bgpio</module>
</modules>
- <dependencies>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-misc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-junit</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/protocols/netconf/api/pom.xml b/protocols/netconf/api/pom.xml
index ed8a530..062ec93 100644
--- a/protocols/netconf/api/pom.xml
+++ b/protocols/netconf/api/pom.xml
@@ -14,18 +14,23 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-netconf</artifactId>
<version>1.4.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>onos-netconf-api</artifactId>
<packaging>bundle</packaging>
<description>ONOS NETCONF plugin API</description>
+
<dependencies>
<dependency>
<groupId>commons-pool</groupId>
diff --git a/protocols/netconf/ctl/pom.xml b/protocols/netconf/ctl/pom.xml
index e022acb..c4f214b 100644
--- a/protocols/netconf/ctl/pom.xml
+++ b/protocols/netconf/ctl/pom.xml
@@ -28,6 +28,8 @@
<artifactId>onos-netconf-ctl</artifactId>
<packaging>bundle</packaging>
+ <description>ONOS NETCONF plugin controller</description>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/protocols/netconf/pom.xml b/protocols/netconf/pom.xml
index d2f5c43..f0d6ca7 100644
--- a/protocols/netconf/pom.xml
+++ b/protocols/netconf/pom.xml
@@ -34,22 +34,10 @@
<module>ctl</module>
</modules>
- <description>ONOS NETCONF southbound libraries</description>
+ <description>ONOS NETCONF southbound plugin</description>
+
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-misc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-junit</artifactId>
- </dependency>
- <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</dependency>
@@ -63,21 +51,9 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-core-net</artifactId>
+ <artifactId>onos-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/protocols/netconf/rfc/pom.xml b/protocols/netconf/rfc/pom.xml
index 832937b..fa1e06e 100644
--- a/protocols/netconf/rfc/pom.xml
+++ b/protocols/netconf/rfc/pom.xml
@@ -27,4 +27,5 @@
<artifactId>onos-netconf-rfc</artifactId>
<packaging>bundle</packaging>
+
</project>
diff --git a/protocols/openflow/pom.xml b/protocols/openflow/pom.xml
index 5a136a1..3bf976b 100644
--- a/protocols/openflow/pom.xml
+++ b/protocols/openflow/pom.xml
@@ -38,20 +38,6 @@
<dependencies>
<dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-misc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-junit</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
@@ -74,13 +60,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/protocols/ovsdb/pom.xml b/protocols/ovsdb/pom.xml
index 1284d75..03e9d98 100644
--- a/protocols/ovsdb/pom.xml
+++ b/protocols/ovsdb/pom.xml
@@ -26,25 +26,18 @@
</parent>
<artifactId>onos-ovsdb</artifactId>
- <name>onos-ovsdb</name>
<packaging>pom</packaging>
<description>ONOS OVSDB southbound plugin</description>
+
+ <modules>
+ <module>api</module>
+ <module>rfc</module>
+ <module>ctl</module>
+ </modules>
+
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-misc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-junit</artifactId>
- </dependency>
- <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</dependency>
@@ -54,18 +47,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>api</module>
- <module>rfc</module>
- <module>ctl</module>
- </modules>
</project>
\ No newline at end of file
diff --git a/protocols/pcep/pom.xml b/protocols/pcep/pom.xml
index c8e4222..466b0c3 100755
--- a/protocols/pcep/pom.xml
+++ b/protocols/pcep/pom.xml
@@ -37,24 +37,4 @@
<module>pcepio</module>
</modules>
- <dependencies>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-misc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-junit</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 1fc63d6..25219fa 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -29,7 +29,7 @@
<artifactId>onos-protocols</artifactId>
<packaging>pom</packaging>
- <description>ONOS south-bound protocols</description>
+ <description>ONOS southbound protocols</description>
<modules>
<module>openflow</module>
@@ -40,6 +40,19 @@
</modules>
<dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onlab-misc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onlab-junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>