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/07/15 11:21:52 UTC
svn commit: r1147051 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/it/MSITE-550/ src/it/MSITE-550/src/ src/it/MSITE-550/src/site/
src/it/MSITE-550/src/site/apt/ src/main/java/org/apache/maven/plugins/site/
Author: ltheussl
Date: Fri Jul 15 09:21:51 2011
New Revision: 1147051
URL: http://svn.apache.org/viewvc?rev=1147051&view=rev
Log:
[MSITE-550] attributes parameter does not work. merge r1147048 from trunk
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/
- copied from r1147048, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/pom.xml
- copied unchanged from r1147048, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/
- copied from r1147048, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/site/
- copied from r1147048, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/site/apt/
- copied from r1147048, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/apt/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/site/apt/index.apt
- copied unchanged from r1147048, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/apt/index.apt
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/site/site.vm
- copied unchanged from r1147048, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.vm
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/site/site.xml
- copied unchanged from r1147048, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/verify.bsh
- copied unchanged from r1147048, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/verify.bsh
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 15 09:21:51 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,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,1145555,1145947
+/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,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,1145555,1145947,1147048
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1147051&r1=1147050&r2=1147051&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Fri Jul 15 09:21:51 2011
@@ -130,7 +130,7 @@ public abstract class AbstractSiteRender
/**
* The template properties for rendering the site.
*
- * @parameter expression="${attributes}"
+ * @parameter
*/
private Map<String, Object> attributes;