updated version numbers and release notes for M4

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@714267 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 13 insertions, 17 deletions

diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
index 2513eb691b..ee151426c6 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp
@@ -7,6 +7,6 @@ java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.
 
 background "can receive messages" server_java
 clients $cpp/client
-#ps -ao pid,cmd | awk '/qpid-client-incubating-M3.jar/{ print $1 }' | xargs -r kill
+#ps -ao pid,cmd | awk '/qpid-client-incubating-M4.jar/{ print $1 }' | xargs -r kill
 kill %%
 outputs "$cpp/client.out | remove_uuid" "server_java.out | remove_uuid"
diff --git a/qpid/java/client/src/main/java/client.bnd b/qpid/java/client/src/main/java/client.bnd
index 7ea88959f1..dbda0aad3b 100755
--- a/qpid/java/client/src/main/java/client.bnd
+++ b/qpid/java/client/src/main/java/client.bnd
@@ -1,4 +1,4 @@
-ver: M3

+ver: M4

 

 Bundle-SymbolicName: qpid_client

 Bundle-Version: ${ver}

diff --git a/qpid/java/common.xml b/qpid/java/common.xml
index b169e4942c..4ba43503d4 100644
--- a/qpid/java/common.xml
+++ b/qpid/java/common.xml
@@ -23,7 +23,7 @@
   <dirname property="project.root" file="${ant.file.common}"/>
 
   <property name="project.name"          value="qpid"/>
-  <property name="project.version"       value="incubating-M3"/>
+  <property name="project.version"       value="incubating-M4"/>
   <property name="project.namever"       value="${project.name}-${project.version}"/>
 
   <property name="resources"             location="${project.root}/resources"/>
diff --git a/qpid/java/common/src/main/java/common.bnd b/qpid/java/common/src/main/java/common.bnd
index 88890d14a6..a534451390 100755
--- a/qpid/java/common/src/main/java/common.bnd
+++ b/qpid/java/common/src/main/java/common.bnd
@@ -1,4 +1,4 @@
-ver: M3

+ver: M4

 

 Bundle-SymbolicName: qpid_common

 Bundle-Version: ${ver}

diff --git a/qpid/java/integrationtests/bin/interoptests.py b/qpid/java/integrationtests/bin/interoptests.py
index f5a50fc1eb..128b6da183 100755
--- a/qpid/java/integrationtests/bin/interoptests.py
+++ b/qpid/java/integrationtests/bin/interoptests.py
@@ -27,11 +27,11 @@ interop_cases = ["InteropTestCase1DummyRun", "InteropTestCase2BasicP2P", "Intero
 interop_command = "java -cp %s org.apache.qpid.test.framework.distributedtesting.Coordinator --xml -e interop -o . -n interop org.apache.qpid.interop.testcases.%s"
 
 # TODO: read this from the ant properties file
-clientlibs = ["qpid-integrationtests-incubating-M3.jar",
-              "qpid-junit-toolkit-incubating-M3.jar",
+clientlibs = ["qpid-integrationtests-incubating-M4.jar",
+              "qpid-junit-toolkit-incubating-M4.jar",
               "junit-3.8.1.jar",
-              "qpid-systests-incubating-M3.jar",
-              "qpid-junit-toolkit-incubating-M3.jar",
+              "qpid-systests-incubating-M4.jar",
+              "qpid-junit-toolkit-incubating-M4.jar",
               "geronimo-jms_1.1_spec-1.0.jar",
               "log4j-1.2.12.jar"]
 
@@ -114,7 +114,7 @@ def start_java(javapath):
     classpath = classpath + javapath+"/lib/qpid-incubating.jar"        
 
     # Add qpid common since the tests need that, classpath hatefulness
-    classpath = classpath + ";"+testlibdir+"/qpid-common-incubating-M3.jar"
+    classpath = classpath + ";"+testlibdir+"/qpid-common-incubating-M4.jar"
     
     return Popen(["java", "-cp","\""+classpath+"\"",
                   "org.apache.qpid.test.framework.distributedtesting.TestClient"],
diff --git a/qpid/java/management/client/README.txt b/qpid/java/management/client/README.txt
index fead36c82b..ab9eb137be 100644
--- a/qpid/java/management/client/README.txt
+++ b/qpid/java/management/client/README.txt
@@ -89,8 +89,8 @@ QMan is able to connect with one or more brokers. In order to do that each broke
 <broker>

 

 *** DEPENDENCIES ***

-qpid-common-incubating-M3.jar (already part of qpid)

-qpid-client-incubating-M3.jar (already part of qpid)

+qpid-common-incubating-M4.jar (already part of qpid)

+qpid-client-incubating-M4.jar (already part of qpid)

 slf4j-api-1.4.0.jar (already part of qpid)

 slf4j-log4j12-1.4.0.jar (already part of qpid)

 mina-filter-ssl-1.0.1.jar (already part of qpid)

diff --git a/qpid/java/release-docs/RELEASE_NOTES.txt b/qpid/java/release-docs/RELEASE_NOTES.txt
index cdddbc4254..fd0653934d 100644
--- a/qpid/java/release-docs/RELEASE_NOTES.txt
+++ b/qpid/java/release-docs/RELEASE_NOTES.txt
@@ -1,7 +1,7 @@
-Apache Qpid Incubating Java M3 Release Notes
+Apache Qpid Incubating Java M4 Release Notes
 -------------------------------------------
 
-The Qpid M3 release contains support for AMQP 0-8, 0-9 and 0-10. You
+The Qpid M4 release contains support for AMQP 0-8, 0-9 and 0-10. You
 can access the specifications from
 http://www.amqp.org/tikiwiki/tiki-index.php?page=Download
 
@@ -29,10 +29,6 @@ Known Issues/Outstanding Work
 
 QPID-959: Fail over between a 0-9 and a 0-10 broker is not supported.
 
-QPID-1190: A "protocol not supported" exception is logged when a Java client
-connects to a Java broker because it initially attempts to negotiate
-AMQP 0-10. 
-
 QPID-1251: On windows platforms the following run time exception is thrown and displayed when initiating a connection with an 0.9 broker:
   Exception in thread "IoReceiver - localhost/localhost:5672"
   java.lang.RuntimeException: connection closed