Align artifactId naming to buck
Change-Id: I16507dbfa23b9a1f45b6c2df92bfc0284cb91715
diff --git a/drivers/lumentum/features.xml b/drivers/lumentum/features.xml
index 66c03ac..43a8f41 100644
--- a/drivers/lumentum/features.xml
+++ b/drivers/lumentum/features.xml
@@ -22,7 +22,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/2.3.4_1</bundle>
- <bundle>mvn:${project.groupId}/onos-snmp-api/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-protocols-snmp-api/${project.version}</bundle>
</feature>
</features>
diff --git a/drivers/lumentum/pom.xml b/drivers/lumentum/pom.xml
index b3709b1..e54e5ab 100644
--- a/drivers/lumentum/pom.xml
+++ b/drivers/lumentum/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-api</artifactId>
+ <artifactId>onos-protocols-snmp-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/protocols/snmp/api/pom.xml b/protocols/snmp/api/pom.xml
index 9a4d839..2544dc7 100644
--- a/protocols/snmp/api/pom.xml
+++ b/protocols/snmp/api/pom.xml
@@ -19,13 +19,13 @@
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">
<parent>
- <artifactId>onos-snmp-protocol</artifactId>
+ <artifactId>onos-protocols-snmp</artifactId>
<groupId>org.onosproject</groupId>
<version>1.14.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>onos-snmp-api</artifactId>
+ <artifactId>onos-protocols-snmp-api</artifactId>
<packaging>bundle</packaging>
<dependencies>
diff --git a/protocols/snmp/ctl/pom.xml b/protocols/snmp/ctl/pom.xml
index 28788c2..0d84225 100644
--- a/protocols/snmp/ctl/pom.xml
+++ b/protocols/snmp/ctl/pom.xml
@@ -19,19 +19,19 @@
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">
<parent>
- <artifactId>onos-snmp-protocol</artifactId>
+ <artifactId>onos-protocols-snmp</artifactId>
<groupId>org.onosproject</groupId>
<version>1.14.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>onos-snmp-ctl</artifactId>
+ <artifactId>onos-protocols-snmp-ctl</artifactId>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-api</artifactId>
+ <artifactId>onos-protocols-snmp-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/protocols/snmp/pom.xml b/protocols/snmp/pom.xml
index 65873f5..deece83 100644
--- a/protocols/snmp/pom.xml
+++ b/protocols/snmp/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>onos-snmp-protocol</artifactId>
+ <artifactId>onos-protocols-snmp</artifactId>
<packaging>pom</packaging>
<modules>
<module>api</module>
diff --git a/providers/snmp/alarm/pom.xml b/providers/snmp/alarm/pom.xml
index 0a228c8..c456147 100644
--- a/providers/snmp/alarm/pom.xml
+++ b/providers/snmp/alarm/pom.xml
@@ -22,11 +22,11 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-providers</artifactId>
+ <artifactId>onos-providers-snmp</artifactId>
<version>1.14.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-snmp-provider-alarm</artifactId>
+ <artifactId>onos-providers-snmp-alarm</artifactId>
<packaging>bundle</packaging>
<description>ONOS SNMP protocol alarm provider</description>
@@ -38,13 +38,13 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-api</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <artifactId>onos-protocols-snmp-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-ctl</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <artifactId>onos-protocols-snmp-ctl</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-provider-device</artifactId>
+ <artifactId>onos-providers-snmp-device</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/providers/snmp/app/app.xml b/providers/snmp/app/app.xml
index fd39042..7cedcee 100644
--- a/providers/snmp/app/app.xml
+++ b/providers/snmp/app/app.xml
@@ -19,11 +19,11 @@
featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
features="${project.artifactId}" apps="org.onosproject.faultmanagement">
<description>${project.description}</description>
- <artifact>mvn:${project.groupId}/onos-snmp-provider-device/${project.version}</artifact>
- <artifact>mvn:${project.groupId}/onos-snmp-provider-alarm/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-providers-snmp-device/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-providers-snmp-alarm/${project.version}</artifact>
- <artifact>mvn:${project.groupId}/onos-snmp-api/${project.version}</artifact>
- <artifact>mvn:${project.groupId}/onos-snmp-ctl/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-protocols-snmp-api/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-protocols-snmp-ctl/${project.version}</artifact>
<artifact>mvn:org.onosproject/snmp-core/1.3-20161021.1</artifact>
<artifact>mvn:org.onosproject/mibbler-mibs-bti7000/1.0-20151221.1</artifact>
diff --git a/providers/snmp/app/features.xml b/providers/snmp/app/features.xml
index a130030..88176ed 100644
--- a/providers/snmp/app/features.xml
+++ b/providers/snmp/app/features.xml
@@ -19,10 +19,10 @@
description="${project.description}">
<feature>onos-api</feature>
<bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
- <bundle>mvn:${project.groupId}/onos-snmp-api/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-snmp-ctl/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-snmp-provider-device/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-snmp-provider-alarm/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-protocols-snmp-api/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-protocols-snmp-ctl/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-providers-snmp-device/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-providers-snmp-alarm/${project.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/2.3.4_1</bundle>
<bundle>mvn:org.onosproject/snmp-core/1.3-20161021.1</bundle>
diff --git a/providers/snmp/app/pom.xml b/providers/snmp/app/pom.xml
index 20d29d0..0ecacc0 100644
--- a/providers/snmp/app/pom.xml
+++ b/providers/snmp/app/pom.xml
@@ -21,11 +21,11 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-providers</artifactId>
+ <artifactId>onos-providers-snmp</artifactId>
<version>1.14.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-snmp-app</artifactId>
+ <artifactId>onos-providers-snmp-app</artifactId>
<packaging>pom</packaging>
<description>SNMP protocol southbound providers</description>
@@ -33,12 +33,12 @@
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-provider-device</artifactId>
+ <artifactId>onos-providers-snmp-device</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-provider-alarm</artifactId>
+ <artifactId>onos-providers-snmp-alarm</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/providers/snmp/device/pom.xml b/providers/snmp/device/pom.xml
index 8a93599..030b9ce 100644
--- a/providers/snmp/device/pom.xml
+++ b/providers/snmp/device/pom.xml
@@ -21,11 +21,11 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-providers</artifactId>
+ <artifactId>onos-providers-snmp</artifactId>
<version>1.14.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-snmp-provider-device</artifactId>
+ <artifactId>onos-providers-snmp-device</artifactId>
<packaging>bundle</packaging>
<description>ONOS SNMP protocol device provider</description>
@@ -37,12 +37,12 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-api</artifactId>
+ <artifactId>onos-protocols-snmp-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-snmp-ctl</artifactId>
+ <artifactId>onos-protocols-snmp-ctl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/providers/snmp/pom.xml b/providers/snmp/pom.xml
index c952ad2..25e495d 100644
--- a/providers/snmp/pom.xml
+++ b/providers/snmp/pom.xml
@@ -25,14 +25,14 @@
<version>1.14.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-snmp-providers</artifactId>
+ <artifactId>onos-providers-snmp</artifactId>
<packaging>pom</packaging>
<description>ONOS SNMP protocol adapters</description>
<modules>
<module>device</module>
- <module>app</module>
<module>alarm</module>
+ <module>app</module>
</modules>
</project>