Starting snapshot 1.2.0-SNAPSHOT
Also, fixed onos-upload-bits script to upload rc's to nightly/
Change-Id: I9bb8fe685492e23c740796879f0b66c307e26e56
diff --git a/apps/bgprouter/pom.xml b/apps/bgprouter/pom.xml
index c9144c1..c4597b5 100644
--- a/apps/bgprouter/pom.xml
+++ b/apps/bgprouter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>onos-apps</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/apps/config/pom.xml b/apps/config/pom.xml
index 0d4ea6a..a512404 100644
--- a/apps/config/pom.xml
+++ b/apps/config/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/cordfabric/pom.xml b/apps/cordfabric/pom.xml
index 617d290..8087f34 100644
--- a/apps/cordfabric/pom.xml
+++ b/apps/cordfabric/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>onos-apps</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/apps/fwd/pom.xml b/apps/fwd/pom.xml
index 8e4ae6b..5db7375 100644
--- a/apps/fwd/pom.xml
+++ b/apps/fwd/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/metrics/pom.xml b/apps/metrics/pom.xml
index b352962..3958bdb 100644
--- a/apps/metrics/pom.xml
+++ b/apps/metrics/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/mobility/pom.xml b/apps/mobility/pom.xml
index fbc5cb8..72ee098 100644
--- a/apps/mobility/pom.xml
+++ b/apps/mobility/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/oecfg/pom.xml b/apps/oecfg/pom.xml
index 623f783..2c8c323 100644
--- a/apps/oecfg/pom.xml
+++ b/apps/oecfg/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/optical/pom.xml b/apps/optical/pom.xml
index 3cb0b7b..d1883e4 100644
--- a/apps/optical/pom.xml
+++ b/apps/optical/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/pom.xml b/apps/pom.xml
index 2c1d52a..4b88dfa 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/proxyarp/pom.xml b/apps/proxyarp/pom.xml
index 7b4d475..22358eb 100644
--- a/apps/proxyarp/pom.xml
+++ b/apps/proxyarp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/reactive-routing/pom.xml b/apps/reactive-routing/pom.xml
index 4b514fe..7d2bced 100644
--- a/apps/reactive-routing/pom.xml
+++ b/apps/reactive-routing/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/routing-api/pom.xml b/apps/routing-api/pom.xml
index 59fe42a..671a046 100644
--- a/apps/routing-api/pom.xml
+++ b/apps/routing-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>onos-apps</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/apps/routing/pom.xml b/apps/routing/pom.xml
index 975f0bb..8cee5af 100644
--- a/apps/routing/pom.xml
+++ b/apps/routing/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>onos-apps</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/apps/sdnip/pom.xml b/apps/sdnip/pom.xml
index ed998eb..bd3f323 100644
--- a/apps/sdnip/pom.xml
+++ b/apps/sdnip/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/segmentrouting/pom.xml b/apps/segmentrouting/pom.xml
index da9f285..9b1eb57 100644
--- a/apps/segmentrouting/pom.xml
+++ b/apps/segmentrouting/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>onos-apps</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/test/demo/pom.xml b/apps/test/demo/pom.xml
index 5a52a33..f3581a2 100644
--- a/apps/test/demo/pom.xml
+++ b/apps/test/demo/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps-test</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/test/distributed-primitives/pom.xml b/apps/test/distributed-primitives/pom.xml
index 9fa1991..1da9b6a 100644
--- a/apps/test/distributed-primitives/pom.xml
+++ b/apps/test/distributed-primitives/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps-test</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-dist</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/apps/test/election/pom.xml b/apps/test/election/pom.xml
index f2f31a5..bfdb9c9 100644
--- a/apps/test/election/pom.xml
+++ b/apps/test/election/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps-test</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/test/intent-perf/pom.xml b/apps/test/intent-perf/pom.xml
index 9fdfe43..2a8c56f 100644
--- a/apps/test/intent-perf/pom.xml
+++ b/apps/test/intent-perf/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps-test</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/test/messaging-perf/pom.xml b/apps/test/messaging-perf/pom.xml
index cbe7370..c68711d 100644
--- a/apps/test/messaging-perf/pom.xml
+++ b/apps/test/messaging-perf/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps-test</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/test/pom.xml b/apps/test/pom.xml
index c6c728b..f3b717e 100644
--- a/apps/test/pom.xml
+++ b/apps/test/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/virtualbng/pom.xml b/apps/virtualbng/pom.xml
index ccd92ed..25d319a 100644
--- a/apps/virtualbng/pom.xml
+++ b/apps/virtualbng/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/apps/xos-integration/pom.xml b/apps/xos-integration/pom.xml
index 14698bc..8f5aa86 100644
--- a/apps/xos-integration/pom.xml
+++ b/apps/xos-integration/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/cli/pom.xml b/cli/pom.xml
index ff18eb8..ddeacc5 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/api/pom.xml b/core/api/pom.xml
index d5379ac..24499fb 100644
--- a/core/api/pom.xml
+++ b/core/api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-core</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/common/pom.xml b/core/common/pom.xml
index c7b7c49..31c13d8 100644
--- a/core/common/pom.xml
+++ b/core/common/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-core</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/net/pom.xml b/core/net/pom.xml
index 95876b7..d8aecf9 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-core</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
index 4d7095f..5c78bb4 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
@@ -55,7 +55,7 @@
private final Logger log = LoggerFactory.getLogger(getClass());
private static final File VERSION_FILE = new File("../VERSION");
- private static Version version = Version.version("1.2.0-rc1");
+ private static Version version = Version.version("1.2.0-SNAPSHOT");
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected ApplicationIdStore applicationIdStore;
diff --git a/core/pom.xml b/core/pom.xml
index 632f69b..56dc848 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/security/impl/pom.xml b/core/security/impl/pom.xml
index eaed525..dd6e8db 100644
--- a/core/security/impl/pom.xml
+++ b/core/security/impl/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>onos-security</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index eee800d..984b04b 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>onos-core</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/security/util/pom.xml b/core/security/util/pom.xml
index 6c1627b..a92beb6 100644
--- a/core/security/util/pom.xml
+++ b/core/security/util/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>onos-security</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>onos-security-util</artifactId>
diff --git a/core/store/dist/pom.xml b/core/store/dist/pom.xml
index b24a928..6585f30 100644
--- a/core/store/dist/pom.xml
+++ b/core/store/dist/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-store</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/store/pom.xml b/core/store/pom.xml
index 6e1e658..3e74707 100644
--- a/core/store/pom.xml
+++ b/core/store/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-core</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/store/serializers/pom.xml b/core/store/serializers/pom.xml
index 9c5e2e4..0f1c30d 100644
--- a/core/store/serializers/pom.xml
+++ b/core/store/serializers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-store</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/store/trivial/pom.xml b/core/store/trivial/pom.xml
index ebed6f9..7f85d8f 100644
--- a/core/store/trivial/pom.xml
+++ b/core/store/trivial/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-store</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/docs/external.xml b/docs/external.xml
index 6c8f221..53fb5db 100644
--- a/docs/external.xml
+++ b/docs/external.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -51,7 +51,7 @@
<show>package</show>
<excludePackageNames>org.onlab.thirdparty:*.impl:*.impl.*:org.onosproject.provider.*:org.onosproject.rest:org.onosproject.cli*:org.onosproject.tvue:org.onosproject.foo:org.onosproject.mobility:org.onosproject.proxyarp:org.onosproject.fwd:org.onosproject.ifwd:org.onosproject.optical:org.onosproject.config:org.onosproject.calendar:org.onosproject.sdnip*:org.onosproject.oecfg:org.onosproject.metrics:org.onosproject.store.*:org.onosproject.openflow.*:org.onosproject.common.*:org.onosproject.net.group.impl:org.onosproject.routing*:org.onosproject.bgprouter:org.onosproject.intentperf:org.onosproject.maven:org.onosproject.cordfabric*:org.onosproject.driver*:org.onosproject.segmentrouting*:org.onosproject.reactive*:org.onosproject.distributedprimitives*:org.onosproject.messagingperf*.org.onosproject.virtualbng*.org.onosproject.election*:org.onosproject.demo*:org.onlab.jdvue*:org.onosproject.xosintegration*</excludePackageNames>
<docfilessubdirs>true</docfilessubdirs>
- <doctitle>ONOS Java API (1.2.0-rc1)</doctitle>
+ <doctitle>ONOS Java API (1.2.0-SNAPSHOT)</doctitle>
<groups>
<group>
<title>Network Model & Services</title>
diff --git a/docs/pom.xml b/docs/pom.xml
index ed68eb8..dc523ed 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -50,7 +50,7 @@
<configuration>
<show>package</show>
<docfilessubdirs>true</docfilessubdirs>
- <doctitle>ONOS Java API (1.2.0-rc1)</doctitle>
+ <doctitle>ONOS Java API (1.2.0-SNAPSHOT)</doctitle>
<groups>
<group>
<title>Network Model & Services</title>
diff --git a/drivers/pom.xml b/drivers/pom.xml
index 2f13c4c..69dd548 100644
--- a/drivers/pom.xml
+++ b/drivers/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-core-serializers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/features/pom.xml b/features/pom.xml
index db30024..97b77d1 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/incubator/api/pom.xml b/incubator/api/pom.xml
index 08cd4e9..df4b52c 100644
--- a/incubator/api/pom.xml
+++ b/incubator/api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/incubator/net/pom.xml b/incubator/net/pom.xml
index cdea99c..0869aa1 100644
--- a/incubator/net/pom.xml
+++ b/incubator/net/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index e725215..ca8cd7e 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/incubator/store/pom.xml b/incubator/store/pom.xml
index 5210333..67ff427 100644
--- a/incubator/store/pom.xml
+++ b/incubator/store/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-incubator</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/openflow/api/pom.xml b/openflow/api/pom.xml
index 3791217..efdba83 100644
--- a/openflow/api/pom.xml
+++ b/openflow/api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-of</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/openflow/ctl/pom.xml b/openflow/ctl/pom.xml
index a8221225..bf89d1c 100644
--- a/openflow/ctl/pom.xml
+++ b/openflow/ctl/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-of</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/openflow/pom.xml b/openflow/pom.xml
index cbadb4b..5ebed53 100644
--- a/openflow/pom.xml
+++ b/openflow/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 32eae6f..63b4ef9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
<packaging>pom</packaging>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
<description>Open Network Operating System root project</description>
diff --git a/providers/host/pom.xml b/providers/host/pom.xml
index 07b2586..0e32cc1 100644
--- a/providers/host/pom.xml
+++ b/providers/host/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/lldp/pom.xml b/providers/lldp/pom.xml
index 4cc2056..6cf7440 100644
--- a/providers/lldp/pom.xml
+++ b/providers/lldp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/netconf/app/pom.xml b/providers/netconf/app/pom.xml
index 6a6cd18..cd307b2 100644
--- a/providers/netconf/app/pom.xml
+++ b/providers/netconf/app/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-netconf-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/netconf/device/pom.xml b/providers/netconf/device/pom.xml
index 684b4b7..ee7ef1f 100644
--- a/providers/netconf/device/pom.xml
+++ b/providers/netconf/device/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-netconf-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/netconf/pom.xml b/providers/netconf/pom.xml
index 146c8ed..511fe04 100644
--- a/providers/netconf/pom.xml
+++ b/providers/netconf/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/null/pom.xml b/providers/null/pom.xml
index 48311dc..dc2f333 100644
--- a/providers/null/pom.xml
+++ b/providers/null/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/openflow/app/pom.xml b/providers/openflow/app/pom.xml
index 0d12b7b..aa7399b 100644
--- a/providers/openflow/app/pom.xml
+++ b/providers/openflow/app/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-of-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/openflow/device/pom.xml b/providers/openflow/device/pom.xml
index 1bfdc2d..23f8f61 100644
--- a/providers/openflow/device/pom.xml
+++ b/providers/openflow/device/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-of-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/openflow/flow/pom.xml b/providers/openflow/flow/pom.xml
index f9c159f..6cd60eb 100644
--- a/providers/openflow/flow/pom.xml
+++ b/providers/openflow/flow/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-of-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/openflow/group/pom.xml b/providers/openflow/group/pom.xml
index 05c5aa2..63ab8ea 100644
--- a/providers/openflow/group/pom.xml
+++ b/providers/openflow/group/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-of-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/openflow/packet/pom.xml b/providers/openflow/packet/pom.xml
index 15657f6..38bd650 100644
--- a/providers/openflow/packet/pom.xml
+++ b/providers/openflow/packet/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-of-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/openflow/pom.xml b/providers/openflow/pom.xml
index 0848ea2..6a69b94 100644
--- a/providers/openflow/pom.xml
+++ b/providers/openflow/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/pom.xml b/providers/pom.xml
index 8e429b7..d59b2b6 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/providers/tunnel/pom.xml b/providers/tunnel/pom.xml
index b681813..f55812b 100644
--- a/providers/tunnel/pom.xml
+++ b/providers/tunnel/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-providers</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 9214f4d..24cab2f 100644
--- a/tools/build/envDefaults
+++ b/tools/build/envDefaults
@@ -18,8 +18,8 @@
export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)~$(date +'%Y/%m/%d@%H:%M')}
# ONOS Version and onos.tar.gz staging environment
-export ONOS_POM_VERSION="1.2.0-rc1"
-export ONOS_VERSION=${ONOS_VERSION:-1.2.0-rc1.$BUILD_NUMBER}
+export ONOS_POM_VERSION="1.2.0-SNAPSHOT"
+export ONOS_VERSION=${ONOS_VERSION:-1.2.0.$BUILD_NUMBER}
# ONOS production bits (onos.tar.gz & onos.zip) staging environment
export ONOS_BITS=onos-${ONOS_VERSION%~*}
diff --git a/tools/build/onos-upload-bits b/tools/build/onos-upload-bits
index 19eaada..e0d5524 100755
--- a/tools/build/onos-upload-bits
+++ b/tools/build/onos-upload-bits
@@ -8,4 +8,4 @@
#FIXME need to export s3Creds
#TODO we could verify that ONOS_VERSION is set, and only upload that version
-python onosUploadBits.py
+onosUploadBits.py
diff --git a/tools/build/onosUploadBits.py b/tools/build/onosUploadBits.py
index 284a509..b86f45d 100755
--- a/tools/build/onosUploadBits.py
+++ b/tools/build/onosUploadBits.py
@@ -30,11 +30,11 @@
version = match.group(1)
build = match.group(2)
if build:
- if 'NIGHTLY' in build:
+ if 'NIGHTLY' in build or 'rc' in build:
uploadFile(filePath, dest='nightly/')
else:
#no build; this is a release
uploadFile(filePath, dest='release/')
if __name__ == '__main__':
- findBits( '/tmp' )
\ No newline at end of file
+ findBits( '/tmp' )
diff --git a/tools/package/archetypes/api/pom.xml b/tools/package/archetypes/api/pom.xml
index 0fd08f8..9db85ee 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.2.0-rc1</version>
+ <version>1.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 3237dbf..775f596 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
@@ -26,7 +26,7 @@
<url>http://onosproject.org</url>
<properties>
- <onos.version>1.2.0-rc1</onos.version>
+ <onos.version>1.2.0-SNAPSHOT</onos.version>
</properties>
<dependencies>
diff --git a/tools/package/archetypes/bundle/pom.xml b/tools/package/archetypes/bundle/pom.xml
index 1dd02d2..e832d23 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.2.0-rc1</version>
+ <version>1.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 4bfe017..2b9a2b6 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
@@ -26,7 +26,7 @@
<url>http://onosproject.org</url>
<properties>
- <onos.version>1.2.0-rc1</onos.version>
+ <onos.version>1.2.0-SNAPSHOT</onos.version>
<!-- Uncomment to generate ONOS app from this module.
<onos.app.name>org.foo.app</onos.app.name>
<onos.app.origin>Foo, Inc.</onos.app.origin>
diff --git a/tools/package/archetypes/cli/pom.xml b/tools/package/archetypes/cli/pom.xml
index c13ed03..7152dab 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.2.0-rc1</version>
+ <version>1.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 8bedfc3..bb5262e 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
@@ -26,7 +26,7 @@
<url>http://onosproject.org</url>
<properties>
- <onos.version>1.2.0-rc1</onos.version>
+ <onos.version>1.2.0-SNAPSHOT</onos.version>
</properties>
<dependencies>
diff --git a/tools/package/archetypes/pom.xml b/tools/package/archetypes/pom.xml
index 5023ed9..fe7cf00 100644
--- a/tools/package/archetypes/pom.xml
+++ b/tools/package/archetypes/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>onos-archetypes</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>ONOS archetypes project</description>
diff --git a/tools/package/archetypes/ui/pom.xml b/tools/package/archetypes/ui/pom.xml
index ee4d846..152ee9e 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.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>onos-ui-archetype</artifactId>
diff --git a/tools/package/branding/pom.xml b/tools/package/branding/pom.xml
index a301a57..7edbcfb 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.2.0-rc1</version>
+ <version>1.2.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 fa0d4f3..af7d6dd 100755
--- a/tools/test/bin/onos-archetypes-test
+++ b/tools/test/bin/onos-archetypes-test
@@ -4,7 +4,7 @@
# -----------------------------------------------------------------------------
export AROOT=/tmp/foo
-export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -Dversion=1.2.0-rc1"
+export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -Dversion=1.2.0-SNAPSHOT"
mkdir -p $AROOT
for an in api bundle cli ui; do
diff --git a/tools/test/topos/onos.py b/tools/test/topos/onos.py
index e495725..cdad6da 100755
--- a/tools/test/topos/onos.py
+++ b/tools/test/topos/onos.py
@@ -62,7 +62,7 @@
def start( self ):
if self.inNamespace:
- instanceOpts = ( '-furl mvn:org.onosproject/onos-features/1.2.0-rc1/xml/features '
+ instanceOpts = ( '-furl mvn:org.onosproject/onos-features/1.2.0-SNAPSHOT/xml/features '
'-s 8101' )
if self.ip is not None:
instanceOpts += (' -a %s' % self.IP() )
diff --git a/utils/jnc/pom.xml b/utils/jnc/pom.xml
index a5ea6a6..e62777b 100644
--- a/utils/jnc/pom.xml
+++ b/utils/jnc/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onlab-utils</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/utils/junit/pom.xml b/utils/junit/pom.xml
index f8068d7..9914f3c 100644
--- a/utils/junit/pom.xml
+++ b/utils/junit/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onlab-utils</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/utils/misc/pom.xml b/utils/misc/pom.xml
index 7c48696..ff234b4 100644
--- a/utils/misc/pom.xml
+++ b/utils/misc/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onlab-utils</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/utils/netty/pom.xml b/utils/netty/pom.xml
index 2a96706..f54c93f 100644
--- a/utils/netty/pom.xml
+++ b/utils/netty/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onlab-utils</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/utils/nio/pom.xml b/utils/nio/pom.xml
index f8fc5ec..5ea39b7 100644
--- a/utils/nio/pom.xml
+++ b/utils/nio/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onlab-utils</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/utils/osgi/pom.xml b/utils/osgi/pom.xml
index af9dfca..cbb0a09 100644
--- a/utils/osgi/pom.xml
+++ b/utils/osgi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onlab-utils</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/utils/pom.xml b/utils/pom.xml
index 450e83e..e2d3215 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/utils/rest/pom.xml b/utils/rest/pom.xml
index fbfe138..5c80d17 100644
--- a/utils/rest/pom.xml
+++ b/utils/rest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onlab-utils</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/utils/thirdparty/pom.xml b/utils/thirdparty/pom.xml
index 1af32e4..af70760 100644
--- a/utils/thirdparty/pom.xml
+++ b/utils/thirdparty/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onlab-utils</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/web/api/pom.xml b/web/api/pom.xml
index 5b7a178..a97e543 100644
--- a/web/api/pom.xml
+++ b/web/api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-web</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/web/gui/pom.xml b/web/gui/pom.xml
index 220cda1..65f4f58 100644
--- a/web/gui/pom.xml
+++ b/web/gui/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-web</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/web/pom.xml b/web/pom.xml
index c1921c9..8b7fb63 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
- <version>1.2.0-rc1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>