netconf protocols fixes
- Align artifactId, dependency structure, etc. similar to buck
Change-Id: I78fac4ca6567e5b2982cc59a7f0f57c7d74dbadb
diff --git a/apps/configsync-netconf/pom.xml b/apps/configsync-netconf/pom.xml
index 068d732..98e3868 100644
--- a/apps/configsync-netconf/pom.xml
+++ b/apps/configsync-netconf/pom.xml
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${onos.version}</version>
</dependency>
diff --git a/apps/netconf/client/pom.xml b/apps/netconf/client/pom.xml
index 37f94ce..50de210 100644
--- a/apps/netconf/client/pom.xml
+++ b/apps/netconf/client/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${onos.version}</version>
</dependency>
diff --git a/drivers/cisco/netconf/features.xml b/drivers/cisco/netconf/features.xml
index 49f4884..9d4a490 100644
--- a/drivers/cisco/netconf/features.xml
+++ b/drivers/cisco/netconf/features.xml
@@ -23,6 +23,6 @@
<bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
<bundle>mvn:${project.groupId}/onos-drivers-utilities/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-netconf-api/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-protocols-netconf-api/${project.version}</bundle>
</feature>
</features>
diff --git a/drivers/cisco/netconf/pom.xml b/drivers/cisco/netconf/pom.xml
index dbddedd..622e4a7 100644
--- a/drivers/cisco/netconf/pom.xml
+++ b/drivers/cisco/netconf/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/drivers/fujitsu/features.xml b/drivers/fujitsu/features.xml
index 66b0bce..5f2b7c4 100644
--- a/drivers/fujitsu/features.xml
+++ b/drivers/fujitsu/features.xml
@@ -23,6 +23,6 @@
<bundle>mvn:${project.groupId}/onos-drivers-utilities/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-netconf-api/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-protocols-netconf-api/${project.version}</bundle>
</feature>
</features>
diff --git a/drivers/fujitsu/pom.xml b/drivers/fujitsu/pom.xml
index 9a3d81a..32d766f 100644
--- a/drivers/fujitsu/pom.xml
+++ b/drivers/fujitsu/pom.xml
@@ -51,12 +51,12 @@
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-ctl</artifactId>
+ <artifactId>onos-protocols-netconf-ctl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -77,7 +77,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
</dependencies>
diff --git a/drivers/huawei/driver/pom.xml b/drivers/huawei/driver/pom.xml
index 778e87a..0d3a9fe 100644
--- a/drivers/huawei/driver/pom.xml
+++ b/drivers/huawei/driver/pom.xml
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/drivers/juniper/features.xml b/drivers/juniper/features.xml
index 2a5e81b..c6e4911 100644
--- a/drivers/juniper/features.xml
+++ b/drivers/juniper/features.xml
@@ -29,7 +29,7 @@
mvn:${project.groupId}/onos-drivers-utilities/${project.version}
</bundle>
- <bundle>mvn:${project.groupId}/onos-netconf-api/${project.version}
+ <bundle>mvn:${project.groupId}/onos-protocols-netconf-api/${project.version}
</bundle>
</feature>
</features>
diff --git a/drivers/juniper/pom.xml b/drivers/juniper/pom.xml
index eb1c12c..8c17f8d 100644
--- a/drivers/juniper/pom.xml
+++ b/drivers/juniper/pom.xml
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/drivers/microsemi/pom.xml b/drivers/microsemi/pom.xml
index 8d3889a..6459186 100644
--- a/drivers/microsemi/pom.xml
+++ b/drivers/microsemi/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/drivers/netconf/features.xml b/drivers/netconf/features.xml
index 66b0bce..5f2b7c4 100644
--- a/drivers/netconf/features.xml
+++ b/drivers/netconf/features.xml
@@ -23,6 +23,6 @@
<bundle>mvn:${project.groupId}/onos-drivers-utilities/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-netconf-api/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-protocols-netconf-api/${project.version}</bundle>
</feature>
</features>
diff --git a/drivers/netconf/pom.xml b/drivers/netconf/pom.xml
index 5dd841c..81cf922 100644
--- a/drivers/netconf/pom.xml
+++ b/drivers/netconf/pom.xml
@@ -44,7 +44,7 @@
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/drivers/oplink/features.xml b/drivers/oplink/features.xml
index 1e16fa0..a716991 100644
--- a/drivers/oplink/features.xml
+++ b/drivers/oplink/features.xml
@@ -23,6 +23,6 @@
<bundle>mvn:${project.groupId}/onos-drivers-utilities/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-netconf-api/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-protocols-netconf-api/${project.version}</bundle>
</feature>
</features>
diff --git a/drivers/oplink/pom.xml b/drivers/oplink/pom.xml
index 6041356..ce4eaf0 100644
--- a/drivers/oplink/pom.xml
+++ b/drivers/oplink/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/lib/pom.xml b/lib/pom.xml
index af013ea..55eea9a 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -49,6 +49,7 @@
<slf4j.version>1.7.21</slf4j.version>
<guava.version>22.0</guava.version>
<commons.io.version>2.4</commons.io.version>
+ <bouncycastle.version>1.58</bouncycastle.version>
<!-- TODO argLine was originally added maven-surfire-plugin configuration
to fix locale errors for non-US developers. However, it breaks
SonarQube's test coverage, so moving here for now. -->
@@ -184,6 +185,25 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-core</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+
+
<!-- Web related -->
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/protocols/netconf/api/pom.xml b/protocols/netconf/api/pom.xml
index c758a8e..d1609a4 100644
--- a/protocols/netconf/api/pom.xml
+++ b/protocols/netconf/api/pom.xml
@@ -21,11 +21,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf</artifactId>
+ <artifactId>onos-protocols-netconf</artifactId>
<version>1.12.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<packaging>bundle</packaging>
<description>ONOS NETCONF plugin API</description>
diff --git a/protocols/netconf/ctl/pom.xml b/protocols/netconf/ctl/pom.xml
index 0306e181..736d62f 100644
--- a/protocols/netconf/ctl/pom.xml
+++ b/protocols/netconf/ctl/pom.xml
@@ -20,11 +20,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf</artifactId>
+ <artifactId>onos-protocols-netconf</artifactId>
<version>1.12.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-netconf-ctl</artifactId>
+ <artifactId>onos-protocols-netconf-ctl</artifactId>
<packaging>bundle</packaging>
<description>ONOS NETCONF plugin controller</description>
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -64,7 +64,6 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
@@ -81,62 +80,13 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.58</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.58</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <filters>
- <filter>
- <artifact>ch.ethz.ganymed:ganymed-ssh2</artifact>
- <includes>
- <include>ch/ethz/ssh2/**</include>
- </includes>
- </filter>
- <filter>
- <artifact>org.jdom:jdom2</artifact>
- <includes>
- <include>org/jdom2/**</include>
- </includes>
- </filter>
- </filters>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>ch.ethz.ssh2.*</Private-Package>
- <Embed-Dependecy>ganymed-ssh2</Embed-Dependecy>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/protocols/netconf/pom.xml b/protocols/netconf/pom.xml
index e27ee31..9cf595d 100644
--- a/protocols/netconf/pom.xml
+++ b/protocols/netconf/pom.xml
@@ -24,7 +24,7 @@
<version>1.12.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-netconf</artifactId>
+ <artifactId>onos-protocols-netconf</artifactId>
<packaging>pom</packaging>
<modules>
diff --git a/providers/netconf/alarm/pom.xml b/providers/netconf/alarm/pom.xml
index 8187ec3..931f5a9 100644
--- a/providers/netconf/alarm/pom.xml
+++ b/providers/netconf/alarm/pom.xml
@@ -22,12 +22,12 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-ctl</artifactId>
+ <artifactId>onos-protocols-netconf-ctl</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/providers/netconf/app/app.xml b/providers/netconf/app/app.xml
index 01dbb42..00ce4ff 100644
--- a/providers/netconf/app/app.xml
+++ b/providers/netconf/app/app.xml
@@ -20,8 +20,8 @@
apps="org.onosproject.faultmanagement"
features="${project.artifactId}">
<description>${project.description}</description>
- <artifact>mvn:${project.groupId}/onos-netconf-api/${project.version}</artifact>
- <artifact>mvn:${project.groupId}/onos-netconf-ctl/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-protocols-netconf-api/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-protocols-netconf-ctl/${project.version}</artifact>
<artifact>mvn:${project.groupId}/onos-netconf-provider-device/${project.version}</artifact>
<artifact>mvn:${project.groupId}/onos-netconf-provider-alarm/${project.version}</artifact>
diff --git a/providers/netconf/app/features.xml b/providers/netconf/app/features.xml
index c8b6fa1..84d0c3b 100644
--- a/providers/netconf/app/features.xml
+++ b/providers/netconf/app/features.xml
@@ -19,8 +19,8 @@
description="${project.description}">
<feature>onos-api</feature>
<bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
- <bundle>mvn:${project.groupId}/onos-netconf-api/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-netconf-ctl/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-protocols-netconf-api/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-protocols-netconf-ctl/${project.version}</bundle>
<bundle>mvn:${project.groupId}/onos-netconf-provider-device/${project.version}</bundle>
<bundle>mvn:${project.groupId}/onos-netconf-provider-alarm/${project.version}</bundle>
diff --git a/providers/netconf/device/pom.xml b/providers/netconf/device/pom.xml
index 7860785..57cfaa1 100644
--- a/providers/netconf/device/pom.xml
+++ b/providers/netconf/device/pom.xml
@@ -38,12 +38,12 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-api</artifactId>
+ <artifactId>onos-protocols-netconf-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-netconf-ctl</artifactId>
+ <artifactId>onos-protocols-netconf-ctl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>