Author: henning
Date: Sun Oct 24 00:32:12 2010
New Revision: 1026716
URL: http://svn.apache.org/viewvc?rev=1026716&view=rev
Log:
remove the doxia renderer, add maven 2.2.1 as prerequisite
Added:
velocity/site/site/src/site/xdoc/contact.xml.vm
- copied unchanged from r952661,
velocity/site/site/src/site/velocity/xdoc/contact.xml
velocity/site/site/src/site/xdoc/who-we-are.xml.vm
- copied unchanged from r952661,
velocity/site/site/src/site/velocity/xdoc/who-we-are.xml
Modified:
velocity/site/site/pom.xml
Modified: velocity/site/site/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/site/site/pom.xml?rev=1026716&r1=1026715&r2=1026716&view=diff
==============================================================================
--- velocity/site/site/pom.xml (original)
+++ velocity/site/site/pom.xml Sun Oct 24 00:32:12 2010
@@ -27,6 +27,10 @@
</site>
</distributionManagement>
+ <prerequisites>
+ <maven>2.2.1</maven>
+ </prerequisites>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/site/site/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/site/site/</developerConnection>
@@ -45,17 +49,9 @@
<groupId>org.apache.velocity.site</groupId>
<artifactId>velocity-site-news-plugin</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <reportSets>
- <reportSet>
- <configuration>
- <baseUrl>http://velocity.apache.org/</baseUrl>
- </configuration>
- <id>news-set</id>
- <reports>
- <report>news</report>
- </reports>
- </reportSet>
- </reportSets>
+ <configuration>
+ <baseUrl>http://velocity.apache.org/</baseUrl>
+ </configuration>
</plugin>
</plugins>
@@ -73,13 +69,6 @@
<artifactId>velocity-site-news-plugin</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.velocity.site</groupId>
- <artifactId>velocity-site-doxia-renderer</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </dependency>
- -->
</dependencies>
</plugin>
@@ -112,23 +101,6 @@
</execution>
</executions>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.velocity.site</groupId>
- <artifactId>velocity-site-doxia-renderer</artifactId>
- <configuration>
- <libraries/>
- <tools/>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>pre-site</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
<groupId>org.apache.velocity.site</groupId>
<artifactId>velocity-site-news-plugin</artifactId>
