jboynes 2004/02/12 15:23:54
Modified: etc maven.xml
Log:
new dependency schema does not require double nesting
get rid of builds for -service-package.jar's
Revision Changes Path
1.28 +1 -32 incubator-geronimo/etc/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/etc/maven.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- maven.xml 29 Jan 2004 02:43:41 -0000 1.27
+++ maven.xml 12 Feb 2004 23:23:53 -0000 1.28
@@ -185,35 +185,4 @@
<ant:touch file="${basedir}/target/test-reports/tstamp"/>
</j:if>
</postGoal>
-
- <!-- generate packages ready to be deployed, if appropriate -->
- <postGoal name="jar:jar">
- <ant:available property="geronimoServicePresent"
file="${basedir}/src/etc/META-INF/geronimo-service.xml"/>
- <j:if test="${geronimoServicePresent == 'true'}">
- <ant:jar
destfile="${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar">
- <fileset dir="${basedir}/target"
includes="${pom.artifactId}-${pom.currentVersion}.jar"/>
- <fileset dir="${basedir}/src/etc"
includes="META-INF/geronimo-service.xml"/>
- <j:forEach var="artifact" items="${pom.artifacts}">
- <j:set var="dependency" value="${artifact.dependency}"/>
- <j:if test="${dependency.getProperty('package') ==
'true'}">
- <ant:echo>Processing dependency:
${dependency.id}</ant:echo>
- <fileset file="${artifact.path}"/>
- </j:if>
- </j:forEach>
- </ant:jar>
- </j:if>
- </postGoal>
-
- <postGoal name="jar:install">
- <ant:available property="geronimoPackagePresent"
file="${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar"/>
- <j:if test="${geronimoPackagePresent == 'true'}">
- <ant:property name="jardir__"
value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
- <ant:mkdir dir="${jardir__}"/>
- <ant:copy
-
file="${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar"
- todir="${jardir__}"
- overwrite="true"
- />
- </j:if>
- </postGoal>
</project>
