Tagging 2.4.0-rc1
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 1a997a2..b35d293 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.4.0-SNAPSHOT");
+ private static Version version = Version.version("2.4.0-rc1");
@Activate
protected void activate() {
diff --git a/tools/build/bazel/variables.bzl b/tools/build/bazel/variables.bzl
index e5b4ee6..d7e1e19 100644
--- a/tools/build/bazel/variables.bzl
+++ b/tools/build/bazel/variables.bzl
@@ -1,4 +1,4 @@
-ONOS_VERSION = "2.4.0-SNAPSHOT"
+ONOS_VERSION = "2.4.0-rc1"
ONOS_ARTIFACT_BASE = "onos-"
ONOS_GROUP_ID = "org.onosproject"
ONOS_ORIGIN = "ONOS Community"
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index e1345af..7ae8197 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.4.0-SNAPSHOT"
-export ONOS_VERSION=${ONOS_VERSION:-2.4.0.$BUILD_NUMBER}
+export ONOS_POM_VERSION="2.4.0-rc1"
+export ONOS_VERSION=${ONOS_VERSION:-2.4.0-rc1.$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 f6c951c..5d9f8ee 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.4.0-SNAPSHOT</version>
+ <version>2.4.0-rc1</version>
</parent>
<artifactId>onos-api-archetype</artifactId>
diff --git a/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml
index 760b485..2704bd6 100644
--- a/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -29,7 +29,7 @@
</fileSets>
<requiredProperties>
<requiredProperty key="onosVersion">
- <defaultValue>2.4.0-SNAPSHOT</defaultValue>
+ <defaultValue>2.4.0-rc1</defaultValue>
</requiredProperty>
</requiredProperties>
</archetype-descriptor>
diff --git a/tools/package/archetypes/bundle/pom.xml b/tools/package/archetypes/bundle/pom.xml
index 79ee076..e375799 100644
--- a/tools/package/archetypes/bundle/pom.xml
+++ b/tools/package/archetypes/bundle/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0-rc1</version>
</parent>
<artifactId>onos-bundle-archetype</artifactId>
diff --git a/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml
index 0e4516b..3d6a4df 100644
--- a/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -35,7 +35,7 @@
</fileSets>
<requiredProperties>
<requiredProperty key="onosVersion">
- <defaultValue>2.4.0-SNAPSHOT</defaultValue>
+ <defaultValue>2.4.0-rc1</defaultValue>
</requiredProperty>
</requiredProperties>
</archetype-descriptor>
diff --git a/tools/package/archetypes/cli/pom.xml b/tools/package/archetypes/cli/pom.xml
index d85c6d2..30a5fc0 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.4.0-SNAPSHOT</version>
+ <version>2.4.0-rc1</version>
</parent>
<artifactId>onos-cli-archetype</artifactId>
diff --git a/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml
index a17aeeb..4a68237 100644
--- a/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -35,7 +35,7 @@
</fileSets>
<requiredProperties>
<requiredProperty key="onosVersion">
- <defaultValue>2.4.0-SNAPSHOT</defaultValue>
+ <defaultValue>2.4.0-rc1</defaultValue>
</requiredProperty>
</requiredProperties>
</archetype-descriptor>
diff --git a/tools/package/archetypes/pom.xml b/tools/package/archetypes/pom.xml
index d8c589c..0d09ffa 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.4.0-SNAPSHOT</version>
+ <version>2.4.0-rc1</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 f33f100..457f2d8 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.4.0-SNAPSHOT</version>
+ <version>2.4.0-rc1</version>
</parent>
<artifactId>onos-rest-archetype</artifactId>
diff --git a/tools/package/archetypes/rest/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/rest/src/main/resources/META-INF/maven/archetype-metadata.xml
index c5dfb21..d13918d 100644
--- a/tools/package/archetypes/rest/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/tools/package/archetypes/rest/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -35,7 +35,7 @@
</fileSets>
<requiredProperties>
<requiredProperty key="onosVersion">
- <defaultValue>2.4.0-SNAPSHOT</defaultValue>
+ <defaultValue>2.4.0-rc1</defaultValue>
</requiredProperty>
</requiredProperties>
</archetype-descriptor>
diff --git a/tools/package/archetypes/ui/pom.xml b/tools/package/archetypes/ui/pom.xml
index e51a103..6c7d63f 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.4.0-SNAPSHOT</version>
+ <version>2.4.0-rc1</version>
</parent>
<artifactId>onos-ui-archetype</artifactId>
diff --git a/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml
index eff30d41..64b6b57 100644
--- a/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -37,7 +37,7 @@
</fileSets>
<requiredProperties>
<requiredProperty key="onosVersion">
- <defaultValue>2.4.0-SNAPSHOT</defaultValue>
+ <defaultValue>2.4.0-rc1</defaultValue>
</requiredProperty>
</requiredProperties>
</archetype-descriptor>
diff --git a/tools/package/archetypes/ui2/pom.xml b/tools/package/archetypes/ui2/pom.xml
index 169894a..53a1d14 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.4.0-SNAPSHOT</version>
+ <version>2.4.0-rc1</version>
</parent>
<artifactId>onos-ui2-archetype</artifactId>
diff --git a/tools/package/archetypes/ui2/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/ui2/src/main/resources/META-INF/maven/archetype-metadata.xml
index b5b7190..584983d 100644
--- a/tools/package/archetypes/ui2/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/tools/package/archetypes/ui2/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -75,7 +75,7 @@
</fileSets>
<requiredProperties>
<requiredProperty key="onosVersion">
- <defaultValue>2.4.0-SNAPSHOT</defaultValue>
+ <defaultValue>2.4.0-rc1</defaultValue>
</requiredProperty>
</requiredProperties>
</archetype-descriptor>
diff --git a/tools/package/archetypes/uitab/pom.xml b/tools/package/archetypes/uitab/pom.xml
index 6423bde..743ed26 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.4.0-SNAPSHOT</version>
+ <version>2.4.0-rc1</version>
</parent>
<artifactId>onos-uitab-archetype</artifactId>
diff --git a/tools/package/archetypes/uitab/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/uitab/src/main/resources/META-INF/maven/archetype-metadata.xml
index a7a2d5e..e992ca6 100644
--- a/tools/package/archetypes/uitab/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/tools/package/archetypes/uitab/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -38,7 +38,7 @@
</fileSets>
<requiredProperties>
<requiredProperty key="onosVersion">
- <defaultValue>2.4.0-SNAPSHOT</defaultValue>
+ <defaultValue>2.4.0-rc1</defaultValue>
</requiredProperty>
</requiredProperties>
</archetype-descriptor>
diff --git a/tools/package/archetypes/uitopo/pom.xml b/tools/package/archetypes/uitopo/pom.xml
index 65856db..af09746 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.4.0-SNAPSHOT</version>
+ <version>2.4.0-rc1</version>
</parent>
<artifactId>onos-uitopo-archetype</artifactId>
diff --git a/tools/package/archetypes/uitopo/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/uitopo/src/main/resources/META-INF/maven/archetype-metadata.xml
index 5e0eab2..be8a422 100644
--- a/tools/package/archetypes/uitopo/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/tools/package/archetypes/uitopo/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -38,7 +38,7 @@
</fileSets>
<requiredProperties>
<requiredProperty key="onosVersion">
- <defaultValue>2.4.0-SNAPSHOT</defaultValue>
+ <defaultValue>2.4.0-rc1</defaultValue>
</requiredProperty>
</requiredProperties>
</archetype-descriptor>
diff --git a/tools/test/bin/onos-archetypes-test b/tools/test/bin/onos-archetypes-test
index 33e3d4b..34cb6b5 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.4.0-SNAPSHOT"
+export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.4.0-rc1"
rm -fr $AROOT 2>/dev/null
mkdir -p $AROOT