You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2011/03/06 09:26:43 UTC
svn commit: r1078421 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/it/site-attach-descriptor/pom.xml src/it/site-deploy/src/site/site.xml
src/it/site-jar/src/site/site.xml
Author: ltheussl
Date: Sun Mar 6 08:26:42 2011
New Revision: 1078421
URL: http://svn.apache.org/viewvc?rev=1078421&view=rev
Log:
merge r1067103 from trunk
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 6 08:26:42 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/pom.xml?rev=1078421&r1=1078420&r2=1078421&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/pom.xml Sun Mar 6 08:26:42 2011
@@ -50,6 +50,10 @@ under the License.
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
</plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml?rev=1078421&r1=1078420&r2=1078421&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml Sun Mar 6 08:26:42 2011
@@ -28,6 +28,7 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
+ <version>1.2</version>
</skin>
<body>
<breadcrumbs>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml?rev=1078421&r1=1078420&r2=1078421&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml Sun Mar 6 08:26:42 2011
@@ -28,6 +28,7 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
+ <version>1.2</version>
</skin>
<body>
<breadcrumbs>