You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by he...@apache.org on 2010/10/21 07:25:39 UTC
svn commit: r1025831 - /velocity/site/site/pom.xml
Author: henning
Date: Thu Oct 21 05:25:39 2010
New Revision: 1025831
URL: http://svn.apache.org/viewvc?rev=1025831&view=rev
Log:
Fix most of the velocity site build:
* News plugin works with maven 2.2.1
* lock the reporting on the 2.1.2 plugin so that the site build
does not fail with doxia errors.
Right now, only the auto-generated pages for mailing lists and team
are missing, but Antoino seem to have ripped them out anyway.
Modified:
velocity/site/site/pom.xml
Modified: velocity/site/site/pom.xml
URL: http://svn.apache.org/viewvc/velocity/site/site/pom.xml?rev=1025831&r1=1025830&r2=1025831&view=diff
==============================================================================
--- velocity/site/site/pom.xml (original)
+++ velocity/site/site/pom.xml Thu Oct 21 05:25:39 2010
@@ -7,144 +7,141 @@
<version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.velocity.site</groupId>
- <artifactId>velocity-site</artifactId>
- <version>1.0.0</version>
- <name>Apache Velocity Site</name>
- <url>http://velocity.apache.org/</url>
- <description>The Apache Velocity Site</description>
- <inceptionYear>2006</inceptionYear>
-
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
-
- <distributionManagement>
- <site>
- <id>velocity.apache.org</id>
- <url>scpexe://people.apache.org/www/velocity.apache.org</url>
- </site>
- </distributionManagement>
-
- <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>
- <tag>HEAD</tag>
- <url>http://svn.apache.org/viewvc/velocity/site/site/</url>
- </scm>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.velocity.site</groupId>
- <artifactId>velocity-site-news-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <reportSets>
- <reportSet>
- <configuration>
- <baseUrl>http://velocity.apache.org/</baseUrl>
- </configuration>
- <id>news-set</id>
- <reports>
- <report>news</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
- <build>
- <defaultGoal>post-site</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.1.1</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity.site</groupId>
- <artifactId>velocity-site-news-plugin</artifactId>
- <version>1.3.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>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-cgi</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>post-site</phase>
- <configuration>
- <tasks>
- <copy todir="${project.reporting.outputDirectory}">
- <fileset dir="${basedir}/src/cgi">
- <patternset id="cgi.scripts">
- <include name="**/*.cgi"/>
- </patternset>
- </fileset>
- </copy>
- <chmod perm="ugo+rx">
- <fileset dir="${project.reporting.outputDirectory}">
- <patternset refid="cgi.scripts"/>
- </fileset>
- </chmod>
- </tasks>
- </configuration>
- </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>
- <version>1.3.0-SNAPSHOT</version>
- <executions>
- <execution>
- <id>pre-site-news</id>
- <phase>pre-site</phase>
- <goals>
- <goal>pre-site</goal>
- </goals>
- </execution>
-<!-- <execution>
- <id>in-site-news</id>
- <phase>site</phase>
- <goals>
- <goal>news</goal>
- </goals>
- </execution> -->
- </executions>
- </plugin>
- </plugins>
- </build>
+ <groupId>org.apache.velocity.site</groupId>
+ <artifactId>velocity-site</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <name>Apache Velocity Site</name>
+ <url>http://velocity.apache.org/</url>
+ <description>The Apache Velocity Site</description>
+ <inceptionYear>2006</inceptionYear>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <distributionManagement>
+ <site>
+ <id>velocity.apache.org</id>
+ <url>scpexe://people.apache.org/www/velocity.apache.org</url>
+ </site>
+ </distributionManagement>
+
+ <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>
+ <tag>HEAD</tag>
+ <url>http://svn.apache.org/viewvc/velocity/site/site/</url>
+ </scm>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
+ <plugin>
+ <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>
+ </plugin>
+
+ </plugins>
+ </reporting>
+ <build>
+ <defaultGoal>post-site</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity.site</groupId>
+ <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>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-cgi</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>post-site</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.reporting.outputDirectory}">
+ <fileset dir="${basedir}/src/cgi">
+ <patternset id="cgi.scripts">
+ <include name="**/*.cgi"/>
+ </patternset>
+ </fileset>
+ </copy>
+ <chmod perm="ugo+rx">
+ <fileset dir="${project.reporting.outputDirectory}">
+ <patternset refid="cgi.scripts"/>
+ </fileset>
+ </chmod>
+ </tasks>
+ </configuration>
+ </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>
+ <version>2.0.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>pre-site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>