maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r810304 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ pom.xml src/it/full-reporting/pom.xml src/it/full-reporting/verify.groovy
Date Tue, 01 Sep 2009 23:18:47 GMT
Author: olamy
Date: Tue Sep  1 23:18:46 2009
New Revision: 810304

URL: http://svn.apache.org/viewvc?rev=810304&view=rev
Log:
merge -r 810297:810298 from site plugin trunk.

Modified:
    maven/plugins/branches/maven-site-plugin-3.x/   (props changed)
    maven/plugins/branches/maven-site-plugin-3.x/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy

Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep  1 23:18:46 2009
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252
+/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252,810298

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=810304&r1=810303&r2=810304&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Tue Sep  1 23:18:46 2009
@@ -161,6 +161,7 @@
     <wagonVersion>1.0-beta-4</wagonVersion>
     <plexusVersion>1.2.1-SNAPSHOT</plexusVersion>
     <javadocPluginVersion>2.6.1-SNAPSHOT</javadocPluginVersion>
+    <projectInfoReportsPluginVersion>2.2-SNAPSHOT</projectInfoReportsPluginVersion>
   </properties>
 
   <dependencies>
@@ -369,7 +370,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.2-SNAPSHOT</version>          
+        <version>${projectInfoReportsPluginVersion}</version>          
       </plugin>
     </plugins>
   </reporting>
@@ -471,7 +472,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>2.2-SNAPSHOT</version>          
+            <version>${projectInfoReportsPluginVersion}</version>          
           </plugin>
           <plugin>
             <!-- SNAPSHOT use due to MJAVADOC-251  -->

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml?rev=810304&r1=810303&r2=810304&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml Tue Sep  1
23:18:46 2009
@@ -43,8 +43,12 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.4.3</version>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.1.2</version>
+        <configuration>
+          <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy?rev=810304&r1=810303&r2=810304&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy Tue Sep
 1 23:18:46 2009
@@ -30,6 +30,7 @@
 assert new File(basedir, 'target/site/checkstyle.html').exists();
 assert new File(basedir, 'target/site/cpd.html').exists();
 assert new File(basedir, 'target/site/apidocs/index.html').exists();
+assert new File(basedir, 'target/site/apidocs/org/apache/maven/plugins/site/its/App.html').exists();
 assert new File(basedir, 'target/site/cobertura/index.html').exists();
 assert new File(basedir, 'target/site/xref/index.html').exists();
 assert new File(basedir, 'target/site/xref-test/index.html').exists();
@@ -37,4 +38,8 @@
 assert new File(basedir, 'target/site/taglist.html').exists();
 assert new File(basedir, 'target/site/team-list.html').exists();
 
+assert new File(basedir, 'target/site/dependencies.html').exists();
+content = new File(basedir, 'target/site/dependencies.html').text;
+assert content.contains( 'junit:junit:jar:3.8.2' );
+
 return true;
\ No newline at end of file



Mime
View raw message