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

PR: MPARTIFACT-20

Browse Source 
fix copy-deps when there is nothing to copy


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115548 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett
2004-06-25 18:37:27 +00:00
parent 4ce02d3b68
commit 9db573f235
2 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
artifact/plugin.jelly
View File

@@ -367,36 +367,42 @@
</j:if>
<j:set var="mavenRepoLocal" value='${context.getVariable("maven.repo.local")}'/>
<ant:mkdir dir="${todir}"/>
<ant:copy todir="${todir}" flatten="true">
<!-- grab list of excludedItems up front -->
<j:if test="${excludes != ''}">
<!-- The excludes are a list of dep ids -->
<util:tokenize var="excludeItems" delim=",">${excludes}</util:tokenize>
</j:if>
<!-- grab list of excludedItems up front -->
<j:if test="${excludes != ''}">
<!-- The excludes are a list of dep ids -->
<util:tokenize var="excludeItems" delim=",">${excludes}</util:tokenize>
</j:if>
<!--
! for each artifact, see if it is excluded. If not, add a fileset
! to the copy
!-->
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="excluded" value="false"/>
<j:if test="${excludes != ''}">
<!-- The excludes are a list of dep ids, check if this id is in the list -->
<j:forEach var="exclude" items="${excludeItems}">
<!-- the exclude could be either the short name (e.g. artifactId), or the id -->
<j:if test="${(lib.dependency.id == exclude) or (lib.dependency.artifactId == exclude)}">
<j:set var="excluded" value="true"/>
</j:if>
</j:forEach>
</j:if>
<j:if test="${!excluded}">
<j:useList var="includedLibs" />
<!--
! for each artifact, see if it is excluded. If not, add a fileset
! to the copy
!-->
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="excluded" value="false"/>
<j:if test="${excludes != ''}">
<!-- The excludes are a list of dep ids, check if this id is in the list -->
<j:forEach var="exclude" items="${excludeItems}">
<!-- the exclude could be either the short name (e.g. artifactId), or the id -->
<j:if test="${(lib.dependency.id == exclude) or (lib.dependency.artifactId == exclude)}">
<j:set var="excluded" value="true"/>
</j:if>
</j:forEach>
</j:if>
<j:if test="${!excluded}">
${includedLibs.add(lib)}
</j:if>
</j:forEach>
<j:if test="${size(includedLibs) != 0}">
<ant:mkdir dir="${todir}"/>
<ant:copy todir="${todir}" flatten="true">
<j:forEach var="lib" items="${includedLibs}">
<ant:fileset dir="${lib.file.parent}">
<ant:include name="${lib.file.name}"/>
</ant:fileset>
</j:if>
</j:forEach>
</ant:copy>
</j:forEach>
</ant:copy>
</j:if>
</define:tag>
</define:taglib>

3
artifact/xdocs/changes.xml
View File

@@ -26,6 +26,9 @@
</properties>
<body>
<release version="1.3" date="In CVS">
<action dev="brett" type="add" issue="MPARTIFACT-20">Fix opy-deps when list is empty</action>
<action dev="brett" type="add">Accept empty passphrase to ssh based deployers</action>
<action dev="brett" type="add">Default to maven.username if repository username not given</action>
<action dev="brett" type="add">Add typeHandler parameter to tags to specify a custom handler</action>
<action dev="brett" type="add">Switch between modern and legacy mode based on properties defined</action>
<action dev="brett" type="add">Absorb the deploy plugin to give one point of migration</action>