Bumping pom versions to 1.7.0-rc2 and fixing some maven issues

Change-Id: I6169420328333d0916452aa92efbfa961d72e9c4

@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-acl</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.7.0-rc2</version>
     <packaging>bundle</packaging>
 
     <description>ONOS ACL application</description>

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onos-app-bgprouter</artifactId>

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-common</artifactId>

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-ecmp</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo</artifactId>

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-wcmp</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-cip</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-cpman</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-cpman-api</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-cpman</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-cpman</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-cpman</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-dhcp</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-dhcp-api</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-dhcp</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-dhcp</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-dhcp</artifactId>

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-drivermatrix</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-events</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-fm-onosfw</artifactId>

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-fm-cli</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-fm-gui</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-fm-mgr</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-fm</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-flowanalyzer</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-fwd</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-ganglia</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-graphite</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-influxdb</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <artifactId>onos-app-iptopology-api</artifactId>
     <packaging>bundle</packaging>

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-kafka</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-kafka-api</artifactId>

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-metrics</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-mfwd</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-mlb</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-mobility</artifactId>

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-newoptical</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstackinterface</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface-api</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstackinterface</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface-app</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-api</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-openstackinterface-api</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <version>1.7.0-rc2</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-openstackrouting</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-openstackswitching</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-web</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-openstacknode</artifactId>

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-optical</artifactId>

@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-pp</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <artifactId>onos-app-pce</artifactId>
     <packaging>bundle</packaging>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-pceweb</artifactId>

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <artifactId>onos-app-pcep-api</artifactId>
     <packaging>bundle</packaging>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-pim</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-apps</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-proxyarp</artifactId>

@@ -12,7 +12,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onos-app-rabbitmq</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-reactive-routing</artifactId>

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-scalablegateway</artifactId>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-cli</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <version>1.7.0-rc2</version>
         </dependency>
     </dependencies>
 </project>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-sdnip</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-segmentrouting</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-demo</artifactId>

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-distributed-primitives</artifactId>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-core-dist</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <version>1.7.0-rc2</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-election</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-flow-perf</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-intent-perf</artifactId>

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-loadtest</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-messaging-perf</artifactId>

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-netcfg-monitor</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-apps-test</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-virtualbng</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-vpls</artifactId>

@@ -21,12 +21,12 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-app-vrouter</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.7.0-rc2</version>
     <packaging>bundle</packaging>
 
     <description>Virtual router (vRouter) application</description>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-vtn-onosfw</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-vtn</artifactId>

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.onosproject</groupId>
 		<artifactId>onos-app-vtn</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>1.7.0-rc2</version>
 	</parent>
 
 	<artifactId>onos-app-sfc-mgr</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-sfc-web</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-vtn-mgr</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
 

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-xos-client</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-yms</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-yms-api</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-yms</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-app-yms</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-yms</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-cli</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-api</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-core-common</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-core-net</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-core</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-core</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-security</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-core-dist</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-core-persistence</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-core-store</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-core-primitives</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-core-serializers</artifactId>

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -53,7 +53,7 @@
                     </sourceFileExcludes>
                     <excludePackageNames>@external-excludes</excludePackageNames>
                     <docfilessubdirs>true</docfilessubdirs>
-                    <doctitle>ONOS Java API (1.7.0-SNAPSHOT)</doctitle>
+                    <doctitle>ONOS Java API (1.7.0-rc2)</doctitle>
                     <groups>
                         <group>
                             <title>Network Model &amp; Services</title>

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -49,7 +49,7 @@
                 <configuration>
                     <show>package</show>
                     <docfilessubdirs>true</docfilessubdirs>
-                    <doctitle>ONOS Java API (1.7.0-SNAPSHOT)</doctitle>
+                    <doctitle>ONOS Java API (1.7.0-rc2)</doctitle>
                     <excludePackageNames>@internal-excludes</excludePackageNames>
                     <sourceFileExcludes>
                         <sourceFileExclude>**/generated-sources/**</sourceFileExclude>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-drivers-general</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-features</artifactId>

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-incubator-api</artifactId>

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-incubator-core</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-incubator-net</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-incubator</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-incubator-protobuf</artifactId>

@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-incubator-rpc-grpc</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-incubator-rpc</artifactId>

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-incubator-store</artifactId>

@@ -33,7 +33,7 @@
     <groupId>org.onosproject</groupId>
     <artifactId>onos-dependencies</artifactId>
     <packaging>pom</packaging>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.7.0-rc2</version>
 
     <name>${project.artifactId}</name>
     <description>Open Network Operating System shared dependencies</description>

+ONOS_ORIGIN = 'ON.Lab'
+ONOS_GROUP_ID = 'org.onosproject'
+ONOS_VERSION = '1.7.0-rc2'
+DEFAULT_APP_CATEGORY = 'Utility'
+ONOS_ARTIFACT_BASE = 'onos-'
+APP_PREFIX = ONOS_GROUP_ID + '.'
+
+include_defs('//modules.defs')

@@ -26,13 +26,14 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-dependencies</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
         <relativePath>lib/pom.xml</relativePath>
     </parent>
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos</artifactId>
     <packaging>pom</packaging>
+    <version>1.7.0-rc2</version>
 
     <name>${project.artifactId}</name>
     <description>Open Network Operating System root project</description>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-bgp-api</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-bgpio</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-bgp-ctl</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-bgp</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-isis-api</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-isis-ctl</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-isis-isisio</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-isis</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-lisp-api</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-lisp-ctl</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-lisp-msg</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-lisp</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-netconf-api</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-netconf-ctl</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-netconf</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-of-api</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-of-ctl</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-of</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ospf-api</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ospf-ctl</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ospf</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ospf-protocol</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <artifactId>onos-ovsdb-api</artifactId>
     <packaging>bundle</packaging>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ovsdb-ctl</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ovsdb</artifactId>

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <artifactId>onos-ovsdb-rfc</artifactId>
     <packaging>bundle</packaging>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-pcep-controller-api</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-pcep-controller-impl</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-pcepio</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-pcep-controller</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-protocols</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-restsb</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-restsb-api</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-restsb</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-snmp-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-snmp-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-api</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <version>1.7.0-rc2</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-bgp-app</artifactId>

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <artifactId>onos-bgp-provider-cfg</artifactId>
     <packaging>bundle</packaging>

@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.7.0-rc2</version>
   </parent>
   <artifactId>onos-bgp-providers</artifactId>
   <packaging>pom</packaging>

@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-bgp-providers</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.7.0-rc2</version>
   </parent>
   <artifactId>onos-bgp-provider-topology</artifactId>
   <packaging>bundle</packaging>

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgpcep-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-bgpcep-app</artifactId>
@@ -95,11 +95,6 @@
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-pcep-provider-packet</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
             <artifactId>onos-bgpcep-provider-flow</artifactId>
             <version>${project.version}</version>
         </dependency>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgpcep-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-bgpcep-provider-flow</artifactId>

@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.7.0-rc2</version>
   </parent>
 
   <artifactId>onos-bgpcep-providers</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-host-provider</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-isis-app</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-isis-provider-cfg</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-isis-provider-cli</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-isis-providers</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-isis-provider-topology</artifactId>

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-lisp-app</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-lisp-provider-device</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-lisp-providers</artifactId>

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-lldp-provider</artifactId>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-lldp-provider-common</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <version>1.7.0-rc2</version>
         </dependency>
 
         <dependency>

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
 

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-lldp-provider-common</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <version>1.7.0-rc2</version>
         </dependency>
 
         <dependency>

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>onos-netconf-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-netconf-app</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-netconf-provider-device</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-netconf-providers</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-null-provider</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-openflow</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-openflow-base</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-of-provider-device</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-of-provider-flow</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-of-provider-group</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-of-provider-message</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-of-provider-meter</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-of-provider-packet</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-of-providers</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ovsdatabase</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ovsdb-base</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-device</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-host</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ovsdb-providers</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-tunnel</artifactId>

@@ -25,5 +25,4 @@
     <artifact>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-pcep-provider-packet/${project.version}</artifact>
 </app>

@@ -24,6 +24,5 @@
         <bundle>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-pcep-provider-packet/${project.version}</bundle>
     </feature>
 </features>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-pcep</artifactId>

@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.7.0-rc2</version>
   </parent>
   <artifactId>onos-pcep-providers</artifactId>
   <packaging>pom</packaging>

@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-pcep-providers</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.7.0-rc2</version>
   </parent>
   <artifactId>onos-pcep-provider-topology</artifactId>
   <packaging>bundle</packaging>

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <artifactId>onos-pcep-provider-tunnel</artifactId>
     <packaging>bundle</packaging>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-providers</artifactId>

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restsb-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-restsb-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-snmp-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-snmp-app</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-snmp-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-snmp-provider-device</artifactId>
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-api</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <version>1.7.0-rc2</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-ctl</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <version>1.7.0-rc2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-snmp-providers</artifactId>

@@ -19,7 +19,7 @@ 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.7.0-SNAPSHOT"
-export ONOS_VERSION=${ONOS_VERSION:-1.7.0.$BUILD_NUMBER}
+export ONOS_VERSION=${ONOS_VERSION:-1.7.0-rc2.$BUILD_NUMBER}
 
 # ONOS production bits (onos.tar.gz, onos.zip, onos.deb, onos.rpm) staging environment
 export ONOS_BITS=onos-${ONOS_VERSION%~*}

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onlab-junit</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onlab-misc</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onlab-osgi</artifactId>

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onlab-utils</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onlab-utils</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onlab-rest</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-web</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-rest</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-web</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-gui</artifactId>

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0-rc2</version>
     </parent>
 
     <artifactId>onos-web</artifactId>