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 6725ce605c..9dc949d9ad 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 @@ public class VersionManager implements VersionService { private final Logger log = LoggerFactory.getLogger(getClass()); private static final File VERSION_FILE = new File("../VERSION"); - private static Version version = Version.version("2.6.-rc4"); + private static Version version = Version.version("2.6.0-SNAPSHOT"); @Activate protected void activate() { diff --git a/tools/build/bazel/variables.bzl b/tools/build/bazel/variables.bzl index 6a3362e744..f17947bf4b 100644 --- a/tools/build/bazel/variables.bzl +++ b/tools/build/bazel/variables.bzl @@ -1,4 +1,4 @@ -ONOS_VERSION = "2.6.-rc4" +ONOS_VERSION = "2.6.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 134f2b0cf2..e11bffa7a0 100644 --- a/tools/build/envDefaults +++ b/tools/build/envDefaults @@ -18,8 +18,8 @@ export PATH="$ONOS_ROOT/tools/build:$PATH" export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)} # ONOS Version and onos.tar.gz staging environment -export ONOS_POM_VERSION="2.6.-rc4" -export ONOS_VERSION=${ONOS_VERSION:-2.6.-rc4.$BUILD_NUMBER} +export ONOS_POM_VERSION="2.6.0-SNAPSHOT" +export ONOS_VERSION=${ONOS_VERSION:-2.6.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 d5626a9c22..096e3d0081 100644 --- a/tools/package/archetypes/api/pom.xml +++ b/tools/package/archetypes/api/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.6.-rc4 + 2.6.0-SNAPSHOT onos-api-archetype 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 a14bd6611b..320fd1decf 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 @@ - 2.6.-rc4 + 2.6.0-SNAPSHOT diff --git a/tools/package/archetypes/bundle/pom.xml b/tools/package/archetypes/bundle/pom.xml index 95ec550bb3..f9b086c0fb 100644 --- a/tools/package/archetypes/bundle/pom.xml +++ b/tools/package/archetypes/bundle/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-archetypes - 2.6.-rc4 + 2.6.0-SNAPSHOT onos-bundle-archetype 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 7828ddb6c6..b19c8bb03b 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 @@ - 2.6.-rc4 + 2.6.0-SNAPSHOT diff --git a/tools/package/archetypes/cli/pom.xml b/tools/package/archetypes/cli/pom.xml index bee3565202..1e1e1f3e28 100644 --- a/tools/package/archetypes/cli/pom.xml +++ b/tools/package/archetypes/cli/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.6.-rc4 + 2.6.0-SNAPSHOT onos-cli-archetype 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 a15c4c9720..d3c59049ae 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 @@ - 2.6.-rc4 + 2.6.0-SNAPSHOT diff --git a/tools/package/archetypes/pom.xml b/tools/package/archetypes/pom.xml index c3830aabbb..25cbb0bebe 100644 --- a/tools/package/archetypes/pom.xml +++ b/tools/package/archetypes/pom.xml @@ -28,7 +28,7 @@ org.onosproject onos-archetypes - 2.6.-rc4 + 2.6.0-SNAPSHOT pom ONOS archetypes project diff --git a/tools/package/archetypes/rest/pom.xml b/tools/package/archetypes/rest/pom.xml index 02def97d37..313ec16d20 100644 --- a/tools/package/archetypes/rest/pom.xml +++ b/tools/package/archetypes/rest/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.6.-rc4 + 2.6.0-SNAPSHOT onos-rest-archetype 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 fef1144758..7cc5177f28 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 @@ - 2.6.-rc4 + 2.6.0-SNAPSHOT diff --git a/tools/package/archetypes/ui/pom.xml b/tools/package/archetypes/ui/pom.xml index 8778271c0e..99799ba2ac 100644 --- a/tools/package/archetypes/ui/pom.xml +++ b/tools/package/archetypes/ui/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.6.-rc4 + 2.6.0-SNAPSHOT onos-ui-archetype 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 e06cbf3806..a0ad728cfe 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 @@ - 2.6.-rc4 + 2.6.0-SNAPSHOT diff --git a/tools/package/archetypes/ui2/pom.xml b/tools/package/archetypes/ui2/pom.xml index 6f5be7d352..3d96dd14ec 100644 --- a/tools/package/archetypes/ui2/pom.xml +++ b/tools/package/archetypes/ui2/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.6.-rc4 + 2.6.0-SNAPSHOT onos-ui2-archetype 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 db44321227..5a1642e0a9 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 @@ - 2.6.-rc4 + 2.6.0-SNAPSHOT diff --git a/tools/package/archetypes/uitab/pom.xml b/tools/package/archetypes/uitab/pom.xml index dda96d0978..2278e93061 100644 --- a/tools/package/archetypes/uitab/pom.xml +++ b/tools/package/archetypes/uitab/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.6.-rc4 + 2.6.0-SNAPSHOT onos-uitab-archetype 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 5879454a35..8a9881d232 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 @@ - 2.6.-rc4 + 2.6.0-SNAPSHOT diff --git a/tools/package/archetypes/uitopo/pom.xml b/tools/package/archetypes/uitopo/pom.xml index b2f570fb47..b09ee30eb8 100644 --- a/tools/package/archetypes/uitopo/pom.xml +++ b/tools/package/archetypes/uitopo/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.6.-rc4 + 2.6.0-SNAPSHOT onos-uitopo-archetype 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 8c5dd66531..b3a1e46077 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 @@ - 2.6.-rc4 + 2.6.0-SNAPSHOT diff --git a/tools/test/bin/onos-archetypes-test b/tools/test/bin/onos-archetypes-test index 08a42b03cd..7e717ecdf0 100755 --- a/tools/test/bin/onos-archetypes-test +++ b/tools/test/bin/onos-archetypes-test @@ -19,7 +19,7 @@ _EOF_ set -e export AROOT=${ONOS_STAGE_ROOT:-/tmp}/foo -export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.6.-rc4" +export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.6.0-SNAPSHOT" rm -fr $AROOT 2>/dev/null mkdir -p $AROOT