From 72808d5c3a7452678b121def2b84b3ab70fe9690 Mon Sep 17 00:00:00 2001
From: Gary Tully <gtully@apache.org>
Date: Thu, 4 Sep 2008 10:33:37 +0000
Subject: [PATCH] fix https://issues.apache.org/activemq/browse/AMQ-1921 and
 renable MemoryPropertyTest which works fine with xbean 3.4

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@691959 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-core/pom.xml | 4 ----
 pom.xml               | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 695f0a9180..95441e0872 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -453,10 +453,6 @@
              <exclude>**/NetworkFailoverTest.*/**</exclude>
 
             <exclude>**/AMQDeadlockTest3.*</exclude>
-            <!-- This test will pass with an xbean 3.3 or > version but as of now xbean 3.3 
-                 is breaking the activemq-jpa module due to a broker qdox parser.  Once that's 
-                 fixed we can upgarde the version and enable this test again -->
-            <exclude>**/MemoryPropertyTest.*</exclude>
           </excludes>
         </configuration>
       </plugin>
diff --git a/pom.xml b/pom.xml
index ff58e327c4..8bf0a3df0b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
     <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
     <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
     <xstream-version>1.1.2</xstream-version>
-    <xbean-version>3.3</xbean-version>
+    <xbean-version>3.4</xbean-version>
     <felix-version>1.0.0</felix-version>
     <dist-repo-url>scpexe://people.apache.org/www/people.apache.org/repo/m2-incubating-repository</dist-repo-url>
     <m1-dist-repo-url>scpexe://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>