From 6af21bb24d6534eb920dd3c3b264aa704a52d077 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 27 Feb 2005 01:52:55 +0000
Subject: [PATCH] MPANT-23: Add License file to jar META-INF. Thanks to Phil
 Steitz.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@155609 13f79535-47bb-0310-9956-ffa450edef68
---
 ant/src/plugin-resources/templates/build.jelly | 10 +++++++++-
 ant/src/plugin-test/project.properties         |  4 +++-
 ant/xdocs/changes.xml                          |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ant/src/plugin-resources/templates/build.jelly b/ant/src/plugin-resources/templates/build.jelly
index 1b9fb581..d5b48e2b 100644
--- a/ant/src/plugin-resources/templates/build.jelly
+++ b/ant/src/plugin-resources/templates/build.jelly
@@ -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
diff --git a/ant/src/plugin-test/project.properties b/ant/src/plugin-test/project.properties
index eb7444aa..c3c7193e 100644
--- a/ant/src/plugin-test/project.properties
+++ b/ant/src/plugin-test/project.properties
@@ -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
diff --git a/ant/xdocs/changes.xml b/ant/xdocs/changes.xml
index 5afb6a2b..4e436255 100644
--- a/ant/xdocs/changes.xml
+++ b/ant/xdocs/changes.xml
@@ -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>