Starting snapshot 1.8.0-SNAPSHOT
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 16d7e41..8aa45bd 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.8.0-rc3"
-export ONOS_VERSION=${ONOS_VERSION:-1.8.0-rc3.$BUILD_NUMBER}
+export ONOS_POM_VERSION="1.8.0-SNAPSHOT"
+export ONOS_VERSION=${ONOS_VERSION:-1.8.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 507a304..bb2592b 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.8.0-rc3'
+ONOS_VERSION='1.8.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 617a919..017fb1d 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.8.0-rc3</version>
+ <version>1.8.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 68f82a1..54449ae 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.8.0-rc3</onos.version>
+ <onos.version>1.8.0-SNAPSHOT</onos.version>
</properties>
<dependencies>
diff --git a/tools/package/archetypes/bundle/pom.xml b/tools/package/archetypes/bundle/pom.xml
index 0605df3..784a70f 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.8.0-rc3</version>
+ <version>1.8.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 8ea724d..7ede43f 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.8.0-rc3</onos.version>
+ <onos.version>1.8.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 c4ac8b6..9e7a330 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.8.0-rc3</version>
+ <version>1.8.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 921adc0..5bbe6a1 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.8.0-rc3</onos.version>
+ <onos.version>1.8.0-SNAPSHOT</onos.version>
</properties>
<dependencies>
diff --git a/tools/package/archetypes/pom.xml b/tools/package/archetypes/pom.xml
index 5c1dd41..336edba 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.8.0-rc3</version>
+ <version>1.8.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 1dad5e3..63751be 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.8.0-rc3</version>
+ <version>1.8.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 8642472..8b00f49 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.8.0-rc3</onos.version>
+ <onos.version>1.8.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 c62596f..6b1456f 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.8.0-rc3</version>
+ <version>1.8.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 91b7a72..33367c0 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.8.0-rc3</onos.version>
+ <onos.version>1.8.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 0e725ad..264a8a2 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.8.0-rc3</version>
+ <version>1.8.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 3f87be0..d10b96a 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.8.0-rc3</onos.version>
+ <onos.version>1.8.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 44a1039..64dcef1 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.8.0-rc3</version>
+ <version>1.8.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 7fd5409..6926813 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.8.0-rc3</onos.version>
+ <onos.version>1.8.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/branding/pom.xml b/tools/package/branding/pom.xml
index 1ad4859..5104d4f 100644
--- a/tools/package/branding/pom.xml
+++ b/tools/package/branding/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.8.0-rc3</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/tools/test/bin/onos-archetypes-test b/tools/test/bin/onos-archetypes-test
index d7cdc72..918048d 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.8.0-rc3"
+export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.8.0-SNAPSHOT"
mkdir -p $AROOT
for an in api bundle cli rest ui uitab uitopo; do