Title: [2631] branches/v2_1/openejb2/modules/openejb-builder: Give openejb-builder its geronimo-dependency.xml
- Revision
- 2631
- Author
- djencks
- Date
- 2006-04-28 21:15:41 -0400 (Fri, 28 Apr 2006)
Log Message
Give openejb-builder its geronimo-dependency.xml
Modified Paths
Diff
Modified: branches/v2_1/openejb2/modules/openejb-builder/maven.xml (2630 => 2631)
--- branches/v2_1/openejb2/modules/openejb-builder/maven.xml 2006-04-29 01:10:51 UTC (rev 2630)
+++ branches/v2_1/openejb2/modules/openejb-builder/maven.xml 2006-04-29 01:15:41 UTC (rev 2631)
@@ -8,11 +8,9 @@
xmlns:xmlbeans="xmlbeans2:maven">
<!-- Construct dependency lists for inclusion in generated jar. -->
-<!-- TODO THIS SHOULD BE ENABLED it doesn't work for me right now????
<postGoal name="java:compile">
<attainGoal name="geronimo:dependency"/>
</postGoal>
--->
<preGoal name="java:compile">
<xmlbeans:schema2java
Modified: branches/v2_1/openejb2/modules/openejb-builder/project.xml (2630 => 2631)
--- branches/v2_1/openejb2/modules/openejb-builder/project.xml 2006-04-29 01:10:51 UTC (rev 2630)
+++ branches/v2_1/openejb2/modules/openejb-builder/project.xml 2006-04-29 01:15:41 UTC (rev 2631)
@@ -43,8 +43,14 @@
<artifactId>stax-api</artifactId>
<version>${stax_api_version}</version>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-dependency-plugin</artifactId>
+ <version>${geronimo_dependency_plugin_version}</version>
+ <type>plugin</type>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${pom.currentVersion}</version>
@@ -213,8 +219,8 @@
<artifactId>geronimo-spec-corba</artifactId>
<version>${geronimo_spec_corba_version}</version>
<properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
@@ -451,13 +457,19 @@
<include>*.properties</include>
</includes>
</resource>
- <resource>
- <targetPath>META-INF/schema</targetPath>
- <directory>${basedir}/src/schema</directory>
- <includes>
- <include>openejb-jar.xsd</include>
- </includes>
- </resource>
+ <resource>
+ <directory>${basedir}/target/etc</directory>
+ <includes>
+ <include>META-INF/geronimo-dependency.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>META-INF/schema</targetPath>
+ <directory>${basedir}/src/schema</directory>
+ <includes>
+ <include>openejb-jar.xsd</include>
+ </includes>
+ </resource>
</resources>
<unitTest>
<includes>
