8 files changed, 23 insertions, 13 deletions
diff --git a/java/client/src/main/java/client.bnd b/java/client/src/main/java/client.bnd
index cbaf3882fb..a8a33532fb 100755
--- a/java/client/src/main/java/client.bnd
+++ b/java/client/src/main/java/client.bnd
@@ -1,4 +1,4 @@
-ver: 0.5.0
+ver: 0.6.0
 
 Bundle-SymbolicName: qpid-client
 Bundle-Version: ${ver}
diff --git a/java/common/src/main/java/common.bnd b/java/common/src/main/java/common.bnd
index 11d26a8b4d..120a2401d3 100755
--- a/java/common/src/main/java/common.bnd
+++ b/java/common/src/main/java/common.bnd
@@ -1,4 +1,4 @@
-ver: 0.5.0
+ver: 0.6.0
 
 Bundle-SymbolicName: qpid-common
 Bundle-Version: ${ver}
diff --git a/java/management/common/src/main/java/management-common.bnd b/java/management/common/src/main/java/management-common.bnd
index 45a8b491af..f9744b7cc3 100644
--- a/java/management/common/src/main/java/management-common.bnd
+++ b/java/management/common/src/main/java/management-common.bnd
@@ -1,4 +1,4 @@
-ver: 0.5.0
+ver: 0.6.0
 
 Bundle-SymbolicName: qpid-management-common
 Bundle-Version: ${ver}
diff --git a/java/management/eclipse-plugin/META-INF/MANIFEST.MF b/java/management/eclipse-plugin/META-INF/MANIFEST.MF
index 9b5a240bb6..39b329089d 100644
--- a/java/management/eclipse-plugin/META-INF/MANIFEST.MF
+++ b/java/management/eclipse-plugin/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-ManifestVersion: 2
-Bundle-Name: Qpid Management Console Plug-in
+Bundle-Name: Qpid JMX Management Console Plug-in
 Bundle-SymbolicName: org.apache.qpid.management.ui; singleton:=true
-Bundle-Version: 0.1.0
+Bundle-Version: 0.6.0
 Bundle-Activator: org.apache.qpid.management.ui.Activator
 Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin
diff --git a/java/management/eclipse-plugin/build-release-common.properties b/java/management/eclipse-plugin/build-release-common.properties
index e4d75d7d56..7ccbd750cf 100644
--- a/java/management/eclipse-plugin/build-release-common.properties
+++ b/java/management/eclipse-plugin/build-release-common.properties
@@ -22,7 +22,7 @@
 app.namever=jmx-management-console-${project.version}
 
 artifact.id=org.apache.qpid.management.ui
-mcplugin.version=0.2.0-${project.version}
+mcplugin.version=${project.version}.0
 mcplugin.filename=${artifact.id}_${mcplugin.version}
 
 mcplugin.contents.dir=${module.classes}
@@ -31,4 +31,3 @@ mcplugin.manifest=${module.manifest}
 
 jmxremote.sasl.manifest=src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
 
-qpidmanagementcommon.manifest=src/main/resources/qpid-management-common-plugin/MANIFEST.MF
diff --git a/java/management/eclipse-plugin/build-release-macosx.xml b/java/management/eclipse-plugin/build-release-macosx.xml
index 3e3c47b6fb..2aa63d7f2f 100644
--- a/java/management/eclipse-plugin/build-release-macosx.xml
+++ b/java/management/eclipse-plugin/build-release-macosx.xml
@@ -18,13 +18,16 @@
  - under the License.
  -
  -->
-<project name="Eclipse Plugin MacOSX Binary Release" default="release-bin">
+<project name="JMX Management Console MacOSX Binary Release" default="release-bin">
 
    <import file="build-release.xml"/>
 
    <property name="release.app" value="${release.subdir}/${application.dir}"/>
 
    <target name="release-bin-qpid-mc-plugin">
+        <available file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar" property="management-eclipse-plugin.jar.present"/>
+        <fail unless="management-eclipse-plugin.jar.present" message="Please run ant build for the management-eclipse-plugin module"/>
+
         <!-- Copy the qpid management-eclipse-plugin module jar -->
         <copy tofile="${release.app}/plugins/${mcplugin.filename}.jar" flatten="true" failonerror="true">
             <fileset file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar"/>
@@ -39,9 +42,12 @@
    </target>
 
    <target name="release-bin-qpid-management-common-plugin">
+        <available file="${build.lib}/qpid-management-common_${project.version}.0.osgi.jar" property="management-common.jar.present"/>
+        <fail unless="management-common.jar.present" message="Please run ant bundle for the management-common module"/>
+
         <!-- Copy the qpid-management-common module osgi jar -->
        <copy todir="${release.app}/plugins" flatten="true" failonerror="true">
-           <fileset file="${build.lib}/qpid-management-common_${project.version}.osgi.jar"/>
+           <fileset file="${build.lib}/qpid-management-common_${project.version}.0.osgi.jar"/>
        </copy>
    </target>
 
diff --git a/java/management/eclipse-plugin/build-release.xml b/java/management/eclipse-plugin/build-release.xml
index f94f99d333..dec4cd5f32 100644
--- a/java/management/eclipse-plugin/build-release.xml
+++ b/java/management/eclipse-plugin/build-release.xml
@@ -18,7 +18,7 @@
  - under the License.
  -
  -->
-<project name="Eclipse Plugin Binary Release" default="release-bin">
+<project name="JMX Management Console Binary Release" default="release-bin">
 
 	<!-- check properties that must be set by caller -->
     <target name="check" description="ensure all required properties are set">
@@ -27,7 +27,6 @@
     	        <!-- common properties -->
                 <isset property ="mcplugin.filename"/>
                 <isset property ="jmxremote.sasl.manifest"/>
-                <isset property ="qpidmanagementcommon.manifest"/>
                 <!-- platform specific properties -->
                 <isset property ="qpidmc.ini"/>
                 <isset property ="qpidmc.executable"/>
@@ -59,6 +58,9 @@
     </target>
 
     <target name="release-bin-qpid-mc-plugin">
+       <available file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar" property="management-eclipse-plugin.jar.present"/>
+       <fail unless="management-eclipse-plugin.jar.present" message="Please run ant build for the management-eclipse-plugin module"/>
+
         <!-- Copy the qpid management-eclipse-plugin module jar -->
         <copy tofile="${release.subdir}/plugins/${mcplugin.filename}.jar" flatten="true" failonerror="true">
             <fileset file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar"/>
@@ -73,9 +75,12 @@
     </target>
 
     <target name="release-bin-qpid-management-common-plugin">
+	<available file="${build.lib}/qpid-management-common_${project.version}.0.osgi.jar" property="management-common.jar.present"/>
+	<fail unless="management-common.jar.present" message="Please run ant bundle for the management-common module"/>
+
         <!-- Copy the qpid-management-common module osgi jar -->
         <copy todir="${release.subdir}/plugins" failonerror="true">
-            <fileset file="${build.lib}/qpid-management-common_${project.version}.osgi.jar"/>
+            <fileset file="${build.lib}/qpid-management-common_${project.version}.0.osgi.jar"/>
         </copy>
     </target>
     
diff --git a/java/module.xml b/java/module.xml
index 6b5840737c..568359f7ea 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -50,7 +50,7 @@
   <property name="module.etc"          location="etc"/>
     
   <property name="module.namever"      value="${project.name}-${module.name}-${project.version}"/>
-  <property name="module.namever.osgi" value="${project.name}-${module.name}_${project.version}.osgi"/>
+  <property name="module.namever.osgi" value="${project.name}-${module.name}_${project.version}.0.osgi"/>
   <property name="module.release.base" value="${basedir}/release"/>
   <property name="module.release"      value="${module.release.base}/${module.namever}"/>
   <property name="module.release.lib"  value="${module.release}/lib"/>