You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2009/05/28 13:39:08 UTC
svn commit: r779574 - in /openejb/branches/openejb-3.1.1: ./
assembly/openejb-itests-standalone-client/
assembly/openejb-itests-standalone-client/src/main/assembly/
container/openejb-core/ deps/ deps/xbean-asm-shaded/
deps/xbean-finder-shaded/ deps/xbe...
Author: dblevins
Date: Thu May 28 11:39:07 2009
New Revision: 779574
URL: http://svn.apache.org/viewvc?rev=779574&view=rev
Log:
Add shade modules to pull in svn revision shaps of xbean.
Finalize xbean version
Added:
openejb/branches/openejb-3.1.1/deps/xbean-asm-shaded/
- copied from r779545, openejb/branches/openejb-3.1.1/deps/xbean-finder-shaded/
Modified:
openejb/branches/openejb-3.1.1/assembly/openejb-itests-standalone-client/pom.xml
openejb/branches/openejb-3.1.1/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml
openejb/branches/openejb-3.1.1/container/openejb-core/pom.xml
openejb/branches/openejb-3.1.1/deps/pom.xml
openejb/branches/openejb-3.1.1/deps/xbean-asm-shaded/pom.xml
openejb/branches/openejb-3.1.1/deps/xbean-finder-shaded/pom.xml
openejb/branches/openejb-3.1.1/deps/xbean-reflect/pom.xml
openejb/branches/openejb-3.1.1/itests/openejb-itests-client/pom.xml
openejb/branches/openejb-3.1.1/pom.xml
openejb/branches/openejb-3.1.1/server/openejb-server/pom.xml
Modified: openejb/branches/openejb-3.1.1/assembly/openejb-itests-standalone-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/assembly/openejb-itests-standalone-client/pom.xml?rev=779574&r1=779573&r2=779574&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/assembly/openejb-itests-standalone-client/pom.xml (original)
+++ openejb/branches/openejb-3.1.1/assembly/openejb-itests-standalone-client/pom.xml Thu May 28 11:39:07 2009
@@ -61,7 +61,7 @@
<version>5.0-1</version>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>xbean-asm-shaded</artifactId>
<version>${xbeanVersion}</version>
</dependency>
Modified: openejb/branches/openejb-3.1.1/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml?rev=779574&r1=779573&r2=779574&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml (original)
+++ openejb/branches/openejb-3.1.1/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml Thu May 28 11:39:07 2009
@@ -54,8 +54,8 @@
<unpack>true</unpack>
<includes>
<include>org.apache.openejb:javaee-api</include>
- <include>org.apache.xbean:xbean-finder-shaded</include>
- <include>org.apache.xbean:xbean-asm-shaded</include>
+ <include>org.apache.openejb:xbean-finder-shaded</include>
+ <include>org.apache.openejb:xbean-asm-shaded</include>
<include>junit:junit</include>
<include>org.apache.openejb:openejb-itests-beans</include>
<include>org.apache.openejb:openejb-itests-servlets</include>
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=779574&r1=779573&r2=779574&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 11:39:07 2009
@@ -316,16 +316,19 @@
</dependency>
<!-- End: JavaMail -->
<dependency>
- <groupId>org.apache.xbean</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>xbean-asm-shaded</artifactId>
+ <version>${xbeanVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>xbean-finder-shaded</artifactId>
+ <version>${xbeanVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>xbean-reflect</artifactId>
+ <version>${xbeanVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -377,12 +380,13 @@
<version>2.5.5</version>
<scope>test</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>3.4.3</version>
<scope>test</scope>
</dependency>
+-->
</dependencies>
<profiles>
<profile>
Modified: openejb/branches/openejb-3.1.1/deps/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/deps/pom.xml?rev=779574&r1=779573&r2=779574&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/deps/pom.xml (original)
+++ openejb/branches/openejb-3.1.1/deps/pom.xml Thu May 28 11:39:07 2009
@@ -29,5 +29,8 @@
<modules>
<module>javaee-api</module>
+ <module>xbean-asm-shaded</module>
+ <module>xbean-finder-shaded</module>
+ <module>xbean-reflect</module>
</modules>
</project>
Modified: openejb/branches/openejb-3.1.1/deps/xbean-asm-shaded/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/deps/xbean-asm-shaded/pom.xml?rev=779574&r1=779545&r2=779574&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/deps/xbean-asm-shaded/pom.xml (original)
+++ openejb/branches/openejb-3.1.1/deps/xbean-asm-shaded/pom.xml Thu May 28 11:39:07 2009
@@ -20,13 +20,13 @@
<parent>
<artifactId>deps</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>3.0</version>
+ <version>3.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>xbean-finder</artifactId>
+ <artifactId>xbean-asm-shaded</artifactId>
<packaging>jar</packaging>
- <name>OpenEJB :: Dependencies :: XBean Finder</name>
- <version>3.4-r636442</version>
+ <name>OpenEJB :: Dependencies :: XBean ASM (shaded)</name>
+ <version>3.6-r779512</version>
<build>
<plugins>
@@ -48,8 +48,8 @@
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <version>3.4-r636442</version>
+ <artifactId>xbean-asm-shaded</artifactId>
+ <version>3.6-r779512</version>
</dependency>
</dependencies>
</project>
Modified: openejb/branches/openejb-3.1.1/deps/xbean-finder-shaded/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/deps/xbean-finder-shaded/pom.xml?rev=779574&r1=779573&r2=779574&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/deps/xbean-finder-shaded/pom.xml (original)
+++ openejb/branches/openejb-3.1.1/deps/xbean-finder-shaded/pom.xml Thu May 28 11:39:07 2009
@@ -20,13 +20,13 @@
<parent>
<artifactId>deps</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>3.0</version>
+ <version>3.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>xbean-finder</artifactId>
+ <artifactId>xbean-finder-shaded</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Dependencies :: XBean Finder</name>
- <version>3.4-r636442</version>
+ <version>3.6-r779512</version>
<build>
<plugins>
@@ -48,8 +48,8 @@
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <version>3.4-r636442</version>
+ <artifactId>xbean-finder-shaded</artifactId>
+ <version>3.6-r779512</version>
</dependency>
</dependencies>
</project>
Modified: openejb/branches/openejb-3.1.1/deps/xbean-reflect/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/deps/xbean-reflect/pom.xml?rev=779574&r1=779573&r2=779574&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/deps/xbean-reflect/pom.xml (original)
+++ openejb/branches/openejb-3.1.1/deps/xbean-reflect/pom.xml Thu May 28 11:39:07 2009
@@ -20,13 +20,13 @@
<parent>
<artifactId>deps</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>3.0</version>
+ <version>3.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-reflect</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: Dependencies :: XBean Reflect</name>
- <version>3.4-r636442</version>
+ <version>3.6-r779512</version>
<build>
<plugins>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
- <version>3.4-r636442</version>
+ <version>3.6-r779512</version>
</dependency>
</dependencies>
</project>
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=779574&r1=779573&r2=779574&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 11:39:07 2009
@@ -113,8 +113,14 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>xbean-finder-shaded</artifactId>
+ <version>${xbeanVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>xbean-asm-shaded</artifactId>
+ <version>${xbeanVersion}</version>
</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=779574&r1=779573&r2=779574&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/pom.xml (original)
+++ openejb/branches/openejb-3.1.1/pom.xml Thu May 28 11:39:07 2009
@@ -93,7 +93,7 @@
<properties>
<!-- This is used by a manifest classpath entry -->
- <xbeanVersion>3.6-SNAPSHOT</xbeanVersion>
+ <xbeanVersion>3.6-r779512</xbeanVersion>
<!-- OSGi bundles properties -->
<openejb.osgi.import.pkg>*</openejb.osgi.import.pkg>
@@ -257,6 +257,7 @@
</build>
<modules>
+
<module>api</module>
<module>itests</module>
<module>container</module>
@@ -850,29 +851,8 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder-shaded</artifactId>
- <version>${xbeanVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm-shaded</artifactId>
- <version>${xbeanVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
<artifactId>xbean-naming</artifactId>
- <version>${xbeanVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- <version>${xbeanVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </exclusion>
- </exclusions>
+ <version>3.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.swizzle</groupId>
Modified: openejb/branches/openejb-3.1.1/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.1/server/openejb-server/pom.xml?rev=779574&r1=779573&r2=779574&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.1/server/openejb-server/pom.xml (original)
+++ openejb/branches/openejb-3.1.1/server/openejb-server/pom.xml Thu May 28 11:39:07 2009
@@ -70,8 +70,9 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>xbean-asm-shaded</artifactId>
+ <version>${xbeanVersion}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>