Author: ltheussl
Date: Wed May 25 09:33:20 2011
New Revision: 1127453
URL: http://svn.apache.org/viewvc?rev=1127453&view=rev
Log:
merge changes from trunk
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/
- copied from r1126945,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/first/
- copied from r1126945,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/first/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/first/pom.xml
- copied unchanged from r1126945,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/first/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/invoker.properties
- copied unchanged from r1126945,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/invoker.properties
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/pom.xml
- copied unchanged from r1126945,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/second/
- copied from r1126945,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/second/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/second/pom.xml
- copied unchanged from r1126945,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/second/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/
- copied from r1126945,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/site/
- copied from r1126945,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/site/site.xml
- copied unchanged from r1126945,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/verify.bsh
- copied unchanged from r1126945,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/
- copied from r1126420,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/goals.txt
- copied unchanged from r1126420,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/goals.txt
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/
- copied from r1126420,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml
- copied unchanged from r1126420,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml
- copied unchanged from r1126420,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/src/
- copied from r1126420,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/src/site/
- copied from r1126420,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/src/site/site.xml
- copied unchanged from r1126420,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/src/site/xdoc/
- copied from r1126420,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/xdoc/
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/src/site/xdoc/index.xml
- copied unchanged from r1126420,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/xdoc/index.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh
- copied unchanged from r1126420,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh
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 Wed May 25 09:33:20 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
+/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
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=1127453&r1=1127452&r2=1127453&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Wed May 25 09:33:20
2011
@@ -186,7 +186,7 @@ under the License.
<properties>
<doxiaVersion>1.2</doxiaVersion>
- <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion>
+ <doxiaSitetoolsVersion>1.2.1-SNAPSHOT</doxiaSitetoolsVersion>
<mavenVersion>3.0</mavenVersion>
<wagonVersion>1.0-beta-6</wagonVersion>
<plexusVersion>1.5.4</plexusVersion>
@@ -602,6 +602,10 @@ under the License.
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
+ <!-- FIXME: remove! -->
+ <pomExcludes>
+ <pomInclude>interpolation/pom.xml</pomInclude>
+ </pomExcludes>
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<goals>
