Author: evenisse Date: Thu Mar 22 08:42:38 2007 New Revision: 521315 URL: http://svn.apache.org/viewvc?view=rev&rev=521315 Log: Fix compilation errors with latest doxia
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?view=diff&rev=521315&r1=521314&r2=521315 ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/pom.xml Thu Mar 22 08:42:38 2007 @@ -155,7 +155,37 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> - <version>1.0-alpha-9-SNAPSHOT</version> + <version>${doxiaVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-decoration-model</artifactId> + <version>${doxiaSiteVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + <version>${doxiaSiteVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>velocity</groupId> @@ -188,5 +218,9 @@ </plugin> </plugins> </reporting> + <properties> + <doxiaVersion>1.0-alpha-9-SNAPSHOT</doxiaVersion> + <doxiaSiteVersion>1.0-SNAPSHOT</doxiaSiteVersion> + </properties> </project> Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?view=diff&rev=521315&r1=521314&r2=521315 ============================================================================== --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java Thu Mar 22 08:42:38 2007 @@ -19,7 +19,7 @@ import java.util.List; import java.util.ResourceBundle; -import org.apache.maven.doxia.module.HtmlTools; +import org.apache.maven.doxia.util.HtmlTools; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.plugin.logging.Log;