Starting snapshot 2.2.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 ee4d2cc..d0c37ff 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
@@ -38,7 +38,7 @@
private final Logger log = LoggerFactory.getLogger(getClass());
private static final File VERSION_FILE = new File("../VERSION");
- private static Version version = Version.version("2.2.0-b1");
+ private static Version version = Version.version("2.2.0-SNAPSHOT");
@Activate
protected void activate() {
diff --git a/tools/build/bazel/variables.bzl b/tools/build/bazel/variables.bzl
index aaf4ec0d..acea2a9 100644
--- a/tools/build/bazel/variables.bzl
+++ b/tools/build/bazel/variables.bzl
@@ -1,4 +1,4 @@
-ONOS_VERSION = "2.2.0-b1"
+ONOS_VERSION = "2.2.0-SNAPSHOT"
ONOS_ARTIFACT_BASE = "onos-"
ONOS_GROUP_ID = "org.onosproject"
ONOS_ORIGIN = "ONOS Community"
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 64785c0..54779ae 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="2.2.0-b1"
-export ONOS_VERSION=${ONOS_VERSION:-2.2.0-b1.$BUILD_NUMBER}
+export ONOS_POM_VERSION="2.2.0-SNAPSHOT"
+export ONOS_VERSION=${ONOS_VERSION:-2.2.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/package/archetypes/api/pom.xml b/tools/package/archetypes/api/pom.xml
index 4bd4f02..e24d4fc 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>2.2.0-b1</version>
+ <version>2.2.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 bbbc2f1..6366c9c 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>2.2.0-b1</onos.version>
+ <onos.version>2.2.0-SNAPSHOT</onos.version>
</properties>
<dependencies>
diff --git a/tools/package/archetypes/bundle/pom.xml b/tools/package/archetypes/bundle/pom.xml
index 560ca76..47e8654 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>2.2.0-b1</version>
+ <version>2.2.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 015a39b..61e7f4b 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>2.2.0-b1</onos.version>
+ <onos.version>2.2.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 6e6c8e9..4b81059 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>2.2.0-b1</version>
+ <version>2.2.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 8d4b7c6..ed53d58 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>2.2.0-b1</onos.version>
+ <onos.version>2.2.0-SNAPSHOT</onos.version>
</properties>
<dependencies>
diff --git a/tools/package/archetypes/pom.xml b/tools/package/archetypes/pom.xml
index 29e2093..c7f7943 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>2.2.0-b1</version>
+ <version>2.2.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 237f773..d88170b 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>2.2.0-b1</version>
+ <version>2.2.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 9abcce7..f18124b 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>2.2.0-b1</onos.version>
+ <onos.version>2.2.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 3f07012..47836df 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>2.2.0-b1</version>
+ <version>2.2.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 e957d90..2bf5682 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>2.2.0-b1</onos.version>
+ <onos.version>2.2.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/ui2/pom.xml b/tools/package/archetypes/ui2/pom.xml
index 63d5b05..75f11a0 100644
--- a/tools/package/archetypes/ui2/pom.xml
+++ b/tools/package/archetypes/ui2/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
- <version>2.2.0-b1</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>onos-ui2-archetype</artifactId>
diff --git a/tools/package/archetypes/ui2/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/ui2/src/main/resources/archetype-resources/pom.xml
index 2ab9fb64..c1465c7 100644
--- a/tools/package/archetypes/ui2/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/ui2/src/main/resources/archetype-resources/pom.xml
@@ -39,7 +39,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>2.2.0-b1</onos.version>
+ <onos.version>2.2.0-SNAPSHOT</onos.version>
</properties>
<modules>
diff --git a/tools/package/archetypes/uitab/pom.xml b/tools/package/archetypes/uitab/pom.xml
index fdc25f5..942a55c 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>2.2.0-b1</version>
+ <version>2.2.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 8319352..c0a9f2b 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>2.2.0-b1</onos.version>
+ <onos.version>2.2.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 45861c3..7984690 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>2.2.0-b1</version>
+ <version>2.2.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 3be663a..b76bfc7 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>2.2.0-b1</onos.version>
+ <onos.version>2.2.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 af837b4..79869ce 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=2.2.0-b1"
+export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.2.0-SNAPSHOT"
mkdir -p $AROOT
for an in api bundle cli rest ui ui2 uitab uitopo; do