brett 2004/04/14 23:10:27
Modified: jar plugin.jelly
jar/xdocs changes.xml
Log:
PR: MPJAR-22
improve extension support
Revision Changes Path
1.33 +16 -4 maven-plugins/jar/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/jar/plugin.jelly,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- plugin.jelly 12 Apr 2004 22:47:49 -0000 1.32
+++ plugin.jelly 15 Apr 2004 06:10:27 -0000 1.33
@@ -103,7 +103,9 @@
<j:set var="extensionList" value=""/>
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dep" value="${artifact.dependency}"/>
- <j:set var="extensionList" value="${extensionList} ${dep.artifactId}"/>
+ <j:if test="${dep.type == 'jar' || empty(dep.type)}">
+ <j:set var="extensionList" value="${extensionList}
${dep.artifactId}"/>
+ </j:if>
</j:forEach>
<j:if test="${extensionList.length() != 0}">
@@ -113,9 +115,19 @@
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dep" value="${artifact.dependency}"/>
- <ant:attribute name="${dep.artifactId}-Extension-Name"
value="${dep.artifactId}"/>
- <ant:attribute name="${dep.artifactId}-Implementation-Version"
value="${dep.version}"/>
- <ant:attribute name="${dep.artifactId}-Implementation-URL"
value="http://www.ibiblio.org/maven${artifact.urlPath}"/>
+ <j:if test="${dep.type == 'jar' || empty(dep.type)}">
+ <ant:attribute name="${dep.artifactId}-Extension-Name"
value="${dep.artifactId}"/>
+ <ant:attribute name="${dep.artifactId}-Implementation-Version"
value="${dep.version}"/>
+
+ <j:choose>
+ <j:when test="${empty(dep.url) ||
dep.url.toString().trim().length() == 0}">
+ <ant:attribute name="${dep.artifactId}-Implementation-URL"
value="http://www.ibiblio.org/maven${artifact.urlPath}"/>
+ </j:when>
+ <j:otherwise>
+ <ant:attribute name="${dep.artifactId}-Implementation-URL"
value="${dep.url}"/>
+ </j:otherwise>
+ </j:choose>
+ </j:if>
</j:forEach>
</j:if>
1.13 +1 -0 maven-plugins/jar/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jar/xdocs/changes.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- changes.xml 12 Apr 2004 22:47:49 -0000 1.12
+++ changes.xml 15 Apr 2004 06:10:27 -0000 1.13
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.5-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="fix" issue="MPJAR-22" due-to="Corey Jewett">improve
manifest generation</action>
<action dev="brett" type="fix" issue="MPJAR-17">revert maven.final.name to
previuous value after executing jar:snapshot related goals.</action>
</release>
<release version="1.4" date="2004-02-27">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
