Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for MAVEN-518.

Browse Source 
Artifact processing in the plugin was slightly changed and now it supports jar overriding mechanism


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113565 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
michal
2003-07-01 14:58:52 +00:00
parent dfbf909c49
commit b8ccb7170d
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
war/plugin.jelly
View File

@@ -49,21 +49,24 @@
</ant:fileset>
</j:if>
<j:forEach var="dep" items="${pom.dependencies}">
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
<j:set var="bundle" value="false"/>
<j:if test="${dep.getProperty('war.bundle.jar')=='true'}">
<ant:echo>
DEPRECATION WARNING:
Use : war.bundle instead of war.bundle.jar
Use : war.bundle instead of war.bundle.jar
</ant:echo>
<ant:lib dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
<ant:include name="${dep.artifact}"/>
</ant:lib>
<j:set var="bundle" value="true"/>
</j:if>
<j:if test="${dep.getProperty('war.bundle')=='true' and dep.type =='jar' }">
<ant:lib dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
<ant:include name="${dep.artifact}"/>
<j:if test="${dep.getProperty('war.bundle')=='true' and dep.type =='jar'}">
<j:set var="bundle" value="true"/>
</j:if>
<j:if test="${bundle == 'true'}">
<ant:lib dir="${lib.file.parent}">
<ant:include name="${lib.file.name}"/>
</ant:lib>
</j:if>
</j:if>
</j:forEach>
<j:if test="${sourcesPresent == 'true'}">
@@ -131,7 +134,7 @@
<j:set var="dep" value="${lib.dependency}"/>
<j:if test="${dep.getProperty('war.bundle')=='true' and dep.type =='jar' }">
<ant:copy todir="${webapp.build.lib}"
file="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}"/>
file="${lib.path}"/>
</j:if>
<j:if test="${dep.getProperty('war.bundle.jar')=='true'}">
<ant:echo>
@@ -139,7 +142,7 @@
Use : war.bundle instead of war.bundle.jar
</ant:echo>
<ant:copy todir="${webapp.build.lib}"
file="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}"/>
file="${lib.path}"/>
</j:if>
</j:forEach>

11
war/xdocs/changes.xml
View File

@@ -8,15 +8,18 @@
<body>
<release version="1.4" date="in CVS">
<action dev="dion" type="fix" due-to="Ben Hogan">
Allow war file to be updated
</action>
<action dev="michal" type="fix">
Iterating artifacts not depedencies
Fixes for MAVEN-518.
Artifact processing in the plugin
was slightly changed and now
it supports jar overriding mechanism
</action>
<action dev="michal" type="add">
Added deploy, deploy-snapshot and install-snapshot goals
</action>
<action dev="dion" type="fix" due-to="Ben Hogan">
Allow war file to be updated
</action>
</release>
<release version="1.3" date="2002-04-08">

12
war/xdocs/goals.xml
View File

@@ -19,6 +19,18 @@
<name>war:install</name>
<description>Install the war in the local repository</description>
</goal>
<goal>
<name>war:install-snapshot</name>
<description>Install the snapshot version of the war in the local repository</description>
</goal>
<goal>
<name>war:deploy</name>
<description>Deploy the war to the remote repository(ies)</description>
</goal>
<goal>
<name>war:deploy-snapshot</name>
<description>Deploy the snapshot version of the war to the remote repository(ies)</description>
</goal>
<goal>
<name>war:war</name>
<description>Build a war file</description>