You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2010/05/21 00:07:23 UTC
svn commit: r946807 - /geronimo/server/branches/2.2/pom.xml
Author: kevan
Date: Thu May 20 22:07:22 2010
New Revision: 946807
URL: http://svn.apache.org/viewvc?rev=946807&view=rev
Log:
fix test failure that occurs with xbean-naming 3.7
Modified:
geronimo/server/branches/2.2/pom.xml
Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=946807&r1=946806&r2=946807&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Thu May 20 22:07:22 2010
@@ -73,6 +73,8 @@
<springVersion>2.5.6</springVersion>
<openjpaVersion>1.2.2</openjpaVersion>
<xbeanVersion>3.7</xbeanVersion>
+ <!-- For now, use XBean 3.6 to avoid jndi test failures on 3.7 -->
+ <xbeanNamingVersion>3.6</xbeanNamingVersion>
<jetty>jetty7</jetty>
<connectorSuffix />
@@ -420,12 +422,18 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<version>${xbeanVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-naming</artifactId>
- <version>${xbeanVersion}</version>
+ <version>${xbeanNamingVersion}</version>
</dependency>
<dependency>