You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/01/16 19:30:20 UTC
svn commit: r125359 - /geronimo/trunk/specs/j2ee/maven.xml /geronimo/trunk/specs/j2ee/project.xml
Author: djencks
Date: Sun Jan 16 10:30:18 2005
New Revision: 125359
URL: http://svn.apache.org/viewcvs?view=rev&rev=125359
Log:
Explicitly specify what goes in the jar to avoid including velocity from parent project.xml
Modified:
geronimo/trunk/specs/j2ee/maven.xml
geronimo/trunk/specs/j2ee/project.xml
Modified: geronimo/trunk/specs/j2ee/maven.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/specs/j2ee/maven.xml?view=diff&rev=125359&p1=geronimo/trunk/specs/j2ee/maven.xml&r1=125358&p2=geronimo/trunk/specs/j2ee/maven.xml&r2=125359
==============================================================================
--- geronimo/trunk/specs/j2ee/maven.xml (original)
+++ geronimo/trunk/specs/j2ee/maven.xml Sun Jan 16 10:30:18 2005
@@ -44,7 +44,10 @@
<ant:include name="LICENSE.txt"/>
</ant:metainf>
<j:forEach var="artifact" items="${pom.artifacts}">
- <zipfileset src="${artifact.path}" excludes="META-INF/LICENSE.txt"/>
+ <j:set var="dependency" value="${artifact.dependency}"/>
+ <j:if test="${dependency.getProperty('geronimo.spec.bundle') == 'true'}">
+ <zipfileset src="${artifact.path}" excludes="META-INF/LICENSE.txt"/>
+ </j:if>
</j:forEach>
</ant:jar>
</j:if>
Modified: geronimo/trunk/specs/j2ee/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/specs/j2ee/project.xml?view=diff&rev=125359&p1=geronimo/trunk/specs/j2ee/project.xml&r1=125358&p2=geronimo/trunk/specs/j2ee/project.xml&r2=125359
==============================================================================
--- geronimo/trunk/specs/j2ee/project.xml (original)
+++ geronimo/trunk/specs/j2ee/project.xml Sun Jan 16 10:30:18 2005
@@ -37,84 +37,126 @@
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-activation</artifactId>
<version>${geronimo_spec_activation_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-ejb</artifactId>
<version>${geronimo_spec_ejb_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-connector</artifactId>
<version>${geronimo_spec_j2ee_connector_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-deployment</artifactId>
<version>${geronimo_spec_j2ee_deployment_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-jacc</artifactId>
<version>${geronimo_spec_j2ee_jacc_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-management</artifactId>
<version>${geronimo_spec_j2ee_management_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jms</artifactId>
<version>${geronimo_spec_jms_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-javamail</artifactId>
<version>${geronimo_spec_javamail_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jaxr</artifactId>
<version>${geronimo_spec_jaxr_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jsp</artifactId>
<version>${geronimo_spec_jsp_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
<version>${geronimo_spec_jta_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-servlet</artifactId>
<version>${geronimo_spec_servlet_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis-jaxrpc</artifactId>
<version>${axis_jaxrpc_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis-saaj</artifactId>
<version>${axis_saaj_version}</version>
+ <properties>
+ <geronimo.spec.bundle>true</geronimo.spec.bundle>
+ </properties>
</dependency>
</dependencies>