Author: dblevins Date: Thu May 28 07:03:49 2009 New Revision: 779458 URL: http://svn.apache.org/viewvc?rev=779458&view=rev Log: Merging r779453 - http://svn.apache.org/viewvc?rev=779453&view=rev
svn merge -r 779452:779453 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 . ------------------------------------------------------------------------ r779453 | dblevins | 2009-05-27 23:46:14 -0700 (Wed, 27 May 2009) | 2 lines Updated for latest xbean changes ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.1/ (props changed) openejb/branches/openejb-3.1.1/container/openejb-core/pom.xml openejb/branches/openejb-3.1.1/itests/openejb-itests-client/pom.xml openejb/branches/openejb-3.1.1/pom.xml Propchange: openejb/branches/openejb-3.1.1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 28 07:03:49 2009 @@ -1 +1 @@ -/openejb/trunk/openejb3:778585,778808,778810 +/openejb/trunk/openejb3:778585,778808,778810,779453 Modified: openejb/branches/openejb-3.1.1/container/openejb-core/pom.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/container/openejb-core/pom.xml?rev=779458&r1=779457&r2=779458&view=diff ============================================================================== --- openejb/branches/openejb-3.1.1/container/openejb-core/pom.xml (original) +++ openejb/branches/openejb-3.1.1/container/openejb-core/pom.xml Thu May 28 07:03:49 2009 @@ -165,7 +165,7 @@ </manifest> <manifestEntries> <Class-Path>openejb-loader-${version}.jar openejb-client-${version}.jar - xbean-finder-${xbeanVersion}.jar xbean-asm-shaded-${xbeanVersion}.jar</Class-Path> + xbean-finder-shaded-${xbeanVersion}.jar xbean-asm-shaded-${xbeanVersion}.jar</Class-Path> <J2EE-DeploymentFactory-Implementation-Class> org.apache.openejb.config.VmDeploymentFactory</J2EE-DeploymentFactory-Implementation-Class> </manifestEntries> @@ -321,7 +321,7 @@ </dependency> <dependency> <groupId>org.apache.xbean</groupId> - <artifactId>xbean-finder</artifactId> + <artifactId>xbean-finder-shaded</artifactId> </dependency> <dependency> <groupId>org.apache.xbean</groupId> Modified: openejb/branches/openejb-3.1.1/itests/openejb-itests-client/pom.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/itests/openejb-itests-client/pom.xml?rev=779458&r1=779457&r2=779458&view=diff ============================================================================== --- openejb/branches/openejb-3.1.1/itests/openejb-itests-client/pom.xml (original) +++ openejb/branches/openejb-3.1.1/itests/openejb-itests-client/pom.xml Thu May 28 07:03:49 2009 @@ -114,7 +114,7 @@ </dependency> <dependency> <groupId>org.apache.xbean</groupId> - <artifactId>xbean-finder</artifactId> + <artifactId>xbean-finder-shaded</artifactId> </dependency> </dependencies> </project> Modified: openejb/branches/openejb-3.1.1/pom.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/pom.xml?rev=779458&r1=779457&r2=779458&view=diff ============================================================================== --- openejb/branches/openejb-3.1.1/pom.xml (original) +++ openejb/branches/openejb-3.1.1/pom.xml Thu May 28 07:03:49 2009 @@ -850,7 +850,7 @@ </dependency> <dependency> <groupId>org.apache.xbean</groupId> - <artifactId>xbean-finder</artifactId> + <artifactId>xbean-finder-shaded</artifactId> <version>${xbeanVersion}</version> </dependency> <dependency>
