Tagging 1.8.4
diff --git a/apps/acl/pom.xml b/apps/acl/pom.xml
index f5cc96a..850781a 100644
--- a/apps/acl/pom.xml
+++ b/apps/acl/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-acl</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
     <packaging>bundle</packaging>
 
     <description>ONOS ACL application</description>
diff --git a/apps/actn-mdsc/actn-mdscapp/pom.xml b/apps/actn-mdsc/actn-mdscapp/pom.xml
index 9c4b4e2..9764771 100644
--- a/apps/actn-mdsc/actn-mdscapp/pom.xml
+++ b/apps/actn-mdsc/actn-mdscapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-actn-mdsc</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-actn-mdscapp</artifactId>
diff --git a/apps/actn-mdsc/pom.xml b/apps/actn-mdsc/pom.xml
index 5f9c371..02d75ad 100644
--- a/apps/actn-mdsc/pom.xml
+++ b/apps/actn-mdsc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-actn-mdsc</artifactId>
diff --git a/apps/actn-mdsc/tetunnel-ctl/pom.xml b/apps/actn-mdsc/tetunnel-ctl/pom.xml
index 87d8454..886d115 100644
--- a/apps/actn-mdsc/tetunnel-ctl/pom.xml
+++ b/apps/actn-mdsc/tetunnel-ctl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-actn-mdsc</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-actn-mdsc-tetunnel-ctl</artifactId>
diff --git a/apps/actn-mdsc/tetunnel-pce/pom.xml b/apps/actn-mdsc/tetunnel-pce/pom.xml
index 5ca15b2..819dd26 100755
--- a/apps/actn-mdsc/tetunnel-pce/pom.xml
+++ b/apps/actn-mdsc/tetunnel-pce/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-actn-mdsc</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-tetunnel-api</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-tetunnel-api</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/apps/bgprouter/pom.xml b/apps/bgprouter/pom.xml
index 03684d1..91a6517 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onos-app-bgprouter</artifactId>
diff --git a/apps/bmv2-demo/common/pom.xml b/apps/bmv2-demo/common/pom.xml
index 71013cf..0cae0bd 100644
--- a/apps/bmv2-demo/common/pom.xml
+++ b/apps/bmv2-demo/common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-common</artifactId>
diff --git a/apps/bmv2-demo/ecmp/pom.xml b/apps/bmv2-demo/ecmp/pom.xml
index 8a94fd6..7925600 100644
--- a/apps/bmv2-demo/ecmp/pom.xml
+++ b/apps/bmv2-demo/ecmp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-ecmp</artifactId>
diff --git a/apps/bmv2-demo/pom.xml b/apps/bmv2-demo/pom.xml
index d739c57..89b2e03 100644
--- a/apps/bmv2-demo/pom.xml
+++ b/apps/bmv2-demo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo</artifactId>
diff --git a/apps/bmv2-demo/wcmp/pom.xml b/apps/bmv2-demo/wcmp/pom.xml
index 7d3ef9e..97318c7 100644
--- a/apps/bmv2-demo/wcmp/pom.xml
+++ b/apps/bmv2-demo/wcmp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-wcmp</artifactId>
diff --git a/apps/cip/pom.xml b/apps/cip/pom.xml
index e1dcd0d..7b0cf6c 100644
--- a/apps/cip/pom.xml
+++ b/apps/cip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-cip</artifactId>
diff --git a/apps/cpman/api/pom.xml b/apps/cpman/api/pom.xml
index 0eb6fee..4fc1856 100644
--- a/apps/cpman/api/pom.xml
+++ b/apps/cpman/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-cpman</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-cpman-api</artifactId>
diff --git a/apps/cpman/app/pom.xml b/apps/cpman/app/pom.xml
index d5c578e..648f29c 100644
--- a/apps/cpman/app/pom.xml
+++ b/apps/cpman/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-cpman</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-cpman</artifactId>
diff --git a/apps/cpman/pom.xml b/apps/cpman/pom.xml
index 2bf1e66..c314f74 100644
--- a/apps/cpman/pom.xml
+++ b/apps/cpman/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-cpman</artifactId>
diff --git a/apps/dhcp/api/pom.xml b/apps/dhcp/api/pom.xml
index 54ada1f..a15f781 100644
--- a/apps/dhcp/api/pom.xml
+++ b/apps/dhcp/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-dhcp</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-dhcp-api</artifactId>
diff --git a/apps/dhcp/app/pom.xml b/apps/dhcp/app/pom.xml
index 919d231..4a1ce3f 100644
--- a/apps/dhcp/app/pom.xml
+++ b/apps/dhcp/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-dhcp</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-dhcp</artifactId>
diff --git a/apps/dhcp/pom.xml b/apps/dhcp/pom.xml
index bb1bee0..dbbeaee 100644
--- a/apps/dhcp/pom.xml
+++ b/apps/dhcp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-dhcp</artifactId>
diff --git a/apps/dhcprelay/pom.xml b/apps/dhcprelay/pom.xml
index 8f390e2..afd8857 100644
--- a/apps/dhcprelay/pom.xml
+++ b/apps/dhcprelay/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/drivermatrix/pom.xml b/apps/drivermatrix/pom.xml
index 4bb50e0..ffc2ef7 100644
--- a/apps/drivermatrix/pom.xml
+++ b/apps/drivermatrix/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-drivermatrix</artifactId>
diff --git a/apps/events/pom.xml b/apps/events/pom.xml
index 5e83db1..7a8a300 100644
--- a/apps/events/pom.xml
+++ b/apps/events/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-events</artifactId>
diff --git a/apps/faultmanagement/app/pom.xml b/apps/faultmanagement/app/pom.xml
index 8af5060..517cac9 100644
--- a/apps/faultmanagement/app/pom.xml
+++ b/apps/faultmanagement/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-fm-onosfw</artifactId>
diff --git a/apps/faultmanagement/fmcli/pom.xml b/apps/faultmanagement/fmcli/pom.xml
index f3e5f38..3fe1c42 100644
--- a/apps/faultmanagement/fmcli/pom.xml
+++ b/apps/faultmanagement/fmcli/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-fm-cli</artifactId>
diff --git a/apps/faultmanagement/fmgui/pom.xml b/apps/faultmanagement/fmgui/pom.xml
index fd325d9..43874f8 100644
--- a/apps/faultmanagement/fmgui/pom.xml
+++ b/apps/faultmanagement/fmgui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-fm-gui</artifactId>
diff --git a/apps/faultmanagement/fmmgr/pom.xml b/apps/faultmanagement/fmmgr/pom.xml
index 453adba..16289bb 100644
--- a/apps/faultmanagement/fmmgr/pom.xml
+++ b/apps/faultmanagement/fmmgr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-fm-mgr</artifactId>
diff --git a/apps/faultmanagement/fmweb/pom.xml b/apps/faultmanagement/fmweb/pom.xml
index b9fdffd..a0a3bac 100644
--- a/apps/faultmanagement/fmweb/pom.xml
+++ b/apps/faultmanagement/fmweb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
 
diff --git a/apps/faultmanagement/pom.xml b/apps/faultmanagement/pom.xml
index a3db347..af09580 100644
--- a/apps/faultmanagement/pom.xml
+++ b/apps/faultmanagement/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-fm</artifactId>
diff --git a/apps/flowanalyzer/pom.xml b/apps/flowanalyzer/pom.xml
index c6ab494..ee0fe15 100644
--- a/apps/flowanalyzer/pom.xml
+++ b/apps/flowanalyzer/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-flowanalyzer</artifactId>
diff --git a/apps/fwd/pom.xml b/apps/fwd/pom.xml
index bc507a5..4f939ba 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-fwd</artifactId>
diff --git a/apps/gangliametrics/pom.xml b/apps/gangliametrics/pom.xml
index a4f6a76..53c3d67 100644
--- a/apps/gangliametrics/pom.xml
+++ b/apps/gangliametrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-ganglia</artifactId>
diff --git a/apps/graphitemetrics/pom.xml b/apps/graphitemetrics/pom.xml
index 3fc08af..392e49b 100644
--- a/apps/graphitemetrics/pom.xml
+++ b/apps/graphitemetrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-graphite</artifactId>
diff --git a/apps/influxdbmetrics/pom.xml b/apps/influxdbmetrics/pom.xml
index a4f833d..106c4f2 100644
--- a/apps/influxdbmetrics/pom.xml
+++ b/apps/influxdbmetrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-influxdb</artifactId>
diff --git a/apps/iptopology-api/pom.xml b/apps/iptopology-api/pom.xml
index ae694c4..ac9c4c0 100644
--- a/apps/iptopology-api/pom.xml
+++ b/apps/iptopology-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <artifactId>onos-app-iptopology-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/apps/kafka-integration/api/pom.xml b/apps/kafka-integration/api/pom.xml
index 685841f..efc5116 100644
--- a/apps/kafka-integration/api/pom.xml
+++ b/apps/kafka-integration/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-kafka</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-kafka-api</artifactId>
diff --git a/apps/kafka-integration/app/pom.xml b/apps/kafka-integration/app/pom.xml
index 5b3b02f..c73ff99 100644
--- a/apps/kafka-integration/app/pom.xml
+++ b/apps/kafka-integration/app/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/core/pom.xml b/apps/kafka-integration/core/pom.xml
index 231b839..7bccce0 100644
--- a/apps/kafka-integration/core/pom.xml
+++ b/apps/kafka-integration/core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/pom.xml b/apps/kafka-integration/pom.xml
index c62f922..96c2130 100644
--- a/apps/kafka-integration/pom.xml
+++ b/apps/kafka-integration/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/web/pom.xml b/apps/kafka-integration/web/pom.xml
index 88d2f16..8471f22 100644
--- a/apps/kafka-integration/web/pom.xml
+++ b/apps/kafka-integration/web/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/learning-switch/pom.xml b/apps/learning-switch/pom.xml
index 53d3cdb..5669108 100644
--- a/apps/learning-switch/pom.xml
+++ b/apps/learning-switch/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/metrics/pom.xml b/apps/metrics/pom.xml
index 8283b57..11e1df2 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-metrics</artifactId>
diff --git a/apps/mfwd/pom.xml b/apps/mfwd/pom.xml
index abcbac3..514df4c 100644
--- a/apps/mfwd/pom.xml
+++ b/apps/mfwd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-mfwd</artifactId>
diff --git a/apps/mlb/pom.xml b/apps/mlb/pom.xml
index 00223e7..301ce26 100644
--- a/apps/mlb/pom.xml
+++ b/apps/mlb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-mlb</artifactId>
diff --git a/apps/mobility/pom.xml b/apps/mobility/pom.xml
index 4c11428..5200f74 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-mobility</artifactId>
diff --git a/apps/newoptical/pom.xml b/apps/newoptical/pom.xml
index 80818ce..71ba779 100644
--- a/apps/newoptical/pom.xml
+++ b/apps/newoptical/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-newoptical</artifactId>
diff --git a/apps/openstackinterface/api/pom.xml b/apps/openstackinterface/api/pom.xml
index 58e15b1..7deee4d 100644
--- a/apps/openstackinterface/api/pom.xml
+++ b/apps/openstackinterface/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstackinterface</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface-api</artifactId>
diff --git a/apps/openstackinterface/app/pom.xml b/apps/openstackinterface/app/pom.xml
index 09d9497..358da42 100644
--- a/apps/openstackinterface/app/pom.xml
+++ b/apps/openstackinterface/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstackinterface</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface-app</artifactId>
diff --git a/apps/openstackinterface/pom.xml b/apps/openstackinterface/pom.xml
index 99c7b45..cf38bfe 100644
--- a/apps/openstackinterface/pom.xml
+++ b/apps/openstackinterface/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface</artifactId>
diff --git a/apps/openstacknetworking/api/pom.xml b/apps/openstacknetworking/api/pom.xml
index a2fb74c..221d4e4 100644
--- a/apps/openstacknetworking/api/pom.xml
+++ b/apps/openstacknetworking/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</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.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/apps/openstacknetworking/cli/pom.xml b/apps/openstacknetworking/cli/pom.xml
index 15c27bd..a655016 100644
--- a/apps/openstacknetworking/cli/pom.xml
+++ b/apps/openstacknetworking/cli/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-cli</artifactId>
diff --git a/apps/openstacknetworking/pom.xml b/apps/openstacknetworking/pom.xml
index 8d5e4c9..6b1dd53 100644
--- a/apps/openstacknetworking/pom.xml
+++ b/apps/openstacknetworking/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking</artifactId>
diff --git a/apps/openstacknetworking/routing/pom.xml b/apps/openstacknetworking/routing/pom.xml
index c1335ae..c3e4a6c 100644
--- a/apps/openstacknetworking/routing/pom.xml
+++ b/apps/openstacknetworking/routing/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-openstackrouting</artifactId>
diff --git a/apps/openstacknetworking/switching/pom.xml b/apps/openstacknetworking/switching/pom.xml
index de4568d..1e9f813 100644
--- a/apps/openstacknetworking/switching/pom.xml
+++ b/apps/openstacknetworking/switching/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-openstackswitching</artifactId>
diff --git a/apps/openstacknetworking/web/pom.xml b/apps/openstacknetworking/web/pom.xml
index 475e14d..571f9da 100644
--- a/apps/openstacknetworking/web/pom.xml
+++ b/apps/openstacknetworking/web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-web</artifactId>
diff --git a/apps/openstacknode/pom.xml b/apps/openstacknode/pom.xml
index 3324055..351a340 100644
--- a/apps/openstacknode/pom.xml
+++ b/apps/openstacknode/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-openstacknode</artifactId>
diff --git a/apps/optical-model/pom.xml b/apps/optical-model/pom.xml
index 956d4c8..8d625b0 100644
--- a/apps/optical-model/pom.xml
+++ b/apps/optical-model/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/optical/pom.xml b/apps/optical/pom.xml
index fe92cd9..9690cb4 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-optical</artifactId>
diff --git a/apps/patchpanel/pom.xml b/apps/patchpanel/pom.xml
index 92ef651..5127150 100644
--- a/apps/patchpanel/pom.xml
+++ b/apps/patchpanel/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/pathpainter/pom.xml b/apps/pathpainter/pom.xml
index ac6f483..903c2e1 100644
--- a/apps/pathpainter/pom.xml
+++ b/apps/pathpainter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-pp</artifactId>
diff --git a/apps/pce/app/pom.xml b/apps/pce/app/pom.xml
index b0e5bc5..c06f448 100644
--- a/apps/pce/app/pom.xml
+++ b/apps/pce/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <artifactId>onos-app-pce</artifactId>
     <packaging>bundle</packaging>
diff --git a/apps/pce/pcerest/pom.xml b/apps/pce/pcerest/pom.xml
index 21c5cb4..18799d0 100644
--- a/apps/pce/pcerest/pom.xml
+++ b/apps/pce/pcerest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/pce/pceweb/pom.xml b/apps/pce/pceweb/pom.xml
index 1352f51..dc7dd5b 100644
--- a/apps/pce/pceweb/pom.xml
+++ b/apps/pce/pceweb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-pceweb</artifactId>
diff --git a/apps/pce/pom.xml b/apps/pce/pom.xml
index 4890683..81088ab 100644
--- a/apps/pce/pom.xml
+++ b/apps/pce/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/pcep-api/pom.xml b/apps/pcep-api/pom.xml
index da7f8f3..9b31251 100644
--- a/apps/pcep-api/pom.xml
+++ b/apps/pcep-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <artifactId>onos-app-pcep-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/apps/pim/pom.xml b/apps/pim/pom.xml
index dfe481f..00fc3ec 100644
--- a/apps/pim/pom.xml
+++ b/apps/pim/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-pim</artifactId>
diff --git a/apps/pom.xml b/apps/pom.xml
index 30ef073..40de673 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-apps</artifactId>
diff --git a/apps/proxyarp/pom.xml b/apps/proxyarp/pom.xml
index 86d43bf..4fb9721 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-proxyarp</artifactId>
diff --git a/apps/rabbitmq/pom.xml b/apps/rabbitmq/pom.xml
index 1dca536..75623ce 100644
--- a/apps/rabbitmq/pom.xml
+++ b/apps/rabbitmq/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onos-app-rabbitmq</artifactId>
diff --git a/apps/reactive-routing/pom.xml b/apps/reactive-routing/pom.xml
index 55cf42b..b2a84ce 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-reactive-routing</artifactId>
diff --git a/apps/routing-api/pom.xml b/apps/routing-api/pom.xml
index 9805d9f..bc3a13a 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/routing/pom.xml b/apps/routing/pom.xml
index 4f104b5..da43d76 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/scalablegateway/pom.xml b/apps/scalablegateway/pom.xml
index a44d0b89f..570385d 100644
--- a/apps/scalablegateway/pom.xml
+++ b/apps/scalablegateway/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-scalablegateway</artifactId>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-cli</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/apps/sdnip/pom.xml b/apps/sdnip/pom.xml
index 350b880..5183da2 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-sdnip</artifactId>
diff --git a/apps/segmentrouting/pom.xml b/apps/segmentrouting/pom.xml
index 383ad37..49786fc 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-segmentrouting</artifactId>
diff --git a/apps/tenbi/pom.xml b/apps/tenbi/pom.xml
index 8ad59d9..1b6d316 100644
--- a/apps/tenbi/pom.xml
+++ b/apps/tenbi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/topology/pom.xml b/apps/tenbi/topology/pom.xml
index 328e83e..337b41f 100644
--- a/apps/tenbi/topology/pom.xml
+++ b/apps/tenbi/topology/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-tenbi</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/tunnel/pom.xml b/apps/tenbi/tunnel/pom.xml
index 4173441..80e49a7 100755
--- a/apps/tenbi/tunnel/pom.xml
+++ b/apps/tenbi/tunnel/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-tenbi</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/tenbi/utils/pom.xml b/apps/tenbi/utils/pom.xml
index e43f6bd..b5b1388 100644
--- a/apps/tenbi/utils/pom.xml
+++ b/apps/tenbi/utils/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-tenbi</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/yangmodel/pom.xml b/apps/tenbi/yangmodel/pom.xml
index 949c9e6..5b404cd 100644
--- a/apps/tenbi/yangmodel/pom.xml
+++ b/apps/tenbi/yangmodel/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-tenbi</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/test/demo/pom.xml b/apps/test/demo/pom.xml
index a257b50..3f0b21b 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-demo</artifactId>
diff --git a/apps/test/distributed-primitives/pom.xml b/apps/test/distributed-primitives/pom.xml
index 586438c..7610254 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-distributed-primitives</artifactId>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-core-dist</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/apps/test/election/pom.xml b/apps/test/election/pom.xml
index ac00faf..e07cf6a 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-election</artifactId>
diff --git a/apps/test/flow-perf/pom.xml b/apps/test/flow-perf/pom.xml
index 9dc7b1f..82f5b65 100644
--- a/apps/test/flow-perf/pom.xml
+++ b/apps/test/flow-perf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-flow-perf</artifactId>
diff --git a/apps/test/intent-perf/pom.xml b/apps/test/intent-perf/pom.xml
index 611f8af..426208d 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-intent-perf</artifactId>
diff --git a/apps/test/loadtest/pom.xml b/apps/test/loadtest/pom.xml
index ae41b8a..846a841 100644
--- a/apps/test/loadtest/pom.xml
+++ b/apps/test/loadtest/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-loadtest</artifactId>
diff --git a/apps/test/messaging-perf/pom.xml b/apps/test/messaging-perf/pom.xml
index 46e49e6..196ffdb 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-messaging-perf</artifactId>
diff --git a/apps/test/netcfg-monitor/pom.xml b/apps/test/netcfg-monitor/pom.xml
index 2a885ed..fce5c82 100644
--- a/apps/test/netcfg-monitor/pom.xml
+++ b/apps/test/netcfg-monitor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-netcfg-monitor</artifactId>
diff --git a/apps/test/pom.xml b/apps/test/pom.xml
index 7287948..7c0b94c 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-apps-test</artifactId>
diff --git a/apps/tetopology/api/pom.xml b/apps/tetopology/api/pom.xml
index a14b5b0..5b354df 100644
--- a/apps/tetopology/api/pom.xml
+++ b/apps/tetopology/api/pom.xml
@@ -21,11 +21,11 @@
     <parent>
         <artifactId>onos-tetopology</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-tetopology-api</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
     <packaging>bundle</packaging>
     
     <description>IETF TE topology management API</description>
diff --git a/apps/tetopology/app/pom.xml b/apps/tetopology/app/pom.xml
index bacaf4f..9b051ff 100644
--- a/apps/tetopology/app/pom.xml
+++ b/apps/tetopology/app/pom.xml
@@ -21,11 +21,11 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-tetopology</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-tetopology</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
     <packaging>bundle</packaging>
 
     <description>IETF TE topology application</description>
diff --git a/apps/tetopology/pom.xml b/apps/tetopology/pom.xml
index 5df8e83..ab1f6b6 100644
--- a/apps/tetopology/pom.xml
+++ b/apps/tetopology/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-tetopology</artifactId>
diff --git a/apps/tetunnel/api/pom.xml b/apps/tetunnel/api/pom.xml
index 6eb358b..3c870e1 100755
--- a/apps/tetunnel/api/pom.xml
+++ b/apps/tetunnel/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-tetunnel</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-tetunnel-api</artifactId>
diff --git a/apps/tetunnel/app/pom.xml b/apps/tetunnel/app/pom.xml
index ed5ff17..e479b4b 100644
--- a/apps/tetunnel/app/pom.xml
+++ b/apps/tetunnel/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-tetunnel</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-tetunnel</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-tetunnel-api</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-core-serializers</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/apps/tetunnel/pom.xml b/apps/tetunnel/pom.xml
index 904ec88..581a711 100644
--- a/apps/tetunnel/pom.xml
+++ b/apps/tetunnel/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-tetunnel</artifactId>
diff --git a/apps/virtualbng/pom.xml b/apps/virtualbng/pom.xml
index fb450a0..2357fcc 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-virtualbng</artifactId>
diff --git a/apps/vpls/pom.xml b/apps/vpls/pom.xml
index 03af0ed..c9f5c38 100644
--- a/apps/vpls/pom.xml
+++ b/apps/vpls/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-vpls</artifactId>
diff --git a/apps/vrouter/pom.xml b/apps/vrouter/pom.xml
index bf149fc..4b7ed38 100644
--- a/apps/vrouter/pom.xml
+++ b/apps/vrouter/pom.xml
@@ -21,12 +21,12 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-app-vrouter</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
     <packaging>bundle</packaging>
 
     <description>Virtual router (vRouter) application</description>
diff --git a/apps/vtn/app/pom.xml b/apps/vtn/app/pom.xml
index ac03125..f5f42e2 100644
--- a/apps/vtn/app/pom.xml
+++ b/apps/vtn/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-vtn-onosfw</artifactId>
diff --git a/apps/vtn/pom.xml b/apps/vtn/pom.xml
index 2f1c729..e9a41e1 100644
--- a/apps/vtn/pom.xml
+++ b/apps/vtn/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-vtn</artifactId>
diff --git a/apps/vtn/sfcmgr/pom.xml b/apps/vtn/sfcmgr/pom.xml
index 6b40d97..730d0a5 100644
--- a/apps/vtn/sfcmgr/pom.xml
+++ b/apps/vtn/sfcmgr/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.onosproject</groupId>
 		<artifactId>onos-app-vtn</artifactId>
-		<version>1.8.4-SNAPSHOT</version>
+		<version>1.8.4</version>
 	</parent>
 
 	<artifactId>onos-app-sfc-mgr</artifactId>
diff --git a/apps/vtn/sfcweb/pom.xml b/apps/vtn/sfcweb/pom.xml
index 2bfc150..1432ea4 100755
--- a/apps/vtn/sfcweb/pom.xml
+++ b/apps/vtn/sfcweb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-sfc-web</artifactId>
diff --git a/apps/vtn/vtnmgr/pom.xml b/apps/vtn/vtnmgr/pom.xml
index e2bd850..ac6ffdb 100644
--- a/apps/vtn/vtnmgr/pom.xml
+++ b/apps/vtn/vtnmgr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-vtn-mgr</artifactId>
diff --git a/apps/vtn/vtnrsc/pom.xml b/apps/vtn/vtnrsc/pom.xml
index 67e7fdf..c4b26e2 100644
--- a/apps/vtn/vtnrsc/pom.xml
+++ b/apps/vtn/vtnrsc/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
 
diff --git a/apps/vtn/vtnweb/pom.xml b/apps/vtn/vtnweb/pom.xml
index 7abfaff..e50b932 100644
--- a/apps/vtn/vtnweb/pom.xml
+++ b/apps/vtn/vtnweb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
 
diff --git a/apps/xosclient/pom.xml b/apps/xosclient/pom.xml
index 3b33505..ced4e94 100644
--- a/apps/xosclient/pom.xml
+++ b/apps/xosclient/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-xos-client</artifactId>
diff --git a/apps/yms/api/pom.xml b/apps/yms/api/pom.xml
index e953d94..ebb3a25 100644
--- a/apps/yms/api/pom.xml
+++ b/apps/yms/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-yms</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-yms-api</artifactId>
diff --git a/apps/yms/app/pom.xml b/apps/yms/app/pom.xml
index a6b61ff..de2b342 100644
--- a/apps/yms/app/pom.xml
+++ b/apps/yms/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-yms</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-yms</artifactId>
diff --git a/apps/yms/pom.xml b/apps/yms/pom.xml
index f8266c6..abfdb93 100644
--- a/apps/yms/pom.xml
+++ b/apps/yms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-yms</artifactId>
diff --git a/apps/yms/ut/pom.xml b/apps/yms/ut/pom.xml
index c30f599..a5b8fc2 100644
--- a/apps/yms/ut/pom.xml
+++ b/apps/yms/ut/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-yms</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-app-yms-ut</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 374564e..ae79b7e 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-cli</artifactId>
diff --git a/core/api/pom.xml b/core/api/pom.xml
index 2abb2e5..af1e645 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-api</artifactId>
diff --git a/core/common/pom.xml b/core/common/pom.xml
index ee62659..2e1c84c 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-core-common</artifactId>
diff --git a/core/net/pom.xml b/core/net/pom.xml
index a405b33..994e515 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-core-net</artifactId>
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 d2e018a..38feae3 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
@@ -64,7 +64,7 @@
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     private static final File VERSION_FILE = new File("../VERSION");
-    private static Version version = Version.version("1.8.4-SNAPSHOT");
+    private static Version version = Version.version("1.8.4");
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ApplicationIdStore applicationIdStore;
diff --git a/core/pom.xml b/core/pom.xml
index 1fc561b..564ff81 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-core</artifactId>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 97a19e6..1d555ee 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-core</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-security</artifactId>
diff --git a/core/store/dist/pom.xml b/core/store/dist/pom.xml
index a6dd97d..4d202c1 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-core-dist</artifactId>
diff --git a/core/store/persistence/pom.xml b/core/store/persistence/pom.xml
index fe666f2..2ccb486 100644
--- a/core/store/persistence/pom.xml
+++ b/core/store/persistence/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-core-persistence</artifactId>
diff --git a/core/store/pom.xml b/core/store/pom.xml
index 11ecab6..10d06c4 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-core-store</artifactId>
diff --git a/core/store/primitives/pom.xml b/core/store/primitives/pom.xml
index 6f73109..ccec783 100644
--- a/core/store/primitives/pom.xml
+++ b/core/store/primitives/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-core-primitives</artifactId>
diff --git a/core/store/serializers/pom.xml b/core/store/serializers/pom.xml
index 2757301..03d3704 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-core-serializers</artifactId>
diff --git a/docs/external.xml b/docs/external.xml
index 540df46..4f06c2a 100644
--- a/docs/external.xml
+++ b/docs/external.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -53,7 +53,7 @@
                     </sourceFileExcludes>
                     <excludePackageNames>@external-excludes</excludePackageNames>
                     <docfilessubdirs>true</docfilessubdirs>
-                    <doctitle>ONOS Java API (1.8.4-SNAPSHOT)</doctitle>
+                    <doctitle>ONOS Java API (1.8.4)</doctitle>
                     <groups>
                         <group>
                             <title>Network Model &amp; Services</title>
diff --git a/docs/internal.xml b/docs/internal.xml
index e436fc2..084feab 100644
--- a/docs/internal.xml
+++ b/docs/internal.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -49,7 +49,7 @@
                 <configuration>
                     <show>package</show>
                     <docfilessubdirs>true</docfilessubdirs>
-                    <doctitle>ONOS Java API (1.8.4-SNAPSHOT)</doctitle>
+                    <doctitle>ONOS Java API (1.8.4)</doctitle>
                     <excludePackageNames>@internal-excludes</excludePackageNames>
                     <sourceFileExcludes>
                         <sourceFileExclude>**/generated-sources/**</sourceFileExclude>
diff --git a/drivers/arista/pom.xml b/drivers/arista/pom.xml
index c426a7f..9814d3d 100755
--- a/drivers/arista/pom.xml
+++ b/drivers/arista/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/bmv2/pom.xml b/drivers/bmv2/pom.xml
index 52e998b..0a5f2d6 100644
--- a/drivers/bmv2/pom.xml
+++ b/drivers/bmv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/bti/pom.xml b/drivers/bti/pom.xml
index a10a83e..26d003a 100644
--- a/drivers/bti/pom.xml
+++ b/drivers/bti/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/ciena/pom.xml b/drivers/ciena/pom.xml
index 42f92c2..eeb3d30 100644
--- a/drivers/ciena/pom.xml
+++ b/drivers/ciena/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/cisco/pom.xml b/drivers/cisco/pom.xml
index 923bd47..6472a85 100644
--- a/drivers/cisco/pom.xml
+++ b/drivers/cisco/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/corsa/pom.xml b/drivers/corsa/pom.xml
index 6b01f1f..3047326 100644
--- a/drivers/corsa/pom.xml
+++ b/drivers/corsa/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/default/pom.xml b/drivers/default/pom.xml
index 9924c68..20dd786 100644
--- a/drivers/default/pom.xml
+++ b/drivers/default/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/fujitsu/pom.xml b/drivers/fujitsu/pom.xml
index 0a71029..d45ebb8 100644
--- a/drivers/fujitsu/pom.xml
+++ b/drivers/fujitsu/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/juniper/pom.xml b/drivers/juniper/pom.xml
index 4f8a535..f571e99 100644
--- a/drivers/juniper/pom.xml
+++ b/drivers/juniper/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/lumentum/pom.xml b/drivers/lumentum/pom.xml
index d0a2110..4d8c41b 100644
--- a/drivers/lumentum/pom.xml
+++ b/drivers/lumentum/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/netconf/pom.xml b/drivers/netconf/pom.xml
index 76e4cb1..9605793 100644
--- a/drivers/netconf/pom.xml
+++ b/drivers/netconf/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/optical/pom.xml b/drivers/optical/pom.xml
index e04a341..6bda235 100644
--- a/drivers/optical/pom.xml
+++ b/drivers/optical/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/ovsdb/pom.xml b/drivers/ovsdb/pom.xml
index 5598f59..586905b 100644
--- a/drivers/ovsdb/pom.xml
+++ b/drivers/ovsdb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/pom.xml b/drivers/pom.xml
index f002dec..fb20fb8 100644
--- a/drivers/pom.xml
+++ b/drivers/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-drivers-general</artifactId>
diff --git a/drivers/utilities/pom.xml b/drivers/utilities/pom.xml
index bfa97b5..f902ff6 100644
--- a/drivers/utilities/pom.xml
+++ b/drivers/utilities/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/features/pom.xml b/features/pom.xml
index aaebac0..d4c679a 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-features</artifactId>
diff --git a/incubator/api/pom.xml b/incubator/api/pom.xml
index d661187..691377b 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-incubator-api</artifactId>
diff --git a/incubator/core/pom.xml b/incubator/core/pom.xml
index 2fa097a..ab329f0 100644
--- a/incubator/core/pom.xml
+++ b/incubator/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-incubator-core</artifactId>
diff --git a/incubator/grpc/pom.xml b/incubator/grpc/pom.xml
index d51bca1..f2b5934 100644
--- a/incubator/grpc/pom.xml
+++ b/incubator/grpc/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/incubator/net/pom.xml b/incubator/net/pom.xml
index e72b464..828d71a 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-incubator-net</artifactId>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index c291d70..b23bb39 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-incubator</artifactId>
diff --git a/incubator/protobuf-nb/pom.xml b/incubator/protobuf-nb/pom.xml
index 372ec1d..e50e34f 100644
--- a/incubator/protobuf-nb/pom.xml
+++ b/incubator/protobuf-nb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/incubator/protobuf/pom.xml b/incubator/protobuf/pom.xml
index 62be7ad..30328de 100644
--- a/incubator/protobuf/pom.xml
+++ b/incubator/protobuf/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-incubator-protobuf</artifactId>
diff --git a/incubator/rpc-grpc/pom.xml b/incubator/rpc-grpc/pom.xml
index cc8ad91..56e289e 100644
--- a/incubator/rpc-grpc/pom.xml
+++ b/incubator/rpc-grpc/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-incubator-rpc-grpc</artifactId>
diff --git a/incubator/rpc-nb/pom.xml b/incubator/rpc-nb/pom.xml
index 51daa1a..7958289 100644
--- a/incubator/rpc-nb/pom.xml
+++ b/incubator/rpc-nb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/incubator/rpc/pom.xml b/incubator/rpc/pom.xml
index 3705172..570624e 100644
--- a/incubator/rpc/pom.xml
+++ b/incubator/rpc/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-incubator-rpc</artifactId>
diff --git a/incubator/store/pom.xml b/incubator/store/pom.xml
index 743c0c3..bcfa36e 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-incubator-store</artifactId>
diff --git a/lib/pom.xml b/lib/pom.xml
index ff75b4c..abe1c73 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -33,7 +33,7 @@
     <groupId>org.onosproject</groupId>
     <artifactId>onos-dependencies</artifactId>
     <packaging>pom</packaging>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
 
     <name>${project.artifactId}</name>
     <description>Open Network Operating System shared dependencies</description>
diff --git a/onos.defs b/onos.defs
index c4cfec7..82db5e6 100644
--- a/onos.defs
+++ b/onos.defs
@@ -1,6 +1,6 @@
 ONOS_ORIGIN = 'ON.Lab'
 ONOS_GROUP_ID = 'org.onosproject'
-ONOS_VERSION = '1.8.4-SNAPSHOT'
+ONOS_VERSION = '1.8.4'
 DEFAULT_APP_CATEGORY = 'Utility'
 ONOS_ARTIFACT_BASE = 'onos-'
 APP_PREFIX = ONOS_GROUP_ID + '.'
diff --git a/pom.xml b/pom.xml
index c30524a..2d66c5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,14 +26,14 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-dependencies</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>lib/pom.xml</relativePath>
     </parent>
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos</artifactId>
     <packaging>pom</packaging>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
 
     <name>${project.artifactId}</name>
     <description>Open Network Operating System root project</description>
diff --git a/protocols/bgp/api/pom.xml b/protocols/bgp/api/pom.xml
index a959fac..27d10aa 100755
--- a/protocols/bgp/api/pom.xml
+++ b/protocols/bgp/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-bgp-api</artifactId>
diff --git a/protocols/bgp/bgpio/pom.xml b/protocols/bgp/bgpio/pom.xml
index cd30599e..6e846be 100755
--- a/protocols/bgp/bgpio/pom.xml
+++ b/protocols/bgp/bgpio/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-bgpio</artifactId>
diff --git a/protocols/bgp/ctl/pom.xml b/protocols/bgp/ctl/pom.xml
index d887efc..d6761db 100644
--- a/protocols/bgp/ctl/pom.xml
+++ b/protocols/bgp/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-bgp-ctl</artifactId>
diff --git a/protocols/bgp/pom.xml b/protocols/bgp/pom.xml
index 08191ac..2ad4dda 100755
--- a/protocols/bgp/pom.xml
+++ b/protocols/bgp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-bgp</artifactId>
diff --git a/protocols/bmv2/api/pom.xml b/protocols/bmv2/api/pom.xml
index 827140c..2fd8de4 100644
--- a/protocols/bmv2/api/pom.xml
+++ b/protocols/bmv2/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/bmv2/ctl/pom.xml b/protocols/bmv2/ctl/pom.xml
index b218f11..c1d7a78 100644
--- a/protocols/bmv2/ctl/pom.xml
+++ b/protocols/bmv2/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/bmv2/pom.xml b/protocols/bmv2/pom.xml
index e900d8b..67417f7 100644
--- a/protocols/bmv2/pom.xml
+++ b/protocols/bmv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/bmv2/thrift-api/pom.xml b/protocols/bmv2/thrift-api/pom.xml
index f3d434b..119023a 100644
--- a/protocols/bmv2/thrift-api/pom.xml
+++ b/protocols/bmv2/thrift-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/protocols/isis/api/pom.xml b/protocols/isis/api/pom.xml
index f616fbb..b804691 100644
--- a/protocols/isis/api/pom.xml
+++ b/protocols/isis/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-isis-api</artifactId>
diff --git a/protocols/isis/ctl/pom.xml b/protocols/isis/ctl/pom.xml
index e366f62..588cbce 100644
--- a/protocols/isis/ctl/pom.xml
+++ b/protocols/isis/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-isis-ctl</artifactId>
diff --git a/protocols/isis/isisio/pom.xml b/protocols/isis/isisio/pom.xml
index 5d29fbb..35bf4db 100644
--- a/protocols/isis/isisio/pom.xml
+++ b/protocols/isis/isisio/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-isis-isisio</artifactId>
diff --git a/protocols/isis/pom.xml b/protocols/isis/pom.xml
index 83c1955..cf9475b 100644
--- a/protocols/isis/pom.xml
+++ b/protocols/isis/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-isis</artifactId>
diff --git a/protocols/lisp/api/pom.xml b/protocols/lisp/api/pom.xml
index 0c40f31..4e9fa96 100644
--- a/protocols/lisp/api/pom.xml
+++ b/protocols/lisp/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-lisp-api</artifactId>
diff --git a/protocols/lisp/ctl/pom.xml b/protocols/lisp/ctl/pom.xml
index 241c40e..4ecef1f 100644
--- a/protocols/lisp/ctl/pom.xml
+++ b/protocols/lisp/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-lisp-ctl</artifactId>
diff --git a/protocols/lisp/msg/pom.xml b/protocols/lisp/msg/pom.xml
index d21bc2c..514ffb4 100644
--- a/protocols/lisp/msg/pom.xml
+++ b/protocols/lisp/msg/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-lisp-msg</artifactId>
diff --git a/protocols/lisp/pom.xml b/protocols/lisp/pom.xml
index fdcb1fc..4ce367e 100644
--- a/protocols/lisp/pom.xml
+++ b/protocols/lisp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-lisp</artifactId>
diff --git a/protocols/netconf/api/pom.xml b/protocols/netconf/api/pom.xml
index f7ef71c..867f402 100644
--- a/protocols/netconf/api/pom.xml
+++ b/protocols/netconf/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-netconf-api</artifactId>
diff --git a/protocols/netconf/ctl/pom.xml b/protocols/netconf/ctl/pom.xml
index 81a6a9a..ab6cdfd 100644
--- a/protocols/netconf/ctl/pom.xml
+++ b/protocols/netconf/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-netconf-ctl</artifactId>
diff --git a/protocols/netconf/pom.xml b/protocols/netconf/pom.xml
index 9e6448e..ad9294a 100644
--- a/protocols/netconf/pom.xml
+++ b/protocols/netconf/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-netconf</artifactId>
diff --git a/protocols/openflow/api/pom.xml b/protocols/openflow/api/pom.xml
index 6d3388e..df29899 100644
--- a/protocols/openflow/api/pom.xml
+++ b/protocols/openflow/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-of-api</artifactId>
diff --git a/protocols/openflow/ctl/pom.xml b/protocols/openflow/ctl/pom.xml
index 3880cd9..b7ba81d 100644
--- a/protocols/openflow/ctl/pom.xml
+++ b/protocols/openflow/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-of-ctl</artifactId>
diff --git a/protocols/openflow/pom.xml b/protocols/openflow/pom.xml
index 0557e4e..1c09efd 100644
--- a/protocols/openflow/pom.xml
+++ b/protocols/openflow/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-of</artifactId>
diff --git a/protocols/ospf/api/pom.xml b/protocols/ospf/api/pom.xml
index cca5410..816195e 100755
--- a/protocols/ospf/api/pom.xml
+++ b/protocols/ospf/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ospf-api</artifactId>
diff --git a/protocols/ospf/ctl/pom.xml b/protocols/ospf/ctl/pom.xml
index 6561987..e06b877 100755
--- a/protocols/ospf/ctl/pom.xml
+++ b/protocols/ospf/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ospf-ctl</artifactId>
diff --git a/protocols/ospf/pom.xml b/protocols/ospf/pom.xml
index a601f4a..c1cdbc5 100755
--- a/protocols/ospf/pom.xml
+++ b/protocols/ospf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ospf</artifactId>
diff --git a/protocols/ospf/protocol/pom.xml b/protocols/ospf/protocol/pom.xml
index 4c04713..41a4b06 100644
--- a/protocols/ospf/protocol/pom.xml
+++ b/protocols/ospf/protocol/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ospf-protocol</artifactId>
diff --git a/protocols/ovsdb/api/pom.xml b/protocols/ovsdb/api/pom.xml
index e320ac9..34998ea 100644
--- a/protocols/ovsdb/api/pom.xml
+++ b/protocols/ovsdb/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <artifactId>onos-ovsdb-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/protocols/ovsdb/ctl/pom.xml b/protocols/ovsdb/ctl/pom.xml
index 0fbb30e..321e333 100644
--- a/protocols/ovsdb/ctl/pom.xml
+++ b/protocols/ovsdb/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ovsdb-ctl</artifactId>
diff --git a/protocols/ovsdb/pom.xml b/protocols/ovsdb/pom.xml
index 04b48a3..db64493 100644
--- a/protocols/ovsdb/pom.xml
+++ b/protocols/ovsdb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ovsdb</artifactId>
diff --git a/protocols/ovsdb/rfc/pom.xml b/protocols/ovsdb/rfc/pom.xml
index ecade6c..fdfe632 100644
--- a/protocols/ovsdb/rfc/pom.xml
+++ b/protocols/ovsdb/rfc/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <artifactId>onos-ovsdb-rfc</artifactId>
     <packaging>bundle</packaging>
diff --git a/protocols/pcep/api/pom.xml b/protocols/pcep/api/pom.xml
index 5df1446..8c42555 100644
--- a/protocols/pcep/api/pom.xml
+++ b/protocols/pcep/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-pcep-controller-api</artifactId>
diff --git a/protocols/pcep/ctl/pom.xml b/protocols/pcep/ctl/pom.xml
index 955f290..e3ecd2d 100644
--- a/protocols/pcep/ctl/pom.xml
+++ b/protocols/pcep/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-pcep-controller-impl</artifactId>
diff --git a/protocols/pcep/pcepio/pom.xml b/protocols/pcep/pcepio/pom.xml
index e161b7f..bae68b1 100755
--- a/protocols/pcep/pcepio/pom.xml
+++ b/protocols/pcep/pcepio/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-pcepio</artifactId>
diff --git a/protocols/pcep/pom.xml b/protocols/pcep/pom.xml
index 8b42658..807d663 100755
--- a/protocols/pcep/pom.xml
+++ b/protocols/pcep/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-pcep-controller</artifactId>
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 34388ab..b853121 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-protocols</artifactId>
diff --git a/protocols/rest/api/pom.xml b/protocols/rest/api/pom.xml
index fe4ceaa..40c8682 100644
--- a/protocols/rest/api/pom.xml
+++ b/protocols/rest/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-restsb</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-restsb-api</artifactId>
diff --git a/protocols/rest/ctl/pom.xml b/protocols/rest/ctl/pom.xml
index c3c2cc3..2280af7 100644
--- a/protocols/rest/ctl/pom.xml
+++ b/protocols/rest/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-restsb</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/rest/pom.xml b/protocols/rest/pom.xml
index 4b34d67..42bbee6 100644
--- a/protocols/rest/pom.xml
+++ b/protocols/rest/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/restconf/client/api/pom.xml b/protocols/restconf/client/api/pom.xml
index 5753b3a..225e0c0 100644
--- a/protocols/restconf/client/api/pom.xml
+++ b/protocols/restconf/client/api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-restconf-client</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>onos-restconf-client-api</artifactId>
diff --git a/protocols/restconf/client/ctl/pom.xml b/protocols/restconf/client/ctl/pom.xml
index 6410f3b..5f5cd21 100644
--- a/protocols/restconf/client/ctl/pom.xml
+++ b/protocols/restconf/client/ctl/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-restconf-client</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>onos-restconf-client-ctl</artifactId>
diff --git a/protocols/restconf/client/pom.xml b/protocols/restconf/client/pom.xml
index 3aadf2f..c1fac1a 100644
--- a/protocols/restconf/client/pom.xml
+++ b/protocols/restconf/client/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-restconf</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>onos-restconf-client</artifactId>
diff --git a/protocols/restconf/pom.xml b/protocols/restconf/pom.xml
index 2f2909e..2e3906f 100644
--- a/protocols/restconf/pom.xml
+++ b/protocols/restconf/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-protocols</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
   </parent>
 
   <artifactId>onos-restconf</artifactId>
diff --git a/protocols/restconf/server/api/pom.xml b/protocols/restconf/server/api/pom.xml
index ffa187b..1283e53 100644
--- a/protocols/restconf/server/api/pom.xml
+++ b/protocols/restconf/server/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/app/pom.xml b/protocols/restconf/server/app/pom.xml
index eae0c9e..6520394 100644
--- a/protocols/restconf/server/app/pom.xml
+++ b/protocols/restconf/server/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/pom.xml b/protocols/restconf/server/pom.xml
index 8660fa2..24f3aac 100644
--- a/protocols/restconf/server/pom.xml
+++ b/protocols/restconf/server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/restconfmgr/pom.xml b/protocols/restconf/server/restconfmgr/pom.xml
index 404a129..6e17290 100644
--- a/protocols/restconf/server/restconfmgr/pom.xml
+++ b/protocols/restconf/server/restconfmgr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/rpp/pom.xml b/protocols/restconf/server/rpp/pom.xml
index 68c6a78..302efa1 100644
--- a/protocols/restconf/server/rpp/pom.xml
+++ b/protocols/restconf/server/rpp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/utils/pom.xml b/protocols/restconf/server/utils/pom.xml
index 838780c..838c2ba 100644
--- a/protocols/restconf/server/utils/pom.xml
+++ b/protocols/restconf/server/utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>onos-restconf-server</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/snmp/api/pom.xml b/protocols/snmp/api/pom.xml
index 464d6ce..a22a132 100644
--- a/protocols/snmp/api/pom.xml
+++ b/protocols/snmp/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-snmp-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/snmp/ctl/pom.xml b/protocols/snmp/ctl/pom.xml
index 881135c..7bb2a52 100644
--- a/protocols/snmp/ctl/pom.xml
+++ b/protocols/snmp/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-snmp-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-api</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/protocols/snmp/pom.xml b/protocols/snmp/pom.xml
index 1ebf7f1..6321c1b2 100644
--- a/protocols/snmp/pom.xml
+++ b/protocols/snmp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/bgp/app/pom.xml b/providers/bgp/app/pom.xml
index 13d4248..fceb65d 100755
--- a/providers/bgp/app/pom.xml
+++ b/providers/bgp/app/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-bgp-app</artifactId>
diff --git a/providers/bgp/cfg/pom.xml b/providers/bgp/cfg/pom.xml
index 9a7da6f..2bb0b9e 100755
--- a/providers/bgp/cfg/pom.xml
+++ b/providers/bgp/cfg/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <artifactId>onos-bgp-provider-cfg</artifactId>
     <packaging>bundle</packaging>
diff --git a/providers/bgp/pom.xml b/providers/bgp/pom.xml
index 01cc7e3..42a534a 100644
--- a/providers/bgp/pom.xml
+++ b/providers/bgp/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
   </parent>
   <artifactId>onos-bgp-providers</artifactId>
   <packaging>pom</packaging>
diff --git a/providers/bgp/topology/pom.xml b/providers/bgp/topology/pom.xml
index 18b5d79..4f83829 100755
--- a/providers/bgp/topology/pom.xml
+++ b/providers/bgp/topology/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-bgp-providers</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
   </parent>
   <artifactId>onos-bgp-provider-topology</artifactId>
   <packaging>bundle</packaging>
diff --git a/providers/bgpcep/app/pom.xml b/providers/bgpcep/app/pom.xml
index 19323db..84d1623 100644
--- a/providers/bgpcep/app/pom.xml
+++ b/providers/bgpcep/app/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgpcep-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-bgpcep-app</artifactId>
diff --git a/providers/bgpcep/flow/pom.xml b/providers/bgpcep/flow/pom.xml
index b363827..b6a43b1 100644
--- a/providers/bgpcep/flow/pom.xml
+++ b/providers/bgpcep/flow/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgpcep-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-bgpcep-provider-flow</artifactId>
diff --git a/providers/bgpcep/pom.xml b/providers/bgpcep/pom.xml
index 2b37cdc..8ea7842 100644
--- a/providers/bgpcep/pom.xml
+++ b/providers/bgpcep/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
   </parent>
 
   <artifactId>onos-bgpcep-providers</artifactId>
diff --git a/providers/bmv2/app/pom.xml b/providers/bmv2/app/pom.xml
index 03f99eb..738bed5 100644
--- a/providers/bmv2/app/pom.xml
+++ b/providers/bmv2/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/providers/bmv2/device/pom.xml b/providers/bmv2/device/pom.xml
index 1c83a0f..3ee5494 100644
--- a/providers/bmv2/device/pom.xml
+++ b/providers/bmv2/device/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/bmv2/packet/pom.xml b/providers/bmv2/packet/pom.xml
index 22198d6..ee5380c 100644
--- a/providers/bmv2/packet/pom.xml
+++ b/providers/bmv2/packet/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/bmv2/pom.xml b/providers/bmv2/pom.xml
index c7cdb84..3a9ddbd 100644
--- a/providers/bmv2/pom.xml
+++ b/providers/bmv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/providers/host/pom.xml b/providers/host/pom.xml
index 6ec378f..00dbc08 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-host-provider</artifactId>
diff --git a/providers/ietfte/app/pom.xml b/providers/ietfte/app/pom.xml
index 9d81da0..0097aef 100644
--- a/providers/ietfte/app/pom.xml
+++ b/providers/ietfte/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/ietfte/pom.xml b/providers/ietfte/pom.xml
index 87d7963..ba97d74 100644
--- a/providers/ietfte/pom.xml
+++ b/providers/ietfte/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -50,12 +50,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-yms-api</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-restconf-server-utils</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/providers/ietfte/topology/pom.xml b/providers/ietfte/topology/pom.xml
index ba29fa4..cd44142 100644
--- a/providers/ietfte/topology/pom.xml
+++ b/providers/ietfte/topology/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/providers/ietfte/tunnel/pom.xml b/providers/ietfte/tunnel/pom.xml
index 87b8e2e..53ab116 100755
--- a/providers/ietfte/tunnel/pom.xml
+++ b/providers/ietfte/tunnel/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
diff --git a/providers/ietfte/utils/pom.xml b/providers/ietfte/utils/pom.xml
index 1642559..a3947d7 100755
--- a/providers/ietfte/utils/pom.xml
+++ b/providers/ietfte/utils/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onos-ietfte-provider-utils</artifactId>
diff --git a/providers/isis/app/pom.xml b/providers/isis/app/pom.xml
index a85d752..a5912ab 100644
--- a/providers/isis/app/pom.xml
+++ b/providers/isis/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-isis-app</artifactId>
diff --git a/providers/isis/cfg/pom.xml b/providers/isis/cfg/pom.xml
index 9c4c662..e81df0f 100644
--- a/providers/isis/cfg/pom.xml
+++ b/providers/isis/cfg/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-isis-provider-cfg</artifactId>
diff --git a/providers/isis/cli/pom.xml b/providers/isis/cli/pom.xml
index 7cd1e7b..9c7c518 100644
--- a/providers/isis/cli/pom.xml
+++ b/providers/isis/cli/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-isis-provider-cli</artifactId>
diff --git a/providers/isis/pom.xml b/providers/isis/pom.xml
index e84c628..8177630 100644
--- a/providers/isis/pom.xml
+++ b/providers/isis/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-isis-providers</artifactId>
diff --git a/providers/isis/topology/pom.xml b/providers/isis/topology/pom.xml
index 9710bb5..68ff7f8 100644
--- a/providers/isis/topology/pom.xml
+++ b/providers/isis/topology/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-isis-provider-topology</artifactId>
diff --git a/providers/link/pom.xml b/providers/link/pom.xml
index 271bc82..0ea3a5b 100644
--- a/providers/link/pom.xml
+++ b/providers/link/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
 
diff --git a/providers/lisp/app/pom.xml b/providers/lisp/app/pom.xml
index 594ac98..7b239e8 100644
--- a/providers/lisp/app/pom.xml
+++ b/providers/lisp/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-lisp-app</artifactId>
diff --git a/providers/lisp/device/pom.xml b/providers/lisp/device/pom.xml
index 63fe7c3..75834f0 100644
--- a/providers/lisp/device/pom.xml
+++ b/providers/lisp/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-lisp-provider-device</artifactId>
diff --git a/providers/lisp/pom.xml b/providers/lisp/pom.xml
index df5c7b3..8a28420 100644
--- a/providers/lisp/pom.xml
+++ b/providers/lisp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-lisp-providers</artifactId>
diff --git a/providers/lldp/pom.xml b/providers/lldp/pom.xml
index 71d00ca..7bc305e 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-lldp-provider</artifactId>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-lldp-provider-common</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
 
         <dependency>
diff --git a/providers/lldpcommon/pom.xml b/providers/lldpcommon/pom.xml
index abf8947..67214c2 100644
--- a/providers/lldpcommon/pom.xml
+++ b/providers/lldpcommon/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
 
diff --git a/providers/netcfghost/pom.xml b/providers/netcfghost/pom.xml
index 5d42b95..9337bf3 100644
--- a/providers/netcfghost/pom.xml
+++ b/providers/netcfghost/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/netcfglinks/pom.xml b/providers/netcfglinks/pom.xml
index 6b6fa32..03f70ed 100644
--- a/providers/netcfglinks/pom.xml
+++ b/providers/netcfglinks/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-lldp-provider-common</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
 
         <dependency>
diff --git a/providers/netconf/alarm/pom.xml b/providers/netconf/alarm/pom.xml
index 967edd4..a961f2a 100644
--- a/providers/netconf/alarm/pom.xml
+++ b/providers/netconf/alarm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>onos-netconf-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/netconf/app/pom.xml b/providers/netconf/app/pom.xml
index f05181c..6f331a8 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-netconf-app</artifactId>
diff --git a/providers/netconf/device/pom.xml b/providers/netconf/device/pom.xml
index 0a76d1c..e33eb9c 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-netconf-provider-device</artifactId>
diff --git a/providers/netconf/pom.xml b/providers/netconf/pom.xml
index d193815..a81bbca 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-netconf-providers</artifactId>
diff --git a/providers/null/pom.xml b/providers/null/pom.xml
index 927862e..7cc2b1b 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-null-provider</artifactId>
diff --git a/providers/openflow/app/pom.xml b/providers/openflow/app/pom.xml
index bc93d2f..375084f 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-openflow</artifactId>
diff --git a/providers/openflow/base/pom.xml b/providers/openflow/base/pom.xml
index bfa3542..e430a14 100644
--- a/providers/openflow/base/pom.xml
+++ b/providers/openflow/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-openflow-base</artifactId>
diff --git a/providers/openflow/device/pom.xml b/providers/openflow/device/pom.xml
index 3e00ad8..4f9117b 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-of-provider-device</artifactId>
diff --git a/providers/openflow/flow/pom.xml b/providers/openflow/flow/pom.xml
index d3757dd..1b1b6d2 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-of-provider-flow</artifactId>
diff --git a/providers/openflow/group/pom.xml b/providers/openflow/group/pom.xml
index 75e5d7d..792543b 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-of-provider-group</artifactId>
diff --git a/providers/openflow/message/pom.xml b/providers/openflow/message/pom.xml
index 6a0180d..0d1cfc4 100644
--- a/providers/openflow/message/pom.xml
+++ b/providers/openflow/message/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-of-provider-message</artifactId>
diff --git a/providers/openflow/meter/pom.xml b/providers/openflow/meter/pom.xml
index af68ab0..8e13459 100644
--- a/providers/openflow/meter/pom.xml
+++ b/providers/openflow/meter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-of-provider-meter</artifactId>
diff --git a/providers/openflow/packet/pom.xml b/providers/openflow/packet/pom.xml
index bf95b68..093b6d9 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-of-provider-packet</artifactId>
diff --git a/providers/openflow/pom.xml b/providers/openflow/pom.xml
index b306780..b42bf7b 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-of-providers</artifactId>
diff --git a/providers/ospf/app/pom.xml b/providers/ospf/app/pom.xml
index cc95bd5..72bb1da 100644
--- a/providers/ospf/app/pom.xml
+++ b/providers/ospf/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/cfg/pom.xml b/providers/ospf/cfg/pom.xml
index 4e8143b..6dcda27 100644
--- a/providers/ospf/cfg/pom.xml
+++ b/providers/ospf/cfg/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/cli/pom.xml b/providers/ospf/cli/pom.xml
index cbc8a89..d9ece56 100644
--- a/providers/ospf/cli/pom.xml
+++ b/providers/ospf/cli/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/pom.xml b/providers/ospf/pom.xml
index a212ed3..88192c2 100644
--- a/providers/ospf/pom.xml
+++ b/providers/ospf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/topology/pom.xml b/providers/ospf/topology/pom.xml
index 74a2ffb..da149ea 100644
--- a/providers/ospf/topology/pom.xml
+++ b/providers/ospf/topology/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ovsdb/app/pom.xml b/providers/ovsdb/app/pom.xml
index 10284c5..30cf1e3 100644
--- a/providers/ovsdb/app/pom.xml
+++ b/providers/ovsdb/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ovsdatabase</artifactId>
diff --git a/providers/ovsdb/base/pom.xml b/providers/ovsdb/base/pom.xml
index 6e2a8bb..a768ddb 100644
--- a/providers/ovsdb/base/pom.xml
+++ b/providers/ovsdb/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ovsdb-base</artifactId>
diff --git a/providers/ovsdb/device/pom.xml b/providers/ovsdb/device/pom.xml
index cbc7f72..b06670b 100644
--- a/providers/ovsdb/device/pom.xml
+++ b/providers/ovsdb/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-device</artifactId>
diff --git a/providers/ovsdb/host/pom.xml b/providers/ovsdb/host/pom.xml
index 35feba1..a31c4c9 100644
--- a/providers/ovsdb/host/pom.xml
+++ b/providers/ovsdb/host/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-host</artifactId>
diff --git a/providers/ovsdb/pom.xml b/providers/ovsdb/pom.xml
index 8d73f19..9c5f87f 100644
--- a/providers/ovsdb/pom.xml
+++ b/providers/ovsdb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ovsdb-providers</artifactId>
diff --git a/providers/ovsdb/tunnel/pom.xml b/providers/ovsdb/tunnel/pom.xml
index 6d73f8c..3c9f561 100644
--- a/providers/ovsdb/tunnel/pom.xml
+++ b/providers/ovsdb/tunnel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-tunnel</artifactId>
diff --git a/providers/pcep/app/pom.xml b/providers/pcep/app/pom.xml
index cd7627f..06da12c 100644
--- a/providers/pcep/app/pom.xml
+++ b/providers/pcep/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-pcep</artifactId>
diff --git a/providers/pcep/pom.xml b/providers/pcep/pom.xml
index 8b3bdaf..88ca87c 100644
--- a/providers/pcep/pom.xml
+++ b/providers/pcep/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
   </parent>
   <artifactId>onos-pcep-providers</artifactId>
   <packaging>pom</packaging>
diff --git a/providers/pcep/topology/pom.xml b/providers/pcep/topology/pom.xml
index e13b0de..ad3dc94 100644
--- a/providers/pcep/topology/pom.xml
+++ b/providers/pcep/topology/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-pcep-providers</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
   </parent>
   <artifactId>onos-pcep-provider-topology</artifactId>
   <packaging>bundle</packaging>
diff --git a/providers/pcep/tunnel/pom.xml b/providers/pcep/tunnel/pom.xml
index cce5598..ed8edba 100644
--- a/providers/pcep/tunnel/pom.xml
+++ b/providers/pcep/tunnel/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <artifactId>onos-pcep-provider-tunnel</artifactId>
     <packaging>bundle</packaging>
diff --git a/providers/pom.xml b/providers/pom.xml
index 16aeee4..6fa2ff6 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-providers</artifactId>
diff --git a/providers/rest/app/pom.xml b/providers/rest/app/pom.xml
index 9fa6154..0caec20 100644
--- a/providers/rest/app/pom.xml
+++ b/providers/rest/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restsb-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/rest/device/pom.xml b/providers/rest/device/pom.xml
index e7da423..a1de69b 100644
--- a/providers/rest/device/pom.xml
+++ b/providers/rest/device/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-restsb-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/rest/pom.xml b/providers/rest/pom.xml
index c9a582d..147ca52 100644
--- a/providers/rest/pom.xml
+++ b/providers/rest/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/snmp/app/pom.xml b/providers/snmp/app/pom.xml
index 80173d6..a3e0960 100644
--- a/providers/snmp/app/pom.xml
+++ b/providers/snmp/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-snmp-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-snmp-app</artifactId>
diff --git a/providers/snmp/device/pom.xml b/providers/snmp/device/pom.xml
index df3e55d..df24365 100644
--- a/providers/snmp/device/pom.xml
+++ b/providers/snmp/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-snmp-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-snmp-provider-device</artifactId>
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-api</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-ctl</artifactId>
-            <version>1.8.4-SNAPSHOT</version>
+            <version>1.8.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
diff --git a/providers/snmp/pom.xml b/providers/snmp/pom.xml
index 6dc63cd..030ff55 100644
--- a/providers/snmp/pom.xml
+++ b/providers/snmp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-snmp-providers</artifactId>
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 7472c6d..0cf7cf2 100644
--- a/tools/build/envDefaults
+++ b/tools/build/envDefaults
@@ -18,7 +18,7 @@
 export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)}
 
 # ONOS Version and onos.tar.gz staging environment
-export ONOS_POM_VERSION="1.8.4-SNAPSHOT"
+export ONOS_POM_VERSION="1.8.4"
 export ONOS_VERSION=${ONOS_VERSION:-1.8.4.$BUILD_NUMBER}
 
 # ONOS production bits (onos.tar.gz, onos.zip, onos.deb, onos.rpm) staging environment
diff --git a/tools/build/onos-prepare-sonar b/tools/build/onos-prepare-sonar
index 20b782e..e11bf1a 100755
--- a/tools/build/onos-prepare-sonar
+++ b/tools/build/onos-prepare-sonar
@@ -12,7 +12,7 @@
 from subprocess import call, check_call, check_output
 
 # FIXME pull the version from the Buck version file
-ONOS_VERSION='1.8.4-SNAPSHOT'
+ONOS_VERSION='1.8.4'
 
 # SonarQube property file name and template
 FILE_NAME = 'sonar-project.properties'
diff --git a/tools/package/archetypes/api/pom.xml b/tools/package/archetypes/api/pom.xml
index af9be59..3316ec6 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.8.4-SNAPSHOT</version>
+    <version>1.8.4</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 9c80120..99e2f0c 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
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.4-SNAPSHOT</onos.version>
+        <onos.version>1.8.4</onos.version>
     </properties>
 
     <dependencies>
diff --git a/tools/package/archetypes/bundle/pom.xml b/tools/package/archetypes/bundle/pom.xml
index 449c0f1..cbcbfbb 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.8.4-SNAPSHOT</version>
+    <version>1.8.4</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 12953c7..0af00a9 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
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.4-SNAPSHOT</onos.version>
+        <onos.version>1.8.4</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/cli/pom.xml b/tools/package/archetypes/cli/pom.xml
index 9c59b2a..acae5d1 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.8.4-SNAPSHOT</version>
+    <version>1.8.4</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 f87bebb..4b3bdb7 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
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.4-SNAPSHOT</onos.version>
+        <onos.version>1.8.4</onos.version>
     </properties>
 
     <dependencies>
diff --git a/tools/package/archetypes/pom.xml b/tools/package/archetypes/pom.xml
index 5dbb165..4e82e48 100644
--- a/tools/package/archetypes/pom.xml
+++ b/tools/package/archetypes/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
     <packaging>pom</packaging>
 
     <description>ONOS archetypes project</description>
diff --git a/tools/package/archetypes/rest/pom.xml b/tools/package/archetypes/rest/pom.xml
index 16c3df7..b4c1354 100644
--- a/tools/package/archetypes/rest/pom.xml
+++ b/tools/package/archetypes/rest/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
   </parent>
 
   <artifactId>onos-rest-archetype</artifactId>
diff --git a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
index 4962b48..6099b7a 100644
--- a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.4-SNAPSHOT</onos.version>
+        <onos.version>1.8.4</onos.version>
 
         <web.context>/onos/${artifactId}</web.context>
         <api.version>1.0.0</api.version>
diff --git a/tools/package/archetypes/ui/pom.xml b/tools/package/archetypes/ui/pom.xml
index ddace9d..ac9436f 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.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
   </parent>
 
   <artifactId>onos-ui-archetype</artifactId>
diff --git a/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
index 7161637..d5da24c 100644
--- a/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.4-SNAPSHOT</onos.version>
+        <onos.version>1.8.4</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/uitab/pom.xml b/tools/package/archetypes/uitab/pom.xml
index f7c772f..1685daa 100644
--- a/tools/package/archetypes/uitab/pom.xml
+++ b/tools/package/archetypes/uitab/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
   </parent>
 
   <artifactId>onos-uitab-archetype</artifactId>
diff --git a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
index 6baab8e..22ee303 100644
--- a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.4-SNAPSHOT</onos.version>
+        <onos.version>1.8.4</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/uitopo/pom.xml b/tools/package/archetypes/uitopo/pom.xml
index e37bc1b..cd62a16 100644
--- a/tools/package/archetypes/uitopo/pom.xml
+++ b/tools/package/archetypes/uitopo/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.4</version>
   </parent>
 
   <artifactId>onos-uitopo-archetype</artifactId>
diff --git a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
index 00611fe..78f620f 100644
--- a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.4-SNAPSHOT</onos.version>
+        <onos.version>1.8.4</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/branding/pom.xml b/tools/package/branding/pom.xml
index 86c6294..819dd49 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/tools/test/bin/onos-archetypes-test b/tools/test/bin/onos-archetypes-test
index ada9eb2..044b9d9 100755
--- a/tools/test/bin/onos-archetypes-test
+++ b/tools/test/bin/onos-archetypes-test
@@ -19,7 +19,7 @@
 set -e
 
 export AROOT=${ONOS_STAGE_ROOT:-/tmp}/foo
-export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.8.4-SNAPSHOT"
+export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.8.4"
 
 mkdir -p $AROOT
 for an in api bundle cli rest ui uitab uitopo; do
diff --git a/utils/junit/pom.xml b/utils/junit/pom.xml
index 0d522ff..00d5042 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onlab-junit</artifactId>
diff --git a/utils/misc/pom.xml b/utils/misc/pom.xml
index 7227ff9..a95f607 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onlab-misc</artifactId>
diff --git a/utils/osgi/pom.xml b/utils/osgi/pom.xml
index b21e04d..2de22a9 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onlab-osgi</artifactId>
diff --git a/utils/osgiwrap/pom.xml b/utils/osgiwrap/pom.xml
index 1076d57..e4c2abe 100644
--- a/utils/osgiwrap/pom.xml
+++ b/utils/osgiwrap/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onlab-utils</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/pom.xml b/utils/pom.xml
index 964d8af..888dbcf 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onlab-utils</artifactId>
diff --git a/utils/rest/pom.xml b/utils/rest/pom.xml
index aa88590..6faf602 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onlab-rest</artifactId>
diff --git a/web/api/pom.xml b/web/api/pom.xml
index 3953185..6ecc539 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-rest</artifactId>
diff --git a/web/gui/pom.xml b/web/gui/pom.xml
index 74dbe73..a67d7ef 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.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-gui</artifactId>
diff --git a/web/pom.xml b/web/pom.xml
index cbf2cb5..974da1c 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.4-SNAPSHOT</version>
+        <version>1.8.4</version>
     </parent>
 
     <artifactId>onos-web</artifactId>