Title: [2627] branches/v2_1/openejb2/etc: GERONIMO-1875 rearrange dependencies for servers
- Revision
- 2627
- Author
- djencks
- Date
- 2006-04-27 21:08:08 -0400 (Thu, 27 Apr 2006)
Log Message
GERONIMO-1875 rearrange dependencies for servers
Modified Paths
Diff
Modified: branches/v2_1/openejb2/etc/project.xml (2626 => 2627)
--- branches/v2_1/openejb2/etc/project.xml 2006-04-27 21:17:09 UTC (rev 2626)
+++ branches/v2_1/openejb2/etc/project.xml 2006-04-28 01:08:08 UTC (rev 2627)
@@ -188,7 +188,7 @@
<resource>
<directory>${basedir}/target/etc</directory>
<includes>
- <include>META-INF/geronimo-service.xml</include>
+ <include>META-INF/geronimo-dependency.xml</include>
</includes>
</resource>
</resources>
Modified: branches/v2_1/openejb2/modules/core/project.xml (2626 => 2627)
--- branches/v2_1/openejb2/modules/core/project.xml 2006-04-27 21:17:09 UTC (rev 2626)
+++ branches/v2_1/openejb2/modules/core/project.xml 2006-04-28 01:08:08 UTC (rev 2627)
@@ -95,6 +95,9 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-timer</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
@@ -107,6 +110,9 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-axis</artifactId>
<version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
@@ -221,7 +227,19 @@
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
<version>${tranql_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
+ <!-- TODO this should be a transitive dependency of tranql, not here -->
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>${antlr_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
<dependency>
<groupId>axion</groupId>
Modified: branches/v2_1/openejb2/modules/openejb-builder/maven.xml (2626 => 2627)
--- branches/v2_1/openejb2/modules/openejb-builder/maven.xml 2006-04-27 21:17:09 UTC (rev 2626)
+++ branches/v2_1/openejb2/modules/openejb-builder/maven.xml 2006-04-28 01:08:08 UTC (rev 2627)
@@ -7,6 +7,13 @@
xmlns:ant="jelly:ant"
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
maven.xmlbeans2.sourceschema="schema/openejb-jar-2.1.xsd,schema/corba-tss-config-2.0.xsd,schema/corba-css-config-2.0.xsd"/>
Modified: branches/v2_1/openejb2/modules/openejb-builder/project.xml (2626 => 2627)
--- branches/v2_1/openejb2/modules/openejb-builder/project.xml 2006-04-27 21:17:09 UTC (rev 2626)
+++ branches/v2_1/openejb2/modules/openejb-builder/project.xml 2006-04-28 01:08:08 UTC (rev 2627)
@@ -48,6 +48,9 @@
<groupId>openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
