Starting snapshot 1.15.0-SNAPSHOT
diff --git a/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java b/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java
index 28047ad..faec87b 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java
@@ -40,7 +40,7 @@
private final Logger log = LoggerFactory.getLogger(getClass());
private static final File VERSION_FILE = new File("../VERSION");
- private static Version version = Version.version("1.15.0-rc1");
+ private static Version version = Version.version("1.15.0-SNAPSHOT");
@Activate
protected void activate() {
diff --git a/docs/external.xml b/docs/external.xml
index 20f98a1..d7dd4aa 100644
--- a/docs/external.xml
+++ b/docs/external.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.15.0-rc1</version>
+ <version>1.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -53,7 +53,7 @@
</sourceFileExcludes>
<excludePackageNames>@external-excludes</excludePackageNames>
<docfilessubdirs>true</docfilessubdirs>
- <doctitle>ONOS Java API (1.15.0-rc1)</doctitle>
+ <doctitle>ONOS Java API (1.15.0-SNAPSHOT)</doctitle>
<groups>
<group>
<title>Network Model & Services</title>
diff --git a/docs/internal.xml b/docs/internal.xml
index 311c966..a9e7686 100644
--- a/docs/internal.xml
+++ b/docs/internal.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.15.0-rc1</version>
+ <version>1.15.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -49,7 +49,7 @@
<configuration>
<show>package</show>
<docfilessubdirs>true</docfilessubdirs>
- <doctitle>ONOS Java API (1.15.0-rc1)</doctitle>
+ <doctitle>ONOS Java API (1.15.0-SNAPSHOT)</doctitle>
<excludePackageNames>@internal-excludes</excludePackageNames>
<sourceFileExcludes>
<sourceFileExclude>**/generated-sources/**</sourceFileExclude>
diff --git a/lib/pom.xml b/lib/pom.xml
index 1671d07..506fefd 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
<packaging>pom</packaging>
- <version>1.15.0-rc1</version>
+ <version>1.15.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
<description>Open Network Operating System shared dependencies</description>
@@ -40,7 +40,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos-build-conf.version>1.15.0-rc1</onos-build-conf.version>
+ <onos-build-conf.version>1.15.0-SNAPSHOT</onos-build-conf.version>
<netty4.version>4.1.8.Final</netty4.version>
<openflowj.version>3.2.1.onos</openflowj.version>
<onos-maven-plugin.version>1.12</onos-maven-plugin.version>
diff --git a/onos.defs b/onos.defs
index fb8bba4..502b4ad 100644
--- a/onos.defs
+++ b/onos.defs
@@ -1,6 +1,6 @@
ONOS_ORIGIN = 'ONOS Community'
ONOS_GROUP_ID = 'org.onosproject'
-ONOS_VERSION = '1.15.0-rc1'
+ONOS_VERSION = '1.15.0-SNAPSHOT'
DEFAULT_APP_CATEGORY = 'Utility'
ONOS_ARTIFACT_BASE = 'onos-'
APP_PREFIX = ONOS_GROUP_ID + '.'
diff --git a/tools/build/bazel/variables.bzl b/tools/build/bazel/variables.bzl
index 189ec20..1aba667 100644
--- a/tools/build/bazel/variables.bzl
+++ b/tools/build/bazel/variables.bzl
@@ -1,6 +1,6 @@
ONOS_ORIGIN = "ONOS Community"
ONOS_GROUP_ID = "org.onosproject"
-ONOS_VERSION = "1.15.0-rc1"
+ONOS_VERSION = "1.15.0-SNAPSHOT"
DEFAULT_APP_CATEGORY = "Utility"
ONOS_ARTIFACT_BASE = "onos-"
APP_PREFIX = ONOS_GROUP_ID + "."
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 86a7d13..09e6979 100644
--- a/tools/build/envDefaults
+++ b/tools/build/envDefaults
@@ -18,8 +18,8 @@
export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)}
# ONOS Version and onos.tar.gz staging environment
-export ONOS_POM_VERSION="1.15.0-rc1"
-export ONOS_VERSION=${ONOS_VERSION:-1.15.0-rc1.$BUILD_NUMBER}
+export ONOS_POM_VERSION="1.15.0-SNAPSHOT"
+export ONOS_VERSION=${ONOS_VERSION:-1.15.0.$BUILD_NUMBER}
# ONOS production bits (onos.tar.gz, onos.zip, onos.deb, onos.rpm) staging environment
export ONOS_BITS=onos-${ONOS_VERSION%~*}
diff --git a/tools/build/onos-prepare-sonar b/tools/build/onos-prepare-sonar
index a6b2cc7..75946ab 100755
--- a/tools/build/onos-prepare-sonar
+++ b/tools/build/onos-prepare-sonar
@@ -12,7 +12,7 @@
from subprocess import call, check_call, check_output
# FIXME pull the version from the Buck version file
-ONOS_VERSION='1.15.0-rc1'
+ONOS_VERSION='1.15.0-SNAPSHOT'
# SonarQube property file name and template
FILE_NAME = 'sonar-project.properties'
diff --git a/tools/package/archetypes/api/pom.xml b/tools/package/archetypes/api/pom.xml
index b0ecf2a..b9add47 100644
--- a/tools/package/archetypes/api/pom.xml
+++ b/tools/package/archetypes/api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
- <version>1.15.0-rc1</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>onos-api-archetype</artifactId>
diff --git a/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
index 660b718..57d8792 100644
--- a/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.15.0-rc1</onos.version>
+ <onos.version>1.15.0-SNAPSHOT</onos.version>
</properties>
<dependencies>
diff --git a/tools/package/archetypes/bundle/pom.xml b/tools/package/archetypes/bundle/pom.xml
index bbc6470..d2bea28 100644
--- a/tools/package/archetypes/bundle/pom.xml
+++ b/tools/package/archetypes/bundle/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
- <version>1.15.0-rc1</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>onos-bundle-archetype</artifactId>
diff --git a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
index de846fe..cc87c54 100644
--- a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.15.0-rc1</onos.version>
+ <onos.version>1.15.0-SNAPSHOT</onos.version>
<!-- Uncomment to generate ONOS app from this module.
<onos.app.name>org.foo.app</onos.app.name>
<onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/cli/pom.xml b/tools/package/archetypes/cli/pom.xml
index 76d420c..4913278 100644
--- a/tools/package/archetypes/cli/pom.xml
+++ b/tools/package/archetypes/cli/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
- <version>1.15.0-rc1</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>onos-cli-archetype</artifactId>
diff --git a/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
index 441e05d..f05512d 100644
--- a/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.15.0-rc1</onos.version>
+ <onos.version>1.15.0-SNAPSHOT</onos.version>
</properties>
<dependencies>
diff --git a/tools/package/archetypes/pom.xml b/tools/package/archetypes/pom.xml
index 8e8c943..ad48695 100644
--- a/tools/package/archetypes/pom.xml
+++ b/tools/package/archetypes/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
- <version>1.15.0-rc1</version>
+ <version>1.15.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>ONOS archetypes project</description>
diff --git a/tools/package/archetypes/rest/pom.xml b/tools/package/archetypes/rest/pom.xml
index 168b041..1351225 100644
--- a/tools/package/archetypes/rest/pom.xml
+++ b/tools/package/archetypes/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
- <version>1.15.0-rc1</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>onos-rest-archetype</artifactId>
diff --git a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
index a619864..e234bf6 100644
--- a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.15.0-rc1</onos.version>
+ <onos.version>1.15.0-SNAPSHOT</onos.version>
<web.context>/onos/${artifactId}</web.context>
<api.version>1.0.0</api.version>
diff --git a/tools/package/archetypes/ui/pom.xml b/tools/package/archetypes/ui/pom.xml
index 8d4c247..505ba16 100644
--- a/tools/package/archetypes/ui/pom.xml
+++ b/tools/package/archetypes/ui/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
- <version>1.15.0-rc1</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>onos-ui-archetype</artifactId>
diff --git a/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
index 8ff29e2..d85c1a9 100644
--- a/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.15.0-rc1</onos.version>
+ <onos.version>1.15.0-SNAPSHOT</onos.version>
<!-- Uncomment to generate ONOS app from this module.
<onos.app.name>org.foo.app</onos.app.name>
<onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/uitab/pom.xml b/tools/package/archetypes/uitab/pom.xml
index ac1e88f..b3eccbc 100644
--- a/tools/package/archetypes/uitab/pom.xml
+++ b/tools/package/archetypes/uitab/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
- <version>1.15.0-rc1</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>onos-uitab-archetype</artifactId>
diff --git a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
index 183abba..0b16bfe 100644
--- a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
@@ -33,7 +33,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.15.0-rc1</onos.version>
+ <onos.version>1.15.0-SNAPSHOT</onos.version>
<!-- Uncomment to generate ONOS app from this module.
<onos.app.name>org.foo.app</onos.app.name>
<onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/uitopo/pom.xml b/tools/package/archetypes/uitopo/pom.xml
index e3c41c5..df8613e 100644
--- a/tools/package/archetypes/uitopo/pom.xml
+++ b/tools/package/archetypes/uitopo/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
- <version>1.15.0-rc1</version>
+ <version>1.15.0-SNAPSHOT</version>
</parent>
<artifactId>onos-uitopo-archetype</artifactId>
diff --git a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
index ea2ef87..6b966ed 100644
--- a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
@@ -33,7 +33,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.15.0-rc1</onos.version>
+ <onos.version>1.15.0-SNAPSHOT</onos.version>
<!-- Uncomment to generate ONOS app from this module.
<onos.app.name>org.foo.app</onos.app.name>
<onos.app.title>Foo App</onos.app.title>
diff --git a/tools/test/bin/onos-archetypes-test b/tools/test/bin/onos-archetypes-test
index ffa1f1b..1626180 100755
--- a/tools/test/bin/onos-archetypes-test
+++ b/tools/test/bin/onos-archetypes-test
@@ -19,7 +19,7 @@
set -e
export AROOT=${ONOS_STAGE_ROOT:-/tmp}/foo
-export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.15.0-rc1"
+export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.15.0-SNAPSHOT"
mkdir -p $AROOT
for an in api bundle cli rest ui uitab uitopo; do