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/17 11:29:24 UTC
svn commit: r1082441 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/it/MSITE-312/ src/it/MSITE-312/child/ src/it/MSITE-312/child/src/
src/it/MSITE-312/child/src/site/ src/it/MSITE-312/src/
src/it/MSITE-312/src/site/ src/it/MSITE-548/ src/it...
Author: ltheussl
Date: Thu Mar 17 10:29:23 2011
New Revision: 1082441
URL: http://svn.apache.org/viewvc?rev=1082441&view=rev
Log:
merge r1079474 and r1080781 from trunk
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/
- copied from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/child/
- copied from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/child/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/child/pom.xml
- copied unchanged from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/child/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/child/src/
- copied from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/child/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/child/src/site/
- copied from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/child/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/child/src/site/site.xml
- copied unchanged from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/child/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/pom.xml
- copied, changed from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/src/
- copied from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/src/site/
- copied from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/src/site/site.xml
- copied unchanged from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh
- copied, changed from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/
- copied from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/invoker.properties
- copied unchanged from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/invoker.properties
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/module1/
- copied from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/module1/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/module1/pom.xml
- copied unchanged from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/module1/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/module2/
- copied from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/module2/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/module2/pom.xml
- copied unchanged from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/module2/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/pom.xml
- copied, changed from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/root/
- copied from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/root/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/root/pom.xml
- copied, changed from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/root/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/verify.bsh
- copied unchanged from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/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 Thu Mar 17 10:29:23 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,1079529,1079698,1081676,1081837,1081887,1082091,1082242,1082274
+/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
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/pom.xml (from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/pom.xml?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/pom.xml&p1=maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/pom.xml&r1=1080781&r2=1082441&rev=1082441&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/pom.xml Thu Mar 17 10:29:23 2011
@@ -17,6 +17,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.3.1</version>
+ <reports>
+ <report>index</report>
+ </reports>
+ </plugin>
+ </reportPlugins>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
@@ -26,22 +37,6 @@
<parentprop>parent</parentprop>
</properties>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
<modules>
<module>child</module>
</modules>
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh (from r1080781, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/verify.bsh)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh&p1=maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/verify.bsh&r1=1080781&r2=1082441&rev=1082441&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh Thu Mar 17 10:29:23 2011
@@ -75,7 +75,7 @@ try
return false;
}
- index1 = content.indexOf( "<a href=\"http://example.com/parent/child\" class=\"externalLink\" title=\"Child\">Child</a>" );
+ index1 = content.indexOf( "<a href=\"\" title=\"Child\">Child</a>" );
index2 = content.indexOf( "<a href=\"local/parent\" title=\"parent\">parent</a>" );
index3 = content.indexOf( "<a href=\"local/child\" title=\"child\">child</a>" );
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/pom.xml (from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/pom.xml?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/pom.xml&p1=maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/pom.xml&r1=1079474&r2=1082441&rev=1082441&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/pom.xml Thu Mar 17 10:29:23 2011
@@ -23,26 +23,21 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.3.1</version>
+ <reports>
+ <report>index</report>
+ </reports>
+ </plugin>
+ </reportPlugins>
+ </configuration>
</plugin>
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
<modules>
<module>root</module>
</modules>
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/root/pom.xml (from r1079474, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/root/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/root/pom.xml?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/root/pom.xml&p1=maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/root/pom.xml&r1=1079474&r2=1082441&rev=1082441&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/root/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/root/pom.xml Thu Mar 17 10:29:23 2011
@@ -24,27 +24,22 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.3.1</version>
+ <reports>
+ <report>index</report>
+ </reports>
+ </plugin>
+ </reportPlugins>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
<modules>
<module>../module1</module>
<module>../module2</module>