diff --git a/apache-qpid-broker-j/pom.xml b/apache-qpid-broker-j/pom.xml
index 382d8fb..80c7b5c 100644
--- a/apache-qpid-broker-j/pom.xml
+++ b/apache-qpid-broker-j/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml
index 3678ba6..16352b7 100644
--- a/bdbstore/pom.xml
+++ b/bdbstore/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
   </parent>
 
   <artifactId>qpid-bdbstore</artifactId>
diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml
index 9a0d22e..1e5f766 100644
--- a/bdbstore/systests/pom.xml
+++ b/bdbstore/systests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-systests-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/broker-codegen/pom.xml b/broker-codegen/pom.xml
index 5975c03..eb38c4e 100644
--- a/broker-codegen/pom.xml
+++ b/broker-codegen/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
   </parent>
 
   <artifactId>qpid-broker-codegen</artifactId>
diff --git a/broker-core/pom.xml b/broker-core/pom.xml
index 744eae9..6ca935a 100644
--- a/broker-core/pom.xml
+++ b/broker-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
   </parent>
 
   <artifactId>qpid-broker-core</artifactId>
diff --git a/broker-plugins/access-control/pom.xml b/broker-plugins/access-control/pom.xml
index 7a110f3..f8824eb 100644
--- a/broker-plugins/access-control/pom.xml
+++ b/broker-plugins/access-control/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-0-10-protocol/pom.xml b/broker-plugins/amqp-0-10-protocol/pom.xml
index 010ffe9..cb429d9 100644
--- a/broker-plugins/amqp-0-10-protocol/pom.xml
+++ b/broker-plugins/amqp-0-10-protocol/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-0-8-protocol/pom.xml b/broker-plugins/amqp-0-8-protocol/pom.xml
index 3b30bef..edb78df 100644
--- a/broker-plugins/amqp-0-8-protocol/pom.xml
+++ b/broker-plugins/amqp-0-8-protocol/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-1-0-bdb-store/pom.xml b/broker-plugins/amqp-1-0-bdb-store/pom.xml
index 4e4c167..6a44358 100644
--- a/broker-plugins/amqp-1-0-bdb-store/pom.xml
+++ b/broker-plugins/amqp-1-0-bdb-store/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-broker-parent</artifactId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/broker-plugins/amqp-1-0-jdbc-store/pom.xml b/broker-plugins/amqp-1-0-jdbc-store/pom.xml
index fad6770..7a35835 100644
--- a/broker-plugins/amqp-1-0-jdbc-store/pom.xml
+++ b/broker-plugins/amqp-1-0-jdbc-store/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-broker-parent</artifactId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/broker-plugins/amqp-1-0-protocol/pom.xml b/broker-plugins/amqp-1-0-protocol/pom.xml
index 3207bc1..2632d65 100644
--- a/broker-plugins/amqp-1-0-protocol/pom.xml
+++ b/broker-plugins/amqp-1-0-protocol/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml b/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
index 7185a0c..e096414 100644
--- a/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
+++ b/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml b/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
index 0cf4294..7525a47 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
+++ b/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml b/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
index be85be5..1d8605d 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
+++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/derby-store/pom.xml b/broker-plugins/derby-store/pom.xml
index 5cb921e..834d1f1 100644
--- a/broker-plugins/derby-store/pom.xml
+++ b/broker-plugins/derby-store/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/jdbc-provider-bone/pom.xml b/broker-plugins/jdbc-provider-bone/pom.xml
index 0b73cf1..f011ca0 100644
--- a/broker-plugins/jdbc-provider-bone/pom.xml
+++ b/broker-plugins/jdbc-provider-bone/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/jdbc-store/pom.xml b/broker-plugins/jdbc-store/pom.xml
index c532a8a..ac81749 100644
--- a/broker-plugins/jdbc-store/pom.xml
+++ b/broker-plugins/jdbc-store/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/logging-logback/pom.xml b/broker-plugins/logging-logback/pom.xml
index f574c72..47a3f26 100644
--- a/broker-plugins/logging-logback/pom.xml
+++ b/broker-plugins/logging-logback/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/management-amqp/pom.xml b/broker-plugins/management-amqp/pom.xml
index bc25600..27bf7b1 100644
--- a/broker-plugins/management-amqp/pom.xml
+++ b/broker-plugins/management-amqp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>qpid-broker-parent</artifactId>
         <groupId>org.apache.qpid</groupId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/broker-plugins/management-http/pom.xml b/broker-plugins/management-http/pom.xml
index a1f8d1b..d38df25 100644
--- a/broker-plugins/management-http/pom.xml
+++ b/broker-plugins/management-http/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/memory-store/pom.xml b/broker-plugins/memory-store/pom.xml
index 8988d6c..904a02c 100644
--- a/broker-plugins/memory-store/pom.xml
+++ b/broker-plugins/memory-store/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/broker-plugins/websocket/pom.xml b/broker-plugins/websocket/pom.xml
index c2800ed..e97a2e7 100644
--- a/broker-plugins/websocket/pom.xml
+++ b/broker-plugins/websocket/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-broker-parent</artifactId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/broker/pom.xml b/broker/pom.xml
index 704f5a0..c184f74 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
   </parent>
 
   <artifactId>qpid-broker</artifactId>
diff --git a/doc/java-broker/pom.xml b/doc/java-broker/pom.xml
index 21f785f..dedf918 100644
--- a/doc/java-broker/pom.xml
+++ b/doc/java-broker/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-java-doc</artifactId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
     </parent>
 
     <artifactId>qpid-java-doc-broker</artifactId>
diff --git a/doc/java-perftests/pom.xml b/doc/java-perftests/pom.xml
index 9de6238..0be44b0 100644
--- a/doc/java-perftests/pom.xml
+++ b/doc/java-perftests/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-java-doc</artifactId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
     </parent>
 
     <artifactId>qpid-java-doc-perftests</artifactId>
diff --git a/doc/pom.xml b/doc/pom.xml
index ee6972a..de08e70 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-broker-parent</artifactId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
     </parent>
 
     <artifactId>qpid-java-doc</artifactId>
diff --git a/joramtests/pom.xml b/joramtests/pom.xml
index fc480b5..4a7419d 100644
--- a/joramtests/pom.xml
+++ b/joramtests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>qpid-broker-parent</artifactId>
         <groupId>org.apache.qpid</groupId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/perftests/pom.xml b/perftests/pom.xml
index 4b2db75..20c0568 100644
--- a/perftests/pom.xml
+++ b/perftests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
   </parent>
 
   <artifactId>qpid-perftests</artifactId>
diff --git a/perftests/visualisation-jfc/pom.xml b/perftests/visualisation-jfc/pom.xml
index 583c324..daf713d 100644
--- a/perftests/visualisation-jfc/pom.xml
+++ b/perftests/visualisation-jfc/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 6159c1f..4f9e00a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-parent</artifactId>
-  <version>7.0.4-SNAPSHOT</version>
+  <version>7.0.4</version>
   <packaging>pom</packaging>
 
   <name>Apache Qpid Broker-J Parent</name>
@@ -65,7 +65,7 @@
     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git</connection>
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git</developerConnection>
     <url>https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git</url>
-    <tag>7.0.x</tag>
+    <tag>7.0.4</tag>
   </scm>
 
   <distributionManagement>
diff --git a/qpid-perftests-systests/pom.xml b/qpid-perftests-systests/pom.xml
index 7414ef6..4aaa0a2 100644
--- a/qpid-perftests-systests/pom.xml
+++ b/qpid-perftests-systests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-systests-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../qpid-systests-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/qpid-systests-parent/pom.xml b/qpid-systests-parent/pom.xml
index fc85472..cff5c09 100644
--- a/qpid-systests-parent/pom.xml
+++ b/qpid-systests-parent/pom.xml
@@ -21,11 +21,11 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
   </parent>
 
   <artifactId>qpid-systests-parent</artifactId>
-  <version>7.0.4-SNAPSHOT</version>
+  <version>7.0.4</version>
   <packaging>pom</packaging>
   <name>Apache Qpid Broker-J System Test Parent</name>
   <description>Parent POM for Qpid system testing modules</description>
diff --git a/qpid-test-utils/pom.xml b/qpid-test-utils/pom.xml
index 432f7f1..74ec667 100644
--- a/qpid-test-utils/pom.xml
+++ b/qpid-test-utils/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
   </parent>
 
   <artifactId>qpid-test-utils</artifactId>
diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml
index 56ce649..cdef4fb 100644
--- a/systests/end-to-end-conversion-tests/pom.xml
+++ b/systests/end-to-end-conversion-tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/systests/pom.xml b/systests/pom.xml
index 94bec0d..32049a2 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-systests-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../qpid-systests-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/systests/protocol-tests-amqp-1-0/pom.xml b/systests/protocol-tests-amqp-1-0/pom.xml
index 01e8305..f05d603 100644
--- a/systests/protocol-tests-amqp-1-0/pom.xml
+++ b/systests/protocol-tests-amqp-1-0/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/protocol-tests-core/pom.xml b/systests/protocol-tests-core/pom.xml
index b54cc3d..a7bf292 100644
--- a/systests/protocol-tests-core/pom.xml
+++ b/systests/protocol-tests-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/systests/qpid-systests-jms_2.0/pom.xml b/systests/qpid-systests-jms_2.0/pom.xml
index d0b90f2..3a2ac82 100644
--- a/systests/qpid-systests-jms_2.0/pom.xml
+++ b/systests/qpid-systests-jms_2.0/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-systests-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
     <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/systests/systests-utils/pom.xml b/systests/systests-utils/pom.xml
index 67609d1..22b1ee5 100644
--- a/systests/systests-utils/pom.xml
+++ b/systests/systests-utils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-systests-parent</artifactId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
         <relativePath>../../qpid-systests-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/tck/pom.xml b/tck/pom.xml
index ab1ec99..55f5570 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>qpid-broker-parent</artifactId>
         <groupId>org.apache.qpid</groupId>
-        <version>7.0.4-SNAPSHOT</version>
+        <version>7.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/tools/pom.xml b/tools/pom.xml
index 7beb658..a466959 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-parent</artifactId>
-    <version>7.0.4-SNAPSHOT</version>
+    <version>7.0.4</version>
   </parent>
 
   <artifactId>qpid-tools</artifactId>