Put back recent changes

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113738 13f79535-47bb-0310-9956-ffa450edef68

jar/plugin.jelly

@@ -9,47 +9,7 @@
   xmlns:resources="resources"
   xmlns:util="jelly:util"
   xmlns:doc="doc"
-  xmlns:m="maven"
-  xmlns:define="jelly:define"
-  xmlns:velocity="jelly:velocity"
-  >
-
-
- 
-  
-  <define:taglib uri="manifest">
-  
-  <!--
-     |    
-     | @destFile
-     |
-     -->
-    <define:tag name="create-file">                  
-    
-    <j:set 
-        var="templatePath" 
-        value="${pom.getPluginContext('maven-jar-plugin').getVariable('plugin.dir')}/plugin-resources/templates"/>
-      
-    <j:set 
-        var="mainclass" 
-        value="${$pom.getPluginContext('maven-java-plugin').getVariable('maven.jar.mainclass')}"/>
-    
-    <j:set 
-        var="addExtension" 
-        value="${pom.getPluginContext('maven-jar-plugin').getVariable('${maven.jar.manifest.extensions.add')}"/>
-    
-       
-    
-      <ant:echo>Creating MANIFEST file:${destFile}</ant:echo>
-
-      <velocity:merge
-        name="${destFile}"
-        basedir="${templatePath}"
-        template="manifest.vm"/>
-    </define:tag> 
-    
-  </define:taglib>
- 
+  xmlns:m="maven">
 
   <!-- ================================================================== -->
   <!-- J A R                                                              -->
@@ -76,13 +36,11 @@
         <ant:setProperty name="manifest" value="${maven.jar.manifest}" />
       </j:if>
 
-      <!--
       <j:set var="licenseFileName"><license:fileName/></j:set>
       <util:file name="${licenseFileName}" var="licenseFile"/>
       <ant:metainf dir="${licenseFile.canonicalFile.parent}">
         <ant:include name="${licenseFile.canonicalFile.name}"/>
       </ant:metainf>
-      -->
       <ant:manifest>
         <ant:attribute name="Built-By" value="${user.name}"/>
         <ant:attribute name="Created-By" value="Apache Jakarta Maven"/>

jar/project.xml

@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jar-plugin</id>
   <name>Maven Jar Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jar/</url>
@@ -28,9 +28,8 @@
     
     <dependency>
       <id>velocity</id>
-      <version>1.3</version>
+      <version>1.4-dev</version>
     </dependency>
     
   </dependencies>
-
 </project>

license/plugin.jelly

@@ -28,7 +28,7 @@
        <util:replace var="forwardSlashFile" oldChar="\" newChar="/" trim="yes">
          <license:fileName />
        </util:replace>
-       <!-- change bsaedir to have forward slashes too -->
+       <!-- change basedir to have forward slashes too -->
        <util:replace var="forwardSlashBaseDir" value="${basedir}"
          oldChar="\" newChar="/" />
        <j:if test="${!forwardSlashBaseDir.endsWith('/')}">
@@ -46,11 +46,18 @@
   <!-- L I C E N S E                                                      -->
   <!-- ================================================================== -->
   <goal name="maven-license-plugin:register">
-    <doc:registerReport 
-      name="Project License" 
-      pluginName="maven-license-plugin"
-      link="license"
-      description="Displays the primary license for the project."/>
+      <j:set var="licenseFile"><license:fileName /></j:set>
+    <util:available file="${licenseFile}">
+      <j:set var="licensePresent" value="true"/>
+    </util:available>
+    
+    <j:if test="${licensePresent == 'true'}">
+      <doc:registerReport 
+        name="Project License" 
+        pluginName="maven-license-plugin"
+        link="license"
+        description="Displays the primary license for the project."/>
+    </j:if>
   </goal>
   
   <goal name="maven-license-plugin:deregister">

license/project.xml

@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-license-plugin</id>
   <name>Maven License Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/license/</url>
@@ -24,6 +24,15 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Emmanuel Venisse</name>
+      <id>evenisse</id>
+      <email>evenisse@ifrance.com</email>
+      <organization>Fi System</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
     <developer>
       <name>dIon Gillard</name>
       <id>dion</id>