maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From denn...@apache.org
Subject svn commit: r580639 - in /maven/plugins/trunk/maven-plugin-plugin: pom.xml src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
Date Sat, 29 Sep 2007 20:36:51 GMT
Author: dennisl
Date: Sat Sep 29 13:36:51 2007
New Revision: 580639

URL: http://svn.apache.org/viewvc?rev=580639&view=rev
Log:
[MPLUGIN-36] Upgrade to doxia 1.0-alpha-9

o Update maven-reporting.
o Update the plexus-utils version to match the one used by doxia.
o Bump the prerequisite for maven to 2.0.6, because we need to use a newer version of plexus-utils.

Modified:
    maven/plugins/trunk/maven-plugin-plugin/pom.xml
    maven/plugins/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java

Modified: maven/plugins/trunk/maven-plugin-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugin-plugin/pom.xml?rev=580639&r1=580638&r2=580639&view=diff
==============================================================================
--- maven/plugins/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-plugin-plugin/pom.xml Sat Sep 29 13:36:51 2007
@@ -36,7 +36,7 @@
   </description>
   <inceptionYear>2001</inceptionYear>
   <prerequisites>
-    <maven>2.0.5</maven>
+    <maven>2.0.6</maven>
   </prerequisites>
   <issueManagement>
     <system>JIRA</system>
@@ -150,27 +150,46 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>2.0</version>
+      <version>2.0.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>2.0</version>
+      <version>2.0.4</version>
     </dependency>
+
+    <!-- doxia -->
     <dependency>
-      <groupId>doxia</groupId>
+      <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-sink-api</artifactId>
-      <version>1.0-alpha-4</version>
+      <version>1.0-alpha-9</version>
     </dependency>
     <dependency>
-      <groupId>doxia</groupId>
+      <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-core</artifactId>
-      <version>1.0-alpha-4</version>
+      <version>1.0-alpha-9</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-site-renderer</artifactId>
+      <version>1.0-alpha-9</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-component-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
+
+    <!-- plexus -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.4.1</version>
+      <version>1.4.5</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: maven/plugins/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java?rev=580639&r1=580638&r2=580639&view=diff
==============================================================================
--- maven/plugins/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
(original)
+++ maven/plugins/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
Sat Sep 29 13:36:51 2007
@@ -19,6 +19,8 @@
  * under the License.
  */
 
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
@@ -31,8 +33,6 @@
 import org.apache.maven.tools.plugin.generator.PluginXdocGenerator;
 import org.apache.maven.tools.plugin.scanner.MojoScanner;
 import org.apache.maven.tools.plugin.util.PluginUtils;
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
@@ -65,7 +65,7 @@
      *
      * @component
      */
-    private SiteRenderer siteRenderer;
+    private Renderer siteRenderer;
 
     /**
      * The Maven Project.
@@ -86,7 +86,7 @@
     /**
      * @see org.apache.maven.reporting.AbstractMavenReport#getSiteRenderer()
      */
-    protected SiteRenderer getSiteRenderer()
+    protected Renderer getSiteRenderer()
     {
         return siteRenderer;
     }



Mime
View raw message