You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2004/01/18 16:14:36 UTC

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

dion        2004/01/18 07:14:36

  Modified:    jar      plugin.jelly plugin.properties
               jar/xdocs properties.xml changes.xml navigation.xml
  Removed:     jar/xdocs/current goals.xml index.xml changes.xml
                        properties.xml
  Log:
          Remove old nav (current etc) as it was confusing people.
          Implement maven.jar.includes as per Eric Giguere's suggestion
  
  Revision  Changes    Path
  1.28      +4 -0      maven-plugins/jar/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jar/plugin.jelly,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- plugin.jelly	11 Dec 2003 13:29:45 -0000	1.27
  +++ plugin.jelly	18 Jan 2004 15:14:36 -0000	1.28
  @@ -35,6 +35,10 @@
           <ant:setProperty name="manifest" value="${maven.jar.manifest}" />
         </j:if>
   
  +      <j:if test="${context.getVariable('maven.jar.includes') != null}">
  +        <ant:setProperty name="includes" value="${maven.jar.includes}" />
  +      </j:if>
  +
         <j:set var="licenseFileName"><license:fileName/></j:set>
         <util:file name="${licenseFileName}" var="licenseFile"/>
         <ant:metainf dir="${licenseFile.canonicalFile.parent}">
  
  
  
  1.7       +1 -0      maven-plugins/jar/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jar/plugin.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- plugin.properties	29 Aug 2003 10:58:45 -0000	1.6
  +++ plugin.properties	18 Jan 2004 15:14:36 -0000	1.7
  @@ -2,6 +2,7 @@
   # P L U G I N P R O P E R T I E S
   # -------------------------------------------------------------------
   maven.jar.manifest.extensions.add=false
  +#maven.jar.includes=
   maven.jar.excludes = **/package.html
   maven.jar.index=false
   maven.jar.compress=true
  
  
  
  1.8       +8 -0      maven-plugins/jar/xdocs/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jar/xdocs/properties.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- properties.xml	11 Dec 2003 13:29:45 -0000	1.7
  +++ properties.xml	18 Jan 2004 15:14:36 -0000	1.8
  @@ -37,6 +37,14 @@
             </td>
           </tr>
           <tr>
  +          <td>maven.jar.includes</td>
  +          <td>Yes</td>
  +          <td>
  +            Specifies a list of patterns to include with the jar process.
  +            The default value is <code>null</code>
  +          </td>
  +        </tr>
  +        <tr>
             <td>maven.jar.index</td>
             <td>Yes</td>
             <td>
  
  
  
  1.8       +22 -1     maven-plugins/jar/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jar/xdocs/changes.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- changes.xml	11 Dec 2003 13:29:45 -0000	1.7
  +++ changes.xml	18 Jan 2004 15:14:36 -0000	1.8
  @@ -8,12 +8,32 @@
   
     <body>
   
  -    <release version="1.4" date="In cvs">
  +    <release version="1.4" date="in CVS">
  +      <action dev="dion" type="update">
  +        Remove old nav (current etc) as it was confusing people.
  +        Implement maven.jar.includes as per Eric Giguere's suggestion.
  +      </action>
         <action dev="neilc" type="update">
           Added manifest Class-Path, specified by setting property
           jar.manifest.classpath on dependency artifacts in project.xml.
         </action>
  +      <action dev="dion" issue="MAVEN-936" type="fix">
  +        Reorder Specification-Title/Vendor/Version and Implementation-Title/Vendor/Version
  +      </action>
  +      <action dev="dion" issue="MAVEN-936" type="fix">
  +        Use pom.currentVersion for Specification-Version
  +      </action>
  +      <action dev="dion" type="fix">
  +        Fix for maven.jar.manifest.extensions.add not being checked
  +        correctly.
  +      </action>
  +      <action dev="dion" type="fix">Fix MAVEN-1009</action>
  +    </release>
  +    
  +    <release version="1.3" date="2003-09-29">
  +    
       </release>
  +   
       <release version="1.2" date="In cvs">
         <action dev="evenisse" type="fix">
           Fixed maven.jar.manifest.extensions.add use.
  @@ -22,6 +42,7 @@
           Maven-755. Add maven.jar.compress.
         </action>
       </release>
  + 
       <release version="1.1" date="2003-08-29">
         <action dev="dion" type="update">
           Added maven.jar.index property
  
  
  
  1.5       +0 -5      maven-plugins/jar/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jar/xdocs/navigation.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navigation.xml	29 Aug 2003 02:06:06 -0000	1.4
  +++ navigation.xml	18 Jan 2004 15:14:36 -0000	1.5
  @@ -13,11 +13,6 @@
         <item name="Properties"         href="/properties.html" />
       </menu>
       <menu name="Versions">
  -      <item name="Current" href="current/index.html">
  -        <item name="Goals"              href="/current/goals.html" />
  -        <item name="Properties"         href="/current/properties.html" />
  -        <item name="Changes"            href="/current/changes.html" />
  -      </item>
         <item name="Release 1.1" href="/releases/v1.1/index.html">
           <item name="Goals"              href="/releases/v1.1/goals.html" />
           <item name="Properties"         href="/releases/v1.1/properties.html" />
  
  
  

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