Author: aheritier
Date: Sat Feb 26 17:52:55 2005
New Revision: 155609
URL: http://svn.apache.org/viewcvs?view=rev&rev=155609
Log:
MPANT-23: Add License file to jar META-INF. Thanks to Phil Steitz.
Modified:
maven/maven-1/plugins/trunk/ant/src/plugin-resources/templates/build.jelly
maven/maven-1/plugins/trunk/ant/src/plugin-test/project.properties
maven/maven-1/plugins/trunk/ant/xdocs/changes.xml
Modified:
maven/maven-1/plugins/trunk/ant/src/plugin-resources/templates/build.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ant/src/plugin-resources/templates/build.jelly?view=diff&r1=155608&r2=155609
==============================================================================
--- maven/maven-1/plugins/trunk/ant/src/plugin-resources/templates/build.jelly
(original)
+++ maven/maven-1/plugins/trunk/ant/src/plugin-resources/templates/build.jelly
Sat Feb 26 17:52:55 2005
@@ -164,7 +164,15 @@
</copy>
</j:forEach>
-
+
+ <!-- Copy license -->
+ <ant:echo>${maven.license.licenseFile}</ant:echo>
+ <j:set var="licenseFile" value="${maven.license.licenseFile}"/>
+ <j:if test="${licenseFile != null and not licenseFile.trim().equals('')}">
+ <maven:makeRelativePath var="licensePath" basedir="${basedir}"
path="${maven.license.licenseFile}" separator="/"/>
+ <copy todir="$${classesdir}/META-INF" file="${licensePath}"/>
+ </j:if>
+
</target>
<target
Modified: maven/maven-1/plugins/trunk/ant/src/plugin-test/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ant/src/plugin-test/project.properties?view=diff&r1=155608&r2=155609
==============================================================================
--- maven/maven-1/plugins/trunk/ant/src/plugin-test/project.properties
(original)
+++ maven/maven-1/plugins/trunk/ant/src/plugin-test/project.properties Sat Feb
26 17:52:55 2005
@@ -1,2 +1,4 @@
maven.jar.override=on
-maven.jar.activation = ${basedir}/lib/activation-1.0.2.jar
\ No newline at end of file
+maven.jar.activation = ${basedir}/lib/activation-1.0.2.jar
+
+maven.license.licenseFile=${basedir}/../../../LICENSE.txt
\ No newline at end of file
Modified: maven/maven-1/plugins/trunk/ant/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ant/xdocs/changes.xml?view=diff&r1=155608&r2=155609
==============================================================================
--- maven/maven-1/plugins/trunk/ant/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/ant/xdocs/changes.xml Sat Feb 26 17:52:55 2005
@@ -29,6 +29,7 @@
<action dev="aheritier" type="add">Ant user can set proxy
settings.</action>
<action dev="aheritier" type="add">New property maven.ant.compatibility
if you want a script compatible with ant 1.5 (actually for proxy
settings).</action>
<action dev="aheritier" type="update" issue="MPANT-21">"get-deps" target
store downloads to the default local maven repository
(<i>${user.home}/.maven/repository</i>).</action>
+ <action dev="aheritier" type="add" issue="MPANT-23" due-to="Phil
Steitz">Add License file to jar META-INF.</action>
</release>
<release version="1.8.1" date="2004-08-20">
<action dev="carlos" type="fix" issue="MPANT-16">Use relative paths in
test resources filesets.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
