Return-Path: 
 <commits-return-9175-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 5410 invoked from network); 4 Sep 2008 10:34:31 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Sep 2008 10:34:31 -0000
Received: (qmail 84550 invoked by uid 500); 4 Sep 2008 10:34:29 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 84490 invoked by uid 500); 4 Sep 2008 10:34:28 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 84481 invoked by uid 99); 4 Sep 2008 10:34:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2008 03:34:28 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2008 10:33:38 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6BA4E23889C1; Thu,  4 Sep 2008 03:33:39 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r691959 - in /activemq/trunk: activemq-core/pom.xml
 pom.xml
Date: Thu, 04 Sep 2008 10:33:38 -0000
To: commits@activemq.apache.org
From: gtully@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080904103339.6BA4E23889C1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gtully
Date: Thu Sep  4 03:33:37 2008
New Revision: 691959

URL: http://svn.apache.org/viewvc?rev=691959&view=rev
Log:
fix https://issues.apache.org/activemq/browse/AMQ-1921 and renable MemoryPropertyTest which works fine with xbean 3.4

Modified:
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=691959&r1=691958&r2=691959&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Thu Sep  4 03:33:37 2008
@@ -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>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=691959&r1=691958&r2=691959&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Thu Sep  4 03:33:37 2008
@@ -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>