Author: dennisl
Date: Mon Mar 28 19:02:28 2011
New Revision: 1086340
URL: http://svn.apache.org/viewvc?rev=1086340&view=rev
Log:
o Merge r1086338,1086339 from trunk.
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/pom.xml
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 28 19:02:28 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
+/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,1086338-1086339
Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=1086340&r1=1086339&r2=1086340&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Mon Mar 28 19:02:28
2011
@@ -178,8 +178,8 @@ under the License.
<url>http://maven.apache.org/plugins/maven-site-plugin-${project.version}</url>
<properties>
- <doxiaVersion>1.1.4</doxiaVersion>
- <doxiaSitetoolsVersion>1.1.5-SNAPSHOT</doxiaSitetoolsVersion>
+ <doxiaVersion>1.1.5-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>1.2-SNAPSHOT</doxiaSitetoolsVersion>
<mavenVersion>3.0</mavenVersion>
<wagonVersion>1.0-beta-6</wagonVersion>
<plexusVersion>1.5.4</plexusVersion>
