From f9da5db0ff14879e47a6d83244ba63d45b4d432d Mon Sep 17 00:00:00 2001
From: Ashlee Young <ashlee@wildernessvoice.com>
Date: Tue, 8 Dec 2015 11:32:02 -0800
Subject: onos-1.4.0-rc1 tag

Change-Id: I7f6b85bbf2574b9e174ad919ff36acde28ca50a1
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
---
 framework/src/onos/tools/build/envDefaults                            | 4 ++--
 framework/src/onos/tools/package/archetypes/api/pom.xml               | 2 +-
 .../archetypes/api/src/main/resources/archetype-resources/pom.xml     | 2 +-
 framework/src/onos/tools/package/archetypes/bundle/pom.xml            | 2 +-
 .../archetypes/bundle/src/main/resources/archetype-resources/pom.xml  | 2 +-
 framework/src/onos/tools/package/archetypes/cli/pom.xml               | 2 +-
 .../archetypes/cli/src/main/resources/archetype-resources/pom.xml     | 2 +-
 framework/src/onos/tools/package/archetypes/pom.xml                   | 2 +-
 framework/src/onos/tools/package/archetypes/ui/pom.xml                | 2 +-
 .../archetypes/ui/src/main/resources/archetype-resources/pom.xml      | 2 +-
 framework/src/onos/tools/package/archetypes/uitab/pom.xml             | 2 +-
 .../archetypes/uitab/src/main/resources/archetype-resources/pom.xml   | 2 +-
 framework/src/onos/tools/package/archetypes/uitopo/pom.xml            | 2 +-
 .../archetypes/uitopo/src/main/resources/archetype-resources/pom.xml  | 2 +-
 framework/src/onos/tools/package/branding/pom.xml                     | 2 +-
 framework/src/onos/tools/test/bin/onos-archetypes-test                | 2 +-
 framework/src/onos/tools/test/bin/stc                                 | 2 +-
 framework/src/onos/tools/test/topos/onos.py                           | 2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'framework/src/onos/tools')

diff --git a/framework/src/onos/tools/build/envDefaults b/framework/src/onos/tools/build/envDefaults
index 34fcccb2..db54a73e 100644
--- a/framework/src/onos/tools/build/envDefaults
+++ b/framework/src/onos/tools/build/envDefaults
@@ -18,8 +18,8 @@ export PATH="$PATH:$ONOS_ROOT/tools/build"
 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.4.0-SNAPSHOT"
-export ONOS_VERSION=${ONOS_VERSION:-1.4.0.$BUILD_NUMBER}
+export ONOS_POM_VERSION="1.4.0-rc1"
+export ONOS_VERSION=${ONOS_VERSION:-1.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/framework/src/onos/tools/package/archetypes/api/pom.xml b/framework/src/onos/tools/package/archetypes/api/pom.xml
index 8deaada9..0ad9b69b 100644
--- a/framework/src/onos/tools/package/archetypes/api/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0-rc1</version>
   </parent>
 
   <artifactId>onos-api-archetype</artifactId>
diff --git a/framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml b/framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
index a0e54f3f..89a4f464 100644
--- a/framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
@@ -26,7 +26,7 @@
     <url>http://onosproject.org</url>
 
     <properties>
-        <onos.version>1.4.0-SNAPSHOT</onos.version>
+        <onos.version>1.4.0-rc1</onos.version>
     </properties>
 
     <dependencies>
diff --git a/framework/src/onos/tools/package/archetypes/bundle/pom.xml b/framework/src/onos/tools/package/archetypes/bundle/pom.xml
index 65b55b2b..0709acd5 100644
--- a/framework/src/onos/tools/package/archetypes/bundle/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/bundle/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0-rc1</version>
   </parent>
 
   <artifactId>onos-bundle-archetype</artifactId>
diff --git a/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml b/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
index 222e8b03..bf0f7ea1 100644
--- a/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
@@ -26,7 +26,7 @@
     <url>http://onosproject.org</url>
 
     <properties>
-        <onos.version>1.4.0-SNAPSHOT</onos.version>
+        <onos.version>1.4.0-rc1</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/framework/src/onos/tools/package/archetypes/cli/pom.xml b/framework/src/onos/tools/package/archetypes/cli/pom.xml
index a071eed1..b57a3138 100644
--- a/framework/src/onos/tools/package/archetypes/cli/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/cli/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0-rc1</version>
   </parent>
 
   <artifactId>onos-cli-archetype</artifactId>
diff --git a/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml b/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
index f4602692..b344cc59 100644
--- a/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
@@ -26,7 +26,7 @@
     <url>http://onosproject.org</url>
 
     <properties>
-        <onos.version>1.4.0-SNAPSHOT</onos.version>
+        <onos.version>1.4.0-rc1</onos.version>
     </properties>
 
     <dependencies>
diff --git a/framework/src/onos/tools/package/archetypes/pom.xml b/framework/src/onos/tools/package/archetypes/pom.xml
index 12a23229..8a0be1f5 100644
--- a/framework/src/onos/tools/package/archetypes/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0-rc1</version>
     <packaging>pom</packaging>
 
     <description>ONOS archetypes project</description>
diff --git a/framework/src/onos/tools/package/archetypes/ui/pom.xml b/framework/src/onos/tools/package/archetypes/ui/pom.xml
index 9bebe9da..c4ed2c01 100644
--- a/framework/src/onos/tools/package/archetypes/ui/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/ui/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0-rc1</version>
   </parent>
 
   <artifactId>onos-ui-archetype</artifactId>
diff --git a/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
index d67c181a..c067ee51 100644
--- a/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
@@ -26,7 +26,7 @@
     <url>http://onosproject.org</url>
 
     <properties>
-        <onos.version>1.4.0-SNAPSHOT</onos.version>
+        <onos.version>1.4.0-rc1</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/framework/src/onos/tools/package/archetypes/uitab/pom.xml b/framework/src/onos/tools/package/archetypes/uitab/pom.xml
index cb18f1f3..e82c96ff 100644
--- a/framework/src/onos/tools/package/archetypes/uitab/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/uitab/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0-rc1</version>
   </parent>
 
   <artifactId>onos-uitab-archetype</artifactId>
diff --git a/framework/src/onos/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml b/framework/src/onos/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
index 05a62b27..3dbd873e 100644
--- a/framework/src/onos/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
@@ -27,7 +27,7 @@
     <url>http://onosproject.org</url>
 
     <properties>
-        <onos.version>1.4.0-SNAPSHOT</onos.version>
+        <onos.version>1.4.0-rc1</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/framework/src/onos/tools/package/archetypes/uitopo/pom.xml b/framework/src/onos/tools/package/archetypes/uitopo/pom.xml
index 6ed7c871..b03c325d 100644
--- a/framework/src/onos/tools/package/archetypes/uitopo/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/uitopo/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0-rc1</version>
   </parent>
 
   <artifactId>onos-uitopo-archetype</artifactId>
diff --git a/framework/src/onos/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml b/framework/src/onos/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
index f0688ec2..2c97cf48 100644
--- a/framework/src/onos/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
+++ b/framework/src/onos/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
@@ -27,7 +27,7 @@
     <url>http://onosproject.org</url>
 
     <properties>
-        <onos.version>1.4.0-SNAPSHOT</onos.version>
+        <onos.version>1.4.0-rc1</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/framework/src/onos/tools/package/branding/pom.xml b/framework/src/onos/tools/package/branding/pom.xml
index be9c4165..77ff7cde 100644
--- a/framework/src/onos/tools/package/branding/pom.xml
+++ b/framework/src/onos/tools/package/branding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.0-rc1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/framework/src/onos/tools/test/bin/onos-archetypes-test b/framework/src/onos/tools/test/bin/onos-archetypes-test
index 331c4332..e8470b9a 100755
--- a/framework/src/onos/tools/test/bin/onos-archetypes-test
+++ b/framework/src/onos/tools/test/bin/onos-archetypes-test
@@ -19,7 +19,7 @@ _EOF_
 set -e
 
 export AROOT=/tmp/foo
-export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.4.0-SNAPSHOT"
+export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.4.0-rc1"
 
 mkdir -p $AROOT
 for an in api bundle cli ui; do
diff --git a/framework/src/onos/tools/test/bin/stc b/framework/src/onos/tools/test/bin/stc
index 60a1720e..c4dde4e7 100755
--- a/framework/src/onos/tools/test/bin/stc
+++ b/framework/src/onos/tools/test/bin/stc
@@ -3,7 +3,7 @@
 #   System Test Coordinator
 #-------------------------------------------------------------------------------
 
-VER=1.4.0-SNAPSHOT
+VER=1.4.0-rc1
 JAR=~/.m2/repository/org/onosproject/onlab-stc/$VER/onlab-stc-$VER.jar
 SCENARIOS=$ONOS_ROOT/tools/test/scenarios
 
diff --git a/framework/src/onos/tools/test/topos/onos.py b/framework/src/onos/tools/test/topos/onos.py
index f9d4ba23..b77a4975 100755
--- a/framework/src/onos/tools/test/topos/onos.py
+++ b/framework/src/onos/tools/test/topos/onos.py
@@ -62,7 +62,7 @@ class ONOS( Controller ):
    
     def start( self ):
         if self.inNamespace:
-            instanceOpts = ( '-furl mvn:org.onosproject/onos-features/1.4.0-SNAPSHOT/xml/features '
+            instanceOpts = ( '-furl mvn:org.onosproject/onos-features/1.4.0-rc1/xml/features '
                              '-s 8101' )
             if self.ip is not None:
                 instanceOpts += (' -a %s' % self.IP() )
-- 
cgit 1.2.3-korg