Fix cherry-pick bugs
- fixed wrong versions
- fixed few minor pom issues
Change-Id: I2a283ab591198401f776150566cd2a7165bd1e3e
diff --git a/apps/mcast/api/pom.xml b/apps/mcast/api/pom.xml
index 370d992..a43d269 100644
--- a/apps/mcast/api/pom.xml
+++ b/apps/mcast/api/pom.xml
@@ -21,18 +21,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mcast</artifactId>
- <version>1.12.1-SNAPSHOT</version>
+ <artifactId>onos-apps-mcast</artifactId>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-app-mcast-api</artifactId>
+ <artifactId>onos-apps-mcast-api</artifactId>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/apps/mcast/app/app.xml b/apps/mcast/app/app.xml
index fabf8e2..ff42633 100644
--- a/apps/mcast/app/app.xml
+++ b/apps/mcast/app/app.xml
@@ -19,8 +19,8 @@
featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
features="${project.artifactId}">
<description>${project.description}</description>
- <artifact>mvn:${project.groupId}/onos-app-mcast-api/${project.version}</artifact>
- <artifact>mvn:${project.groupId}/onos-app-mcast-impl/${project.version}</artifact>
- <artifact>mvn:${project.groupId}/onos-app-mcast-web/${project.version}</artifact>
- <artifact>mvn:${project.groupId}/onos-app-mcast-cli/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-apps-mcast-api/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-apps-mcast-impl/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-apps-mcast-web/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-apps-mcast-cli/${project.version}</artifact>
</app>
diff --git a/apps/mcast/app/features.xml b/apps/mcast/app/features.xml
index 2e850ee..5f69b9b 100644
--- a/apps/mcast/app/features.xml
+++ b/apps/mcast/app/features.xml
@@ -19,9 +19,9 @@
description="${project.description}">
<feature>onos-api</feature>
<feature>onos-drivers-default</feature>
- <bundle>mvn:${project.groupId}/onos-app-mcast-api/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-app-mcast-impl/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-app-mcast-web/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-app-mcast-cli/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-apps-mcast-api/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-apps-mcast-impl/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-apps-mcast-web/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-apps-mcast-cli/${project.version}</bundle>
</feature>
</features>
diff --git a/apps/mcast/app/pom.xml b/apps/mcast/app/pom.xml
index 48addc6..889fbc7 100644
--- a/apps/mcast/app/pom.xml
+++ b/apps/mcast/app/pom.xml
@@ -20,11 +20,11 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mcast</artifactId>
- <version>1.12.1-SNAPSHOT</version>
+ <artifactId>onos-apps-mcast</artifactId>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-app-mcast-pkg</artifactId>
+ <artifactId>onos-apps-mcast-pkg</artifactId>
<packaging>pom</packaging>
<description>ONOS Multicast handling application</description>
@@ -32,22 +32,22 @@
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mcast-api</artifactId>
+ <artifactId>onos-apps-mcast-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mcast-impl</artifactId>
+ <artifactId>onos-apps-mcast-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mcast-web</artifactId>
+ <artifactId>onos-apps-mcast-web</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mcast-cli</artifactId>
+ <artifactId>onos-apps-mcast-cli</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/apps/mcast/cli/pom.xml b/apps/mcast/cli/pom.xml
index 7af05c6..cb45a37 100644
--- a/apps/mcast/cli/pom.xml
+++ b/apps/mcast/cli/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mcast</artifactId>
- <version>1.12.1-SNAPSHOT</version>
+ <artifactId>onos-apps-mcast</artifactId>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-app-mcast-cli</artifactId>
+ <artifactId>onos-apps-mcast-cli</artifactId>
<packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mcast-api</artifactId>
+ <artifactId>onos-apps-mcast-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/apps/mcast/impl/pom.xml b/apps/mcast/impl/pom.xml
index 4fe6094..fb4109b 100644
--- a/apps/mcast/impl/pom.xml
+++ b/apps/mcast/impl/pom.xml
@@ -21,18 +21,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mcast</artifactId>
- <version>1.12.1-SNAPSHOT</version>
+ <artifactId>onos-apps-mcast</artifactId>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-app-mcast-impl</artifactId>
+ <artifactId>onos-apps-mcast-impl</artifactId>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
@@ -45,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mcast-api</artifactId>
+ <artifactId>onos-apps-mcast-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/apps/mcast/pom.xml b/apps/mcast/pom.xml
index d80bdec..4989e0d 100644
--- a/apps/mcast/pom.xml
+++ b/apps/mcast/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.12.1-SNAPSHOT</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-app-mcast</artifactId>
+ <artifactId>onos-apps-mcast</artifactId>
<packaging>pom</packaging>
<description>ONOS multicast applications</description>
diff --git a/apps/mcast/web/pom.xml b/apps/mcast/web/pom.xml
index 27eb9d8..cc43c34 100644
--- a/apps/mcast/web/pom.xml
+++ b/apps/mcast/web/pom.xml
@@ -21,12 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-mcast</artifactId>
- <version>1.12.1-SNAPSHOT</version>
+ <artifactId>onos-apps-mcast</artifactId>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
- <artifactId>onos-app-mcast-web</artifactId>
+ <artifactId>onos-apps-mcast-web</artifactId>
<packaging>bundle</packaging>
<properties>
<web.context>/onos/v1/mcast</web.context>
@@ -42,12 +42,10 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator-api</artifactId>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
@@ -58,20 +56,17 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-common</artifactId>
<scope>test</scope>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-rest</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- <type>jar</type>
</dependency>
<dependency>