From aadaa7554e7ac9440c9878534852e9bdb3276176 Mon Sep 17 00:00:00 2001 From: Justin Ross Date: Thu, 3 Nov 2011 20:54:31 +0000 Subject: QPID-3583: Update trunk version from 0.13 to 0.15 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1197304 13f79535-47bb-0310-9956-ffa450edef68 --- java/bdbstore/bin/backup.sh | 2 +- java/bdbstore/bin/storeUpgrade.sh | 2 +- java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd | 2 +- java/broker/src/main/java/broker.bnd | 2 +- .../org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java | 4 ++-- java/client/src/main/java/client.bnd | 2 +- java/common.xml | 2 +- java/common/src/main/java/common.bnd | 2 +- java/ivy.xml | 2 +- java/management/common/src/main/java/management-common.bnd | 2 +- java/management/eclipse-plugin/META-INF/MANIFEST.MF | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) (limited to 'java') diff --git a/java/bdbstore/bin/backup.sh b/java/bdbstore/bin/backup.sh index 0e2f0fda09..22d8d52b58 100755 --- a/java/bdbstore/bin/backup.sh +++ b/java/bdbstore/bin/backup.sh @@ -31,7 +31,7 @@ WHEREAMI=`dirname $0` if [ -z "$QPID_HOME" ]; then export QPID_HOME=`cd $WHEREAMI/../ && pwd` fi -VERSION=0.13 +VERSION=0.15 LIBS=$QPID_HOME/lib/je-4.0.103.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar diff --git a/java/bdbstore/bin/storeUpgrade.sh b/java/bdbstore/bin/storeUpgrade.sh index 076b9d3f7e..f3b089b3d3 100755 --- a/java/bdbstore/bin/storeUpgrade.sh +++ b/java/bdbstore/bin/storeUpgrade.sh @@ -36,7 +36,7 @@ if [ -z "$BDB_HOME" ]; then export BDB_HOME=$(dirname $(dirname $(readlink -f $0))) fi -VERSION=0.13 +VERSION=0.15 LIBS=$BDB_HOME/lib/je-4.0.103.jar:$BDB_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar diff --git a/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd b/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd index f6ae79536d..c9e1371732 100755 --- a/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd +++ b/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.13.0 +ver: 0.15.0 Bundle-SymbolicName: qpid-shutdown-plugin Bundle-Version: ${ver} diff --git a/java/broker/src/main/java/broker.bnd b/java/broker/src/main/java/broker.bnd index 36c7d1a5b3..25b0495a63 100755 --- a/java/broker/src/main/java/broker.bnd +++ b/java/broker/src/main/java/broker.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.13.0 +ver: 0.15.0 Bundle-SymbolicName: qpid-broker Bundle-Version: ${ver} diff --git a/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java b/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java index 4a03445357..f2249c5931 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/plugins/OsgiSystemPackageUtilTest.java @@ -72,11 +72,11 @@ public class OsgiSystemPackageUtilTest extends QpidTestCase _map.put("org.apache.qpid.xyz", "1.0.0"); _map.put("org.abc", "1.2.3"); - _util = new OsgiSystemPackageUtil(new Version("0.13"), _map); + _util = new OsgiSystemPackageUtil(new Version("0.15"), _map); final String systemPackageString = _util.getFormattedSystemPackageString(); - assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz; version=0.13.0", systemPackageString); + assertEquals("org.abc; version=1.2.3, org.apache.qpid.xyz; version=0.15.0", systemPackageString); } public void testWithQpidPackageWithoutQpidReleaseNumberSet() throws Exception diff --git a/java/client/src/main/java/client.bnd b/java/client/src/main/java/client.bnd index 98696dc7d8..bd13844e8e 100755 --- a/java/client/src/main/java/client.bnd +++ b/java/client/src/main/java/client.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.13.0 +ver: 0.15.0 Bundle-SymbolicName: qpid-client Bundle-Version: ${ver} diff --git a/java/common.xml b/java/common.xml index c6688ee2de..26537e7dfc 100644 --- a/java/common.xml +++ b/java/common.xml @@ -23,7 +23,7 @@ - + diff --git a/java/common/src/main/java/common.bnd b/java/common/src/main/java/common.bnd index f12fbf9273..64e80c9b43 100755 --- a/java/common/src/main/java/common.bnd +++ b/java/common/src/main/java/common.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.13.0 +ver: 0.15.0 Bundle-SymbolicName: qpid-common Bundle-Version: ${ver} diff --git a/java/ivy.xml b/java/ivy.xml index bac2f3d6ee..899c5fa79b 100644 --- a/java/ivy.xml +++ b/java/ivy.xml @@ -18,7 +18,7 @@ - + diff --git a/java/management/common/src/main/java/management-common.bnd b/java/management/common/src/main/java/management-common.bnd index 5c39329f2f..5f7f8bede3 100644 --- a/java/management/common/src/main/java/management-common.bnd +++ b/java/management/common/src/main/java/management-common.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.13.0 +ver: 0.15.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 0df308dff1..f47bc86797 100644 --- a/java/management/eclipse-plugin/META-INF/MANIFEST.MF +++ b/java/management/eclipse-plugin/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-ManifestVersion: 2 Bundle-Name: Qpid JMX Management Console Plug-in Bundle-SymbolicName: org.apache.qpid.management.ui; singleton:=true -Bundle-Version: 0.13.0 +Bundle-Version: 0.15.0 Bundle-Activator: org.apache.qpid.management.ui.Activator Bundle-Vendor: Apache Software Foundation Bundle-Localization: plugin -- cgit v1.2.1