Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update dependencies to released versions 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170018 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-05-13 13:24:05 +00:00
parent f9f481fc12
commit 724b057ad2
9 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maven-reports/maven-checkstyle-plugin/pom.xml
View File

@ -1,12 +1,12 @@
<project> <project>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>mojo</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>1.0-SNAPSHOT</version> <version>2.0-alpha-2</version>
</parent> </parent>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>2.0-alpha-1-SNAPSHOT</version>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Checkstyle Plugin</name> <name>Maven Checkstyle Plugin</name>
<inceptionYear>2005</inceptionYear> <inceptionYear>2005</inceptionYear>
@ -14,17 +14,17 @@
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId> <artifactId>maven-project</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-alpha-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>doxia</groupId> <groupId>doxia</groupId>
<artifactId>doxia-core</artifactId> <artifactId>doxia-core</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version> <version>1.0-alpha-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.reporting</groupId> <groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId> <artifactId>maven-reporting-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-alpha-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>plexus</groupId> <groupId>plexus</groupId>

3
maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
View File

@ -98,7 +98,8 @@ public class CheckstyleReport
if ( StringUtils.isNotEmpty( extraFormatter ) ) if ( StringUtils.isNotEmpty( extraFormatter ) )
{ {
FileOutputStream out; 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 try
{ {
File parentFile = resultFile.getParentFile(); File parentFile = resultFile.getParentFile();

2
maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
View File

@ -88,8 +88,6 @@ public class CheckstyleReportMojo
config.setModel( project.getModel() ); config.setModel( project.getModel() );
config.setOutputDirectory( new File( outputDirectory ) );
MavenReport report = new CheckstyleReport(); MavenReport report = new CheckstyleReport();
report.setConfiguration( config ); report.setConfiguration( config );

12
maven-reports/maven-pmd-plugin/pom.xml
View File

@ -1,12 +1,12 @@
<project> <project>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>mojo</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>1.0-SNAPSHOT</version> <version>2.0-alpha-2</version>
</parent> </parent>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>2.0-alpha-1-SNAPSHOT</version>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven PMD Plugin</name> <name>Maven PMD Plugin</name>
<inceptionYear>2005</inceptionYear> <inceptionYear>2005</inceptionYear>
@ -14,17 +14,17 @@
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId> <artifactId>maven-project</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-alpha-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>doxia</groupId> <groupId>doxia</groupId>
<artifactId>doxia-core</artifactId> <artifactId>doxia-core</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version> <version>1.0-alpha-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.reporting</groupId> <groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId> <artifactId>maven-reporting-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-alpha-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>pmd</groupId> <groupId>pmd</groupId>

14
maven-reports/maven-project-info-reports-plugin/pom.xml
View File

@ -1,12 +1,12 @@
<project> <project>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>mojo</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>1.0-SNAPSHOT</version> <version>2.0-alpha-2</version>
</parent> </parent>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>2.0-alpha-1-SNAPSHOT</version>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Project Info Reports Plugin</name> <name>Maven Project Info Reports Plugin</name>
<inceptionYear>2005</inceptionYear> <inceptionYear>2005</inceptionYear>
@ -14,22 +14,22 @@
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId> <artifactId>maven-project</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-alpha-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>doxia</groupId> <groupId>doxia</groupId>
<artifactId>doxia-core</artifactId> <artifactId>doxia-core</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version> <version>1.0-alpha-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.reporting</groupId> <groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId> <artifactId>maven-reporting-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-alpha-2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-alpha-2</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.reports.projectinfo; package org.apache.maven.report.projectinfo;
/* /*
* Copyright 2004-2005 The Apache Software Foundation. * Copyright 2004-2005 The Apache Software Foundation.

2
maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.reports.projectinfo; package org.apache.maven.report.projectinfo;
/* /*
* Copyright 2004-2005 The Apache Software Foundation. * Copyright 2004-2005 The Apache Software Foundation.

7
maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.reports.projectinfo; package org.apache.maven.report.projectinfo;
/* /*
* Copyright 2005 The Apache Software Foundation. * Copyright 2005 The Apache Software Foundation.
@ -21,7 +21,6 @@ import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReport;
import org.apache.maven.reporting.MavenReportConfiguration; import org.apache.maven.reporting.MavenReportConfiguration;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.doxia.module.xhtml.XhtmlSink; import org.codehaus.doxia.module.xhtml.XhtmlSink;
import org.codehaus.doxia.site.renderer.SiteRenderer; import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.FileUtils;
@ -29,8 +28,8 @@ import org.codehaus.plexus.util.StringInputStream;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import java.io.File; import java.io.File;
import java.io.InputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -88,8 +87,6 @@ public class ProjectReportsMojo
config.setModel( project.getModel() ); config.setModel( project.getModel() );
config.setOutputDirectory( new File( outputDirectory ) );
MavenReport dependenciesReport = new DependenciesReport(); MavenReport dependenciesReport = new DependenciesReport();
dependenciesReport.setConfiguration( config ); dependenciesReport.setConfiguration( config );

4
maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml
View File

@ -8,13 +8,13 @@
<component> <component>
<role>org.apache.maven.reporting.MavenReport</role> <role>org.apache.maven.reporting.MavenReport</role>
<role-hint>dependencies</role-hint> <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> <instantiation-strategy>per-lookup</instantiation-strategy>
</component> </component>
<component> <component>
<role>org.apache.maven.reporting.MavenReport</role> <role>org.apache.maven.reporting.MavenReport</role>
<role-hint>mail-lists</role-hint> <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> <instantiation-strategy>per-lookup</instantiation-strategy>
</component> </component>
</components> </components>