Author: ltheussl
Date: Tue Apr 12 09:25:50 2011
New Revision: 1091338
URL: http://svn.apache.org/viewvc?rev=1091338&view=rev
Log:
merge r1091331 from trunk
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/
- copied from r1091331,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-456/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/child/
- copied from r1091331,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-456/child/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/child/pom.xml
- copied unchanged from r1091331,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-456/child/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/invoker.properties
- copied, changed from r1091331,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-456/invoker.properties
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/pom.xml
- copied unchanged from r1091331,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-456/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/verify.bsh
- copied unchanged from r1091331,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-456/verify.bsh
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 09:25:50 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
+/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
Copied:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/invoker.properties
(from r1091331,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-456/invoker.properties)
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/invoker.properties?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/invoker.properties&p1=maven/plugins/trunk/maven-site-plugin/src/it/MSITE-456/invoker.properties&r1=1091331&r2=1091338&rev=1091338&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-456/invoker.properties
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/invoker.properties
Tue Apr 12 09:25:50 2011
@@ -1 +1 @@
-invoker.maven.version = 3.0-
+invoker.maven.version = 3.0+
