You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2010/08/09 22:51:20 UTC
svn commit: r983816 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/site/apt/examples/templatefile.apt.vm
Author: dennisl
Date: Mon Aug 9 20:51:20 2010
New Revision: 983816
URL: http://svn.apache.org/viewvc?rev=983816&view=rev
Log:
Merge r801470 from trunk.
Revert over-ambitious part of r801155.
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt.vm
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 20:51:20 2010
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,920027,942622,943455,944145,956681
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,920027,942622,943455,944145,956681
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt.vm?rev=983816&r1=983815&r2=983816&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt.vm (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/templatefile.apt.vm Mon Aug 9 20:51:20 2010
@@ -72,7 +72,7 @@ Changing the Template File
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>${project.version}</version>
+ <version>2.0-beta-4</version>
<configuration>
<templateDirectory>${basedir}</templateDirectory>
<template>maven-site.vm</template>