diff options
-rw-r--r-- | cpp/RELEASE_NOTES | 4 | ||||
-rw-r--r-- | java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp | 2 | ||||
-rwxr-xr-x | java/client/src/main/java/client.bnd | 2 | ||||
-rw-r--r-- | java/common.xml | 2 | ||||
-rwxr-xr-x | java/common/src/main/java/common.bnd | 2 | ||||
-rwxr-xr-x | java/integrationtests/bin/interoptests.py | 10 | ||||
-rw-r--r-- | java/management/client/README.txt | 4 | ||||
-rw-r--r-- | java/release-docs/RELEASE_NOTES.txt | 8 | ||||
-rw-r--r-- | python/RELEASE_NOTES | 4 | ||||
-rw-r--r-- | ruby/RELEASE_NOTES | 4 |
10 files changed, 19 insertions, 23 deletions
diff --git a/cpp/RELEASE_NOTES b/cpp/RELEASE_NOTES index 40031e401f..0fd57803e4 100644 --- a/cpp/RELEASE_NOTES +++ b/cpp/RELEASE_NOTES @@ -1,7 +1,7 @@ -Apache Incubator Qpid C++ M3 Release Notes +Apache Incubator Qpid C++ M4 Release Notes ------------------------------------------- -The Qpid M3 release of the c++ client and broker support the 0-10 +The Qpid M4 release of the c++ client and broker support the 0-10 version of the AMQP specification. You can access this specification from: diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp index 2513eb691b..ee151426c6 100644 --- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_java_cpp +++ b/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/java/client/src/main/java/client.bnd b/java/client/src/main/java/client.bnd index 7ea88959f1..dbda0aad3b 100755 --- a/java/client/src/main/java/client.bnd +++ b/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/java/common.xml b/java/common.xml index b169e4942c..4ba43503d4 100644 --- a/java/common.xml +++ b/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/java/common/src/main/java/common.bnd b/java/common/src/main/java/common.bnd index 88890d14a6..a534451390 100755 --- a/java/common/src/main/java/common.bnd +++ b/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/java/integrationtests/bin/interoptests.py b/java/integrationtests/bin/interoptests.py index f5a50fc1eb..128b6da183 100755 --- a/java/integrationtests/bin/interoptests.py +++ b/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/java/management/client/README.txt b/java/management/client/README.txt index fead36c82b..ab9eb137be 100644 --- a/java/management/client/README.txt +++ b/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/java/release-docs/RELEASE_NOTES.txt b/java/release-docs/RELEASE_NOTES.txt index cdddbc4254..fd0653934d 100644 --- a/java/release-docs/RELEASE_NOTES.txt +++ b/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 diff --git a/python/RELEASE_NOTES b/python/RELEASE_NOTES index 0e75988ae9..e92e8c20b9 100644 --- a/python/RELEASE_NOTES +++ b/python/RELEASE_NOTES @@ -1,7 +1,7 @@ -Apache Incubator Qpid Python M3 Release Notes +Apache Incubator Qpid Python M4 Release Notes ------------------------------------------- -The Qpid M3 release of the python client contains support the for both +The Qpid M4 release of the python client contains support the for both 0-8 and 0-10 of the AMQP specification as well as support for the non-WIP portion of the 0-9 specification. You can access these specficiations from: diff --git a/ruby/RELEASE_NOTES b/ruby/RELEASE_NOTES index 1eae2e1ecb..7972181cb6 100644 --- a/ruby/RELEASE_NOTES +++ b/ruby/RELEASE_NOTES @@ -1,7 +1,7 @@ -Apache Incubator Qpid Ruby M3 Release Notes +Apache Incubator Qpid Ruby M4 Release Notes --------------------------------------------- -The Qpid M3 release of the ruby client contains support the for AMQP +The Qpid M4 release of the ruby client contains support the for AMQP 0-8 specification (as well as support for the non-WIP portion of the 0-9 specification). See: |