Bumping samples to 1.6.0-SNAPSHOT.
Change-Id: I5ff577f8e6c10e4ccd976428ffde7a43c7662e2f
diff --git a/calendar/pom.xml b/calendar/pom.xml
index 4d89833..6034afe 100644
--- a/calendar/pom.xml
+++ b/calendar/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/database-perf/pom.xml b/database-perf/pom.xml
index 04d1ec4..cbb2a6d 100644
--- a/database-perf/pom.xml
+++ b/database-perf/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/ecord/co/pom.xml b/ecord/co/pom.xml
index 0d251ac..b6d8687 100644
--- a/ecord/co/pom.xml
+++ b/ecord/co/pom.xml
@@ -19,19 +19,18 @@
<parent>
<artifactId>onos-app-samples</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-ecord-co</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>Enterprise CORD for Central Office</description>
<properties>
- <onos.version>1.5.0-SNAPSHOT</onos.version>
<onos.app.name>org.onosproject.ecord.co</onos.app.name>
<onos.app.origin>ON.Lab</onos.app.origin>
<onos.app.title>Enterprise CORD App</onos.app.title>
diff --git a/flowtest/pom.xml b/flowtest/pom.xml
index 704aec7..a3ae502 100644
--- a/flowtest/pom.xml
+++ b/flowtest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/ifwd/pom.xml b/ifwd/pom.xml
index 7704fe3..2b5d57b 100644
--- a/ifwd/pom.xml
+++ b/ifwd/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/ipfix/pom.xml b/ipfix/pom.xml
index 1329753..484d532 100644
--- a/ipfix/pom.xml
+++ b/ipfix/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/oneping/pom.xml b/oneping/pom.xml
index cf31990..725708a 100644
--- a/oneping/pom.xml
+++ b/oneping/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/onos-byon-gui/pom.xml b/onos-byon-gui/pom.xml
index 6b64701..01e8c59 100644
--- a/onos-byon-gui/pom.xml
+++ b/onos-byon-gui/pom.xml
@@ -28,7 +28,6 @@
<url>http://onosproject.org</url>
<properties>
- <onos.version>1.4.0-SNAPSHOT</onos.version>
<onos.app.name>org.onos.byon-gui</onos.app.name>
<onos.app.origin>ON.Lab</onos.app.origin>
<onos.app.title>BYON App</onos.app.title>
diff --git a/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTableViewMessageHandler.java b/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTableViewMessageHandler.java
index 31f17cf..d125010 100644
--- a/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTableViewMessageHandler.java
+++ b/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTableViewMessageHandler.java
@@ -76,6 +76,11 @@
}
@Override
+ protected String noRowsMessage(ObjectNode payload) {
+ return null;
+ }
+
+ @Override
protected void populateTable(TableModel tm, ObjectNode payload) {
NetworkService service = get(NetworkService.class);
for (String name: service.getNetworks()) {
diff --git a/pom.xml b/pom.xml
index 9f3e23c..09d2932 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,31 +19,15 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>onos-app-samples</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>ONOS sample applications</description>
- <!-- TODO: Drop this when releasing artifacts and ensure that the project version is not snapshot. -->
- <repositories>
- <repository>
- <id>snapshots</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
- </repository>
- </repositories>
-
- <!--- FIXME Needed for onos-maven-plugin. Remove before official release -->
- <pluginRepositories>
- <pluginRepository>
- <id>snapshots</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </pluginRepository>
- </pluginRepositories>
-
<modules>
<module>calendar</module>
<module>database-perf</module>
@@ -58,7 +42,7 @@
</modules>
<properties>
- <web.context>default</web.context>
+ <onos.version>1.6.0-SNAPSHOT</onos.version>
</properties>
<dependencies>
diff --git a/sdx-l3/pom.xml b/sdx-l3/pom.xml
index d6246ad..8a70cbb 100644
--- a/sdx-l3/pom.xml
+++ b/sdx-l3/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/tvue/pom.xml b/tvue/pom.xml
index aef7182..e0862f8 100644
--- a/tvue/pom.xml
+++ b/tvue/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/uiref/pom.xml b/uiref/pom.xml
index 847e105..0c829c0 100644
--- a/uiref/pom.xml
+++ b/uiref/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-app-samples</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>