Merge "Tag app as snapshot, bump onos version"
diff --git a/ce-api/pom.xml b/ce-api/pom.xml
index 52ab448..52a5fd6 100644
--- a/ce-api/pom.xml
+++ b/ce-api/pom.xml
@@ -22,20 +22,20 @@
<parent>
<groupId>org.opencord</groupId>
<artifactId>ce</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.opencord.ce</groupId>
<artifactId>ce-api</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <description>Virtual ethernet edge service for CORD</description>
+ <description>Carrier Ethernet service API</description>
<properties>
<onos.app.name>org.opencord.ce.api</onos.app.name>
- <onos.app.title>ECORD CE API App</onos.app.title>
+ <onos.app.title>Carrier Ethernet service API</onos.app.title>
<onos.app.url>http://opencord.org</onos.app.url>
</properties>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
- <version>1.10.3</version>
+ <version>1.10.6</version>
</dependency>
</dependencies>
<build>
diff --git a/global/app/pom.xml b/global/app/pom.xml
index 1684fea..eb8de32 100644
--- a/global/app/pom.xml
+++ b/global/app/pom.xml
@@ -21,15 +21,16 @@
<parent>
<groupId>org.opencord.ce</groupId>
<artifactId>global</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>ecord-global-app</artifactId>
<packaging>pom</packaging>
+ <version>1.0.0-SNAPSHOT</version>
- <description>java application bundling orchestration,
- http communication and topology provider component
+ <description>Java application bundling orchestration,
+ HTTP communication and topology provider component
</description>
<properties>
diff --git a/global/ce-orchestration/pom.xml b/global/ce-orchestration/pom.xml
index ac7f64f..9eddcf8 100644
--- a/global/ce-orchestration/pom.xml
+++ b/global/ce-orchestration/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.opencord.ce</groupId>
<artifactId>global</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>orchestration</artifactId>
@@ -33,7 +33,7 @@
<properties>
<web.context>/carrierethernet</web.context>
<onos.app.name>org.opencord.ce.global.orchestration</onos.app.name>
- <onos.version>1.10.3</onos.version>
+ <onos.version>1.10.6</onos.version>
<onos.app.url>http://opencord.org</onos.app.url>
</properties>
diff --git a/global/http-channel/pom.xml b/global/http-channel/pom.xml
index 1ff30e9..800ce2b 100644
--- a/global/http-channel/pom.xml
+++ b/global/http-channel/pom.xml
@@ -22,20 +22,20 @@
<parent>
<groupId>org.opencord.ce</groupId>
<artifactId>global</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>global-channel</artifactId>
<packaging>bundle</packaging>
+ <version>1.0.0-SNAPSHOT</version>
- <description>Http communication channel between hierarchic ONOS controllers</description>
+ <description>HTTP communication channel between hierarchical ONOS controllers</description>
<properties>
<web.context>/ecord/global</web.context>
<onos.app.name>org.opencord.ce.global.channel</onos.app.name>
- <onos.version>1.10.3</onos.version>
+ <onos.version>1.10.6</onos.version>
<onos.app.url>http://opencord.org</onos.app.url>
- <project.version>1.0.0</project.version>
</properties>
<dependencies>
diff --git a/global/pom.xml b/global/pom.xml
index 73f6798..e8d0c91 100644
--- a/global/pom.xml
+++ b/global/pom.xml
@@ -22,18 +22,19 @@
<parent>
<groupId>org.opencord</groupId>
<artifactId>ce</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.opencord.ce</groupId>
<artifactId>global</artifactId>
<packaging>pom</packaging>
+ <version>1.0.0-SNAPSHOT</version>
- <description>Orchestration logic of Carrier Ethernet Forwarding Constructs</description>
+ <description>Multi-CORD orchestration of Carrier Ethernet services</description>
<properties>
- <onos.version>1.10.3</onos.version>
- <onos.app.title>ECORD global orchestrator</onos.app.title>
+ <onos.version>1.10.6</onos.version>
+ <onos.app.title>E-CORD global orchestrator</onos.app.title>
<onos.app.url>http://opencord.org</onos.app.url>
</properties>
diff --git a/global/virtualprovider/pom.xml b/global/virtualprovider/pom.xml
index a995b1f..aaf695c 100644
--- a/global/virtualprovider/pom.xml
+++ b/global/virtualprovider/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.opencord.ce</groupId>
<artifactId>global</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>virtualprovider</artifactId>
@@ -32,9 +32,8 @@
<properties>
<onos.app.name>org.opencord.ce.global.vprovider</onos.app.name>
- <onos.version>1.10.3</onos.version>
+ <onos.version>1.10.6</onos.version>
<onos.app.url>http://opencord.org</onos.app.url>
- <project.version>1.0.0</project.version>
</properties>
<dependencies>
<dependency>
diff --git a/local/bigswitch/pom.xml b/local/bigswitch/pom.xml
index 71f0179..0fe80b2 100644
--- a/local/bigswitch/pom.xml
+++ b/local/bigswitch/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.opencord.ce</groupId>
<artifactId>local</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>bigswitch</artifactId>
@@ -32,10 +32,9 @@
<properties>
<onos.app.name>org.opencord.ce.local.bigswitch</onos.app.name>
- <onos.app.title>ECORD-CE App</onos.app.title>
+ <onos.app.title>E-CORD Carrier Ethernet bigswitch abstraction</onos.app.title>
<onos.app.url>http://opencord.org</onos.app.url>
- <project.version>1.0.0</project.version>
- <onos.version>1.10.3</onos.version>
+ <onos.version>1.10.6</onos.version>
</properties>
<dependencies>
diff --git a/local/ce-central-office/pom.xml b/local/ce-central-office/pom.xml
index 108623f..3ae3a36 100644
--- a/local/ce-central-office/pom.xml
+++ b/local/ce-central-office/pom.xml
@@ -22,13 +22,13 @@
<parent>
<groupId>org.opencord.ce</groupId>
<artifactId>local</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>co</artifactId>
<packaging>bundle</packaging>
- <description>Central Office app for Carrier Ethernet Service</description>
+ <description>CORD application for Carrier Ethernet Service</description>
<properties>
<onos.app.name>org.opencord.ce.local.co</onos.app.name>
diff --git a/local/ce-transport/pom.xml b/local/ce-transport/pom.xml
index edf24d8..dc8e9a3 100644
--- a/local/ce-transport/pom.xml
+++ b/local/ce-transport/pom.xml
@@ -22,17 +22,17 @@
<parent>
<groupId>org.opencord.ce</groupId>
<artifactId>local</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>transport</artifactId>
<packaging>bundle</packaging>
- <description>Transport network provisioner of Carrier Ethernet Service</description>
+ <description>Transport network provisioner of Carrier Ethernet service</description>
<properties>
<onos.app.name>org.opencord.ce.local.transport</onos.app.name>
- <onos.version>1.10.0</onos.version>
+ <onos.version>1.10.6</onos.version>
<onos.app.url>http://opencord.org</onos.app.url>
</properties>
diff --git a/local/ce-vee/pom.xml b/local/ce-vee/pom.xml
index 8a416d4..a95012a 100644
--- a/local/ce-vee/pom.xml
+++ b/local/ce-vee/pom.xml
@@ -22,17 +22,18 @@
<parent>
<groupId>org.opencord.ce</groupId>
<artifactId>local</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>vee</artifactId>
<packaging>bundle</packaging>
+ <version>1.0.0-SNAPSHOT</version>
- <description>Virtual ethernet edge service for CORD</description>
+ <description>Virtual Ethernet Edge service for CORD</description>
<properties>
<onos.app.name>org.opencord.ce.local.vee</onos.app.name>
- <onos.app.title>ECORD-CE App</onos.app.title>
+ <onos.app.title>E-CORD Ethernet Edge app</onos.app.title>
<onos.app.url>http://opencord.org</onos.app.url>
</properties>
<dependencies>
diff --git a/local/common-component/pom.xml b/local/common-component/pom.xml
index 67fd3bf..5bd567f 100644
--- a/local/common-component/pom.xml
+++ b/local/common-component/pom.xml
@@ -21,19 +21,19 @@
<parent>
<groupId>org.opencord.ce</groupId>
<artifactId>local</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>ecord-local-app</artifactId>
<packaging>pom</packaging>
+ <version>1.0.0-SNAPSHOT</version>
- <description>java application bundling the bigswitch abstraction
- and the http channel component
+ <description>Java application bundling the bigswitch abstraction
+ and the HTTP channel component
</description>
<properties>
- <project.version>1.0.0</project.version>
<onos.app.name>org.opencord.ce.local.app</onos.app.name>
</properties>
diff --git a/local/http-channel/pom.xml b/local/http-channel/pom.xml
index e6a367e..ba9d8af 100644
--- a/local/http-channel/pom.xml
+++ b/local/http-channel/pom.xml
@@ -22,20 +22,20 @@
<parent>
<groupId>org.opencord.ce</groupId>
<artifactId>local</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>local-channel</artifactId>
<packaging>bundle</packaging>
+ <version>1.0.0-SNAPSHOT</version>
<description>Http communication channel between hierarchic ONOS controllers</description>
<properties>
<onos.app.name>org.opencord.ce.local.channel.http</onos.app.name>
<web.context>/ecord</web.context>
- <onos.app.title>ECORD-CE App</onos.app.title>
+ <onos.app.title>E-CORD CE App</onos.app.title>
<onos.app.url>http://opencord.org</onos.app.url>
- <project.version>1.0.0</project.version>
</properties>
<dependencies>
diff --git a/local/pom.xml b/local/pom.xml
index c91f1b8..146a1e7 100644
--- a/local/pom.xml
+++ b/local/pom.xml
@@ -22,19 +22,19 @@
<parent>
<groupId>org.opencord</groupId>
<artifactId>ce</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.opencord.ce</groupId>
<artifactId>local</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <description>Local components of the Carrier Ethernet Metro application</description>
+ <description>Local components of the CORD Carrier Ethernet service</description>
<properties>
- <onos.version>1.10.3</onos.version>
- <onos.app.title>ECORD Carrier Ethernet local site component</onos.app.title>
+ <onos.version>1.10.6</onos.version>
+ <onos.app.title>E-CORD Carrier Ethernet local site component</onos.app.title>
<onos.app.url>http://opencord.org</onos.app.url>
</properties>
diff --git a/pom.xml b/pom.xml
index 043f81a..acb11cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,16 +22,16 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
- <version>1.10.3</version>
+ <version>1.10.6</version>
<relativePath></relativePath>
</parent>
<groupId>org.opencord</groupId>
<artifactId>ce</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <description>Virtual ethernet edge service for CORD</description>
+ <description>Carrier Ethernet service for CORD</description>
<properties>
<onos.app.category>Traffic Steering</onos.app.category>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.opencord</groupId>
<artifactId>cord-config</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</dependency>
</dependencies>