Author: brett
Date: Fri May 13 06:24:05 2005
New Revision: 170018
URL: http://svn.apache.org/viewcvs?rev=170018&view=rev
Log:
update dependencies to released versions
Modified:
maven/components/trunk/maven-reports/maven-checkstyle-plugin/pom.xml
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
maven/components/trunk/maven-reports/maven-pmd-plugin/pom.xml
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/pom.xml
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/trunk/maven-reports/maven-checkstyle-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-checkstyle-plugin/pom.xml?rev=170018&r1=170017&r2=170018&view=diff
==============================================================================
--- maven/components/trunk/maven-reports/maven-checkstyle-plugin/pom.xml
(original)
+++ maven/components/trunk/maven-reports/maven-checkstyle-plugin/pom.xml Fri
May 13 06:24:05 2005
@@ -1,12 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>mojo</artifactId>
+ <artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-alpha-2</version>
</parent>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-alpha-1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven Checkstyle Plugin</name>
<inceptionYear>2005</inceptionYear>
@@ -14,17 +14,17 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-alpha-2</version>
</dependency>
<dependency>
<groupId>doxia</groupId>
<artifactId>doxia-core</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0-alpha-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-alpha-2</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
Modified:
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=170018&r1=170017&r2=170018&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
(original)
+++
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Fri May 13 06:24:05 2005
@@ -98,7 +98,8 @@
if ( StringUtils.isNotEmpty( extraFormatter ) )
{
FileOutputStream out;
- File resultFile = new File(
getConfiguration().getOutputDirectory(), resultFileName );
+ // TODO: I removed outputDirectory, and shouldn't have. Put it
back here.
+ File resultFile = new File(
getConfiguration().getModel().getBuild().getDirectory() + "/site",
resultFileName );
try
{
File parentFile = resultFile.getParentFile();
Modified:
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java?rev=170018&r1=170017&r2=170018&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
(original)
+++
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
Fri May 13 06:24:05 2005
@@ -88,8 +88,6 @@
config.setModel( project.getModel() );
- config.setOutputDirectory( new File( outputDirectory ) );
-
MavenReport report = new CheckstyleReport();
report.setConfiguration( config );
Modified: maven/components/trunk/maven-reports/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-pmd-plugin/pom.xml?rev=170018&r1=170017&r2=170018&view=diff
==============================================================================
--- maven/components/trunk/maven-reports/maven-pmd-plugin/pom.xml (original)
+++ maven/components/trunk/maven-reports/maven-pmd-plugin/pom.xml Fri May 13
06:24:05 2005
@@ -1,12 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>mojo</artifactId>
+ <artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-alpha-2</version>
</parent>
<artifactId>maven-pmd-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-alpha-1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven PMD Plugin</name>
<inceptionYear>2005</inceptionYear>
@@ -14,17 +14,17 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-alpha-2</version>
</dependency>
<dependency>
<groupId>doxia</groupId>
<artifactId>doxia-core</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0-alpha-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-alpha-2</version>
</dependency>
<dependency>
<groupId>pmd</groupId>
Modified:
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-project-info-reports-plugin/pom.xml?rev=170018&r1=170017&r2=170018&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/pom.xml
(original)
+++
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/pom.xml
Fri May 13 06:24:05 2005
@@ -1,12 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>mojo</artifactId>
+ <artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-alpha-2</version>
</parent>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-alpha-1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven Project Info Reports Plugin</name>
<inceptionYear>2005</inceptionYear>
@@ -14,22 +14,22 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-alpha-2</version>
</dependency>
<dependency>
<groupId>doxia</groupId>
<artifactId>doxia-core</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0-alpha-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-alpha-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-alpha-2</version>
</dependency>
</dependencies>
</project>
Modified:
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=170018&r1=170017&r2=170018&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
(original)
+++
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
Fri May 13 06:24:05 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.reports.projectinfo;
+package org.apache.maven.report.projectinfo;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Modified:
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java?rev=170018&r1=170017&r2=170018&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
(original)
+++
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
Fri May 13 06:24:05 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.reports.projectinfo;
+package org.apache.maven.report.projectinfo;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Modified:
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java?rev=170018&r1=170017&r2=170018&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
(original)
+++
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
Fri May 13 06:24:05 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.reports.projectinfo;
+package org.apache.maven.report.projectinfo;
/*
* Copyright 2005 The Apache Software Foundation.
@@ -21,7 +21,6 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReport;
import org.apache.maven.reporting.MavenReportConfiguration;
-import org.apache.maven.reporting.MavenReportException;
import org.codehaus.doxia.module.xhtml.XhtmlSink;
import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.FileUtils;
@@ -29,8 +28,8 @@
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
@@ -87,8 +86,6 @@
MavenReportConfiguration config = new MavenReportConfiguration();
config.setModel( project.getModel() );
-
- config.setOutputDirectory( new File( outputDirectory ) );
MavenReport dependenciesReport = new DependenciesReport();
Modified:
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml?rev=170018&r1=170017&r2=170018&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml
Fri May 13 06:24:05 2005
@@ -8,13 +8,13 @@
<component>
<role>org.apache.maven.reporting.MavenReport</role>
<role-hint>dependencies</role-hint>
-
<implementation>org.apache.maven.reports.projectinfo.DependenciesReport</implementation>
+
<implementation>org.apache.maven.report.projectinfo.DependenciesReport</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
</component>
<component>
<role>org.apache.maven.reporting.MavenReport</role>
<role-hint>mail-lists</role-hint>
-
<implementation>org.apache.maven.reports.projectinfo.MailingListsReport</implementation>
+
<implementation>org.apache.maven.report.projectinfo.MailingListsReport</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
</component>
</components>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
