Author: brianf
Date: Tue Sep 11 19:13:45 2007
New Revision: 574768

URL: http://svn.apache.org/viewvc?rev=574768&view=rev
Log:
merged in branch with the patch from mdep-104

Added:
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
    
maven/plugins/trunk/maven-dependency-plugin/src/main/resources/analyze-report.properties
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/main/resources/analyze-report.properties
    maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/maven-parent/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/maven-parent/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/maven-parent/5/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/maven-parent/5/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/maven-parent/5/maven-parent-5.pom
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/maven-parent/5/maven-parent-5.pom
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/maven-parent/5/maven-parent-5.pom.sha1
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/maven-parent/5/maven-parent-5.pom.sha1
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/maven-metadata-local.xml
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/maven-metadata-local.xml
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.jar
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.jar
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.pom
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.pom
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-metadata-central.xml
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-metadata-central.xml
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-plugins/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-plugins/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-plugins/8/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-plugins/8/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-plugins/8/maven-plugins-8.pom
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-plugins/8/maven-plugins-8.pom
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-plugins/8/maven-plugins-8.pom.sha1
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-plugins/8/maven-plugins-8.pom.sha1
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-plugins/9-SNAPSHOT/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-plugins/9-SNAPSHOT/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-plugins/9-SNAPSHOT/maven-metadata-local.xml
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-plugins/9-SNAPSHOT/maven-metadata-local.xml
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-plugins/9-SNAPSHOT/maven-plugins-9-SNAPSHOT.pom
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-plugins/9-SNAPSHOT/maven-plugins-9-SNAPSHOT.pom
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-plugins/maven-metadata-local.xml
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-plugins/maven-metadata-local.xml
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-site-plugin/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-site-plugin/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-site-plugin/maven-metadata-central.xml
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-site-plugin/maven-metadata-central.xml
    maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/test/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/test/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/test/resolve/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/test/resolve/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/test/resolve/1/
      - copied from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/test/resolve/1/
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/test/resolve/1/resolve-1.jar
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/test/resolve/1/resolve-1.jar
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/test/resolve/1/resolve-1.pom
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/test/resolve/1/resolve-1.pom
    
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/test/resolve/maven-metadata-local.xml
      - copied unchanged from r574766, 
maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/test/resolve/maven-metadata-local.xml
Modified:
    maven/plugins/trunk/maven-dependency-plugin/pom.xml
    maven/plugins/trunk/maven-dependency-plugin/src/site/site.xml

Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=574768&r1=574767&r2=574768&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Tue Sep 11 19:13:45 2007
@@ -112,6 +112,16 @@
                                        </execution>
                                </executions>
                        </plugin>
+                       
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <version>2.3</version>
+                               <configuration>
+                                       <!-- Need of more head space in order 
to run the unit tests !-->
+                                       <argLine>-Xmx256m</argLine>
+                               </configuration>
+                       </plugin>
                </plugins>
                <resources>
                        <!-- Include the apache process LICENSE and NOTICE 
files.-->
@@ -241,6 +251,53 @@
                                </exclusion>                      
                        </exclusions>
                </dependency>
+               
+                <!-- 
+                <dependency>
+                    <groupId>classworlds</groupId>
+                    <artifactId>classworlds</artifactId>
+                    <version>1.1-alpha-2</version>
+                    <scope>test</scope>
+                </dependency>
+                
+                <dependency>
+                    <groupId>org.apache.maven.shared</groupId>
+                    <artifactId>maven-invoker</artifactId>
+                    <version>2.0.6</version>
+                    <scope>test</scope>
+                </dependency>-->
+                
+               <!-- Dependencies for Analyze-report mojo -->
+                <dependency>
+                    <groupId>org.apache.maven.reporting</groupId>
+                    <artifactId>maven-reporting-api</artifactId>
+                    <version>2.0.6</version>
+                </dependency>
+                
+                <dependency>
+                    <groupId>org.apache.maven.reporting</groupId>
+                    <artifactId>maven-reporting-impl</artifactId>
+                    <version>2.0.4</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.maven.doxia</groupId>
+                    <artifactId>doxia-sink-api</artifactId>
+                    <version>1.0-alpha-8</version>
+                </dependency>
+                
+                <dependency>
+                    <groupId>org.apache.maven.doxia</groupId>
+                    <artifactId>doxia-site-renderer</artifactId>
+                    <version>1.0-alpha-8</version>
+                </dependency>
+                
+                <dependency>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>2.0-SNAPSHOT</version>
+                </dependency>
+                
+               
        </dependencies>
 
        <!-- TODO: remove when plexus-archiver is released -->
@@ -253,4 +310,21 @@
                        </releases>
                </repository>
        </repositories>
+        
+        <reporting>
+            <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>2.0-alpha-5-SNAPSHOT</version>
+                        <reportSets>
+                            <reportSet>
+                                <reports>
+                                    <report>analyze-report</report>
+                                </reports>
+                            </reportSet>
+                        </reportSets>                      
+                    </plugin>
+            </plugins>
+        </reporting>
 </project>

Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/site.xml?rev=574768&r1=574767&r2=574768&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/site.xml Tue Sep 11 
19:13:45 2007
@@ -37,5 +37,6 @@
     <menu name="Resources">
       <item name="Dependency Mechanism" 
href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html";
 />
     </menu>
+       <menu ref="reports" />
   </body>
 </project>


Reply via email to