You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/03/07 08:38:29 UTC
svn commit: r1078703 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: hboutemy
Date: Mon Mar 7 07:38:29 2011
New Revision: 1078703
URL: http://svn.apache.org/viewvc?rev=1078703&view=rev
Log:
merged minor modifications from maven-site-plugin-3.x branch
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1078703&r1=1078702&r2=1078703&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Mon Mar 7 07:38:29 2011
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -217,17 +217,30 @@ under the License.
<!-- Doxia -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xhtml</artifactId>
+ <artifactId>doxia-sink-api</artifactId>
<version>${doxiaVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-sink-api</artifactId>
+ <artifactId>doxia-logging-api</artifactId>
<version>${doxiaVersion}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-logging-api</artifactId>
+ <artifactId>doxia-core</artifactId>
+ <version>${doxiaVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xhtml</artifactId>
<version>${doxiaVersion}</version>
</dependency>
<dependency>
@@ -248,6 +261,12 @@ under the License.
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+
<!-- Doxia-sitetools -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
@@ -314,11 +333,6 @@ under the License.
<!-- misc -->
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.5</version>
@@ -376,6 +390,7 @@ under the License.
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <showVersion>true</showVersion>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
@@ -402,6 +417,17 @@ under the License.
</profile>
<profile>
<id>reporting</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<reporting>
<plugins>
<plugin>