Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 35091 invoked from network); 1 Oct 2009 19:45:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Oct 2009 19:45:41 -0000 Received: (qmail 7904 invoked by uid 500); 1 Oct 2009 19:45:41 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 7848 invoked by uid 500); 1 Oct 2009 19:45:41 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 7839 invoked by uid 99); 1 Oct 2009 19:45:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2009 19:45:41 +0000 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, 01 Oct 2009 19:45:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DB8462388893; Thu, 1 Oct 2009 19:45:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r820764 - in /activemq/trunk: activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java pom.xml Date: Thu, 01 Oct 2009 19:45:17 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091001194517.DB8462388893@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Thu Oct 1 19:45:17 2009 New Revision: 820764 URL: http://svn.apache.org/viewvc?rev=820764&view=rev Log: AMQ-2313: Upgrade ApacheDS dependency to 1.5.5 - fixes issue wiht jaas LDAP tests on AIX/IBM jdk Modified: activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java activemq/trunk/pom.xml Modified: activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java?rev=820764&r1=820763&r2=820764&view=diff ============================================================================== --- activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java (original) +++ activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java Thu Oct 1 19:45:17 2009 @@ -40,12 +40,10 @@ import org.apache.directory.server.core.integ.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.annotations.CleanupLevel; import org.apache.directory.server.integ.SiRunner; -import org.apache.directory.server.ldap.LdapService; import org.junit.Test; import org.junit.runner.RunWith; - - +import org.apache.directory.server.ldap.LdapServer; @RunWith ( SiRunner.class ) @CleanupLevel ( Level.CLASS ) @@ -72,7 +70,7 @@ } private static final String BASE = "ou=system"; - public static LdapService ldapService; + public static LdapServer ldapServer; private static final String FILTER = "(objectclass=*)"; private static final String PRINCIPAL = "uid=admin,ou=system"; Modified: activemq/trunk/pom.xml URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=820764&r1=820763&r2=820764&view=diff ============================================================================== --- activemq/trunk/pom.xml (original) +++ activemq/trunk/pom.xml Thu Oct 1 19:45:17 2009 @@ -53,10 +53,7 @@ 1.1 1.4 1.0 - 0.3.2 - 0.5 - 0.7.3 - 1.5.4 + 1.5.5 1.0 0.1.8 1.7.2.2 @@ -64,7 +61,7 @@ 6.1.9 1.1 2.5.1 - 4.4 + 4.5 2.0 1.2.14 1.5.2