You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ad...@apache.org on 2006/12/22 19:35:30 UTC
svn commit: r489718 - in /incubator/openejb/trunk/openejb3:
container/openejb-core/pom.xml container/openejb-loader/pom.xml pom.xml
Author: adc
Date: Fri Dec 22 10:35:29 2006
New Revision: 489718
URL: http://svn.apache.org/viewvc?view=rev&rev=489718
Log:
Temporary workaround for QDox issue
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml
incubator/openejb/trunk/openejb3/pom.xml
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=489718&r1=489717&r2=489718
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml Fri Dec 22 10:35:29 2006
@@ -86,8 +86,7 @@
<!--<addClasspath>true</addClasspath>-->
</manifest>
<manifestEntries>
- <Class-Path>openejb-loader-${pom.version}.jar
- xbean-finder-${removePropertyFromCorePomXbeanVersion}.jar</Class-Path>
+ <Class-Path>openejb-loader-${pom.version}.jar xbean-finder-${removePropertyFromCorePomXbeanVersion}.jar</Class-Path>
<J2EE-DeploymentFactory-Implementation-Class>org.apache.openejb.alt.config.VmDeploymentFactory</J2EE-DeploymentFactory-Implementation-Class>
</manifestEntries>
</archive>
@@ -97,6 +96,13 @@
<groupId>org.apache.xbean</groupId>
<artifactId>maven-xbean-plugin</artifactId>
<version>${xbeanVersion}</version>
+ <dependencies>
+ <dependency>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>${removePropertyFromPomQdoxVersion}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<goals>
@@ -106,9 +112,8 @@
</executions>
<configuration>
<namespace>http://openejb.apache.org/schemas/core</namespace>
- <excludedClasses>
- org.apache.openejb.alt.config.ejb,org.apache.openejb.util.io,org.apache.openejb.InterfaceType,org.apache.openejb.BeanType</excludedClasses>
- </configuration>
+ <excludedClasses>org.apache.openejb.alt.config.ejb,org.apache.openejb.util.io,org.apache.openejb.InterfaceType,org.apache.openejb.BeanType</excludedClasses>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml?view=diff&rev=489718&r1=489717&r2=489718
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml Fri Dec 22 10:35:29 2006
@@ -36,6 +36,13 @@
<groupId>org.apache.xbean</groupId>
<artifactId>maven-xbean-plugin</artifactId>
<version>${xbeanVersion}</version>
+ <dependencies>
+ <dependency>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>${removePropertyFromPomQdoxVersion}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<goals>
Modified: incubator/openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=489718&r1=489717&r2=489718
==============================================================================
--- incubator/openejb/trunk/openejb3/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/pom.xml Fri Dec 22 10:35:29 2006
@@ -97,7 +97,8 @@
<!--
- Used in openejb-core pom.xml
-->
- <xbeanVersion>2.8-SNAPSHOT</xbeanVersion>
+ <xbeanVersion>2.8-SNAPSHOT</xbeanVersion>
+
<!--
- Remove the property once it's been figured out how to instruct maven-assembly-plugin
- to copy SNAPSHOTs as SNAPSHOTs not 20061004.144417-3.
@@ -107,7 +108,13 @@
-
- Used in maven-jar-plugin in openejb-core pom.xml and below to declare xbean-finder dependency
-->
- <removePropertyFromCorePomXbeanVersion>2.8-SNAPSHOT</removePropertyFromCorePomXbeanVersion>
+ <removePropertyFromCorePomXbeanVersion>2.8-SNAPSHOT</removePropertyFromCorePomXbeanVersion>
+
+ <!--
+ - Remove the property once a version, subsequent to 1.6.1, is found that can parse
+ - org.apache.openejb.alt.config.DeploymentLoader. The enum seems to trip it up.
+ -->
+ <removePropertyFromPomQdoxVersion>1.6</removePropertyFromPomQdoxVersion>
</properties>
<build>
@@ -1114,6 +1121,11 @@
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>xerces</groupId>