You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2003/12/11 14:29:45 UTC

cvs commit: maven-plugins/jar/xdocs changes.xml properties.xml

evenisse    2003/12/11 05:29:45

  Modified:    jar      plugin.jelly
               jar/xdocs changes.xml properties.xml
  Log:
  Apply Neil Crow patch.
  Added manifest Class-Path, specified by setting property jar.manifest.classpath on dependency artifacts in project.xml.
  
  Revision  Changes    Path
  1.27      +12 -0     maven-plugins/jar/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jar/plugin.jelly,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- plugin.jelly	20 Nov 2003 07:28:37 -0000	1.26
  +++ plugin.jelly	11 Dec 2003 13:29:45 -0000	1.27
  @@ -45,6 +45,18 @@
           <ant:attribute name="Created-By" value="Apache Jakarta Maven"/>
           <ant:attribute name="Package" value="${pom.package}"/>
           <ant:attribute name="Build-Jdk" value="${java.version}"/>
  +
  +        <j:set var="jarClasspath" value="${maven.jar.manifest.classpath.add}"/>
  +        <j:if test="${jarClasspath}">
  +            <j:forEach var="dep" items="${pom.dependencies}">
  +                <j:if test="${dep.getProperty('jar.manifest.classpath')=='true'}">
  +                    <j:set var="maven.jar.classpath" value="${maven.jar.classpath} ${dep.artifact}" /> 
  +                </j:if>
  +            </j:forEach>
  +            <j:if test="${maven.jar.classpath.length() != 0}">
  +                <ant:attribute name="Class-Path" value="${maven.jar.classpath}"/>
  +            </j:if>
  +        </j:if>
           <!-- added supplementary entries -->
           <ant:attribute name="Extension-Name" value="${pom.artifactId}"/>
           <ant:attribute name="Specification-Title" value="${pom.shortDescription}"/>
  
  
  
  1.7       +6 -0      maven-plugins/jar/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jar/xdocs/changes.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- changes.xml	4 Sep 2003 12:18:18 -0000	1.6
  +++ changes.xml	11 Dec 2003 13:29:45 -0000	1.7
  @@ -8,6 +8,12 @@
   
     <body>
   
  +    <release version="1.4" date="In cvs">
  +      <action dev="neilc" type="update">
  +        Added manifest Class-Path, specified by setting property
  +        jar.manifest.classpath on dependency artifacts in project.xml.
  +      </action>
  +    </release>
       <release version="1.2" date="In cvs">
         <action dev="evenisse" type="fix">
           Fixed maven.jar.manifest.extensions.add use.
  
  
  
  1.7       +9 -0      maven-plugins/jar/xdocs/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jar/xdocs/properties.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- properties.xml	29 Aug 2003 10:58:45 -0000	1.6
  +++ properties.xml	11 Dec 2003 13:29:45 -0000	1.7
  @@ -55,6 +55,15 @@
             </td>
           </tr>
           <tr>
  +          <td>maven.jar.manifest.classpath.add</td>
  +          <td>Yes</td>
  +          <td>
  +            Tells maven to add classpath information the the jar manifest.
  +            This can cause some applications to break, so it has been disabled by default.
  +            Set to 'true' to enable classpath information.
  +          </td>
  +        </tr>
  +        <tr>
             <td>maven.jar.manifest.extensions.add</td>
             <td>Yes</td>
             <td>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org