svn commit: r355284 - in /maven/maven-1/plugins/trunk/dist: plugin.jelly xdocs/changes.xml xdocs/index.xml

[lt...@apache.org]

Author: ltheussl
Date: Thu Dec  8 15:56:00 2005
New Revision: 355284

URL: http://svn.apache.org/viewcvs?rev=355284&view=rev
Log:
Remove plugin-plugin dependency for m1.0.2 compatibility.
Keep a warning about the artifact-plugin 1.3 in the documentation,
but, being rather old, this is not checked for in plugin.jelly.

Modified:
    maven/maven-1/plugins/trunk/dist/plugin.jelly
    maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
    maven/maven-1/plugins/trunk/dist/xdocs/index.xml

Modified: maven/maven-1/plugins/trunk/dist/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/plugin.jelly?rev=355284&r1=355283&r2=355284&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.jelly Thu Dec  8 15:56:00 2005
@@ -26,11 +26,6 @@
   xmlns:assert="assert"
   xmlns:util="jelly:util">
 
-  <j:if test="${bootstrapping == null}">
-    <!-- fake test because the assert:assertPluginAvailable tag is avalaible in the maven-plugin-plugin 1.7 and newer. Thus maven will break if it's not present. -->  
-    <assert:assertPluginAvailable groupId="maven" artifactId="maven-plugin-plugin" minRelease="1.7" neededBy="${plugin.artifactId}"/>
-    <assert:assertPluginAvailable groupId="maven" artifactId="maven-artifact-plugin" minRelease="1.3" neededBy="${plugin.artifactId}"/>
-  </j:if>
 
   <j:new var="distTypeHandler" className="org.apache.maven.dist.DistributionArtifactTypeHandler" />
 

Modified: maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/xdocs/changes.xml?rev=355284&r1=355283&r2=355284&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Thu Dec  8 15:56:00 2005
@@ -34,7 +34,6 @@
           <li>maven-model v3.0.0 -> v3.0.1</li>
         </ul>
       </action>
-      <action dev="aheritier" type="update">It requires at least maven-plugin-plugin v1.7.</action>
       <action dev="aheritier" type="update">It requires at least maven-artifact-plugin v1.3.</action>
       <action dev="akarasulu" type="add">Added multiproject analogs mirroring single project goals.  Also added the abiltiy to generate combined javadocs for multiproject distribution.  However multiproject consolidation might be best put into the site plugin.  These fixes are associated with the following <a href="http://jira.codehaus.org/browse/MPDIST-20">JIRA enhancement issue</a>.</action>
       <action dev="vmassol" type="remove" issue="MPDIST-18">Removed unused properties: <code>maven.dist.tar.executable</code> and <code>maven.dist.gunzip.executable</code>.</action>

Modified: maven/maven-1/plugins/trunk/dist/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/xdocs/index.xml?rev=355284&r1=355283&r2=355284&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/index.xml Thu Dec  8 15:56:00 2005
@@ -34,7 +34,6 @@
     <section name="Requirements">
       <p>Be careful, the following plugins must be installed to use the distribution plugin :</p>
       <ul>
-        <li>maven-plugin-plugin 1.7 (at least)</li>
         <li>maven-artifact-plugin 1.3 (at least)</li>
       </ul>
     </section>