You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/10 00:09:43 UTC
svn commit: r312503 - in /maven/components/trunk:
maven-mboot2/src/main/java/model/ maven-plugins/maven-assembly-plugin/
maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/
maven-plugins/maven-checkstyle-plugin/ maven-pl...
Author: brett
Date: Sun Oct 9 15:09:21 2005
New Revision: 312503
URL: http://svn.apache.org/viewcvs?rev=312503&view=rev
Log:
PR: MNG-962
unify defaults excludes
Modified:
maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java
maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Modified: maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java?rev=312503&r1=312502&r2=312503&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java Sun Oct 9 15:09:21 2005
@@ -80,10 +80,7 @@
else if ( LAYOUT_DEFAULT.equals( layout ) )
{
repositoryPath = dependency.getGroupId().replace( '.', '/' );
-// if ( !dependency.getType().equals( "pom" ) )
-// {
repositoryPath = repositoryPath + "/" + dependency.getArtifactId() + "/" + dependency.getVersion();
-// }
repositoryPath = repositoryPath + "/" + dependency.getArtifact();
}
else
Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml?rev=312503&r1=312502&r2=312503&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml Sun Oct 9 15:09:21 2005
@@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-assembly-plugin</artifactId>
@@ -51,13 +51,23 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0-beta-1</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java?rev=312503&r1=312502&r2=312503&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java Sun Oct 9 15:09:21 2005
@@ -50,7 +50,6 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.regex.Matcher;
@@ -304,8 +303,7 @@
"Unable to obtain unarchiver for file '" + artifact.getFile() + "'" );
}
}
- archiver.addDirectory( tempLocation, null,
- (String[]) getDefaultExcludes().toArray( EMPTY_STRING_ARRAY ) );
+ archiver.addDirectory( tempLocation, null, FileUtils.getDefaultExcludes() );
}
else
{
@@ -378,7 +376,7 @@
// TODO: default excludes should be in the archiver?
List excludesList = fileSet.getExcludes();
- excludesList.addAll( getDefaultExcludes() );
+ excludesList.addAll( FileUtils.getDefaultExcludesAsList() );
String[] excludes = (String[]) excludesList.toArray( EMPTY_STRING_ARRAY );
File archiveBaseDir = new File( directory );
@@ -528,42 +526,6 @@
archiver = this.archiverManager.getArchiver( format );
}
return archiver;
- }
-
- /**
- * Insert into the exclude list the default excludes file pattern.
- *
- * @return defaultExcludes List containing the default patterns of files to be excluded.
- */
- public static List getDefaultExcludes()
- {
- List defaultExcludes = new ArrayList();
- defaultExcludes.add( "**/*~" );
- defaultExcludes.add( "**/#*#" );
- defaultExcludes.add( "**/.#*" );
- defaultExcludes.add( "**/%*%" );
- defaultExcludes.add( "**/._*" );
-
- // CVS
- defaultExcludes.add( "**/CVS" );
- defaultExcludes.add( "**/CVS/**" );
- defaultExcludes.add( "**/.cvsignore" );
-
- // SCCS
- defaultExcludes.add( "**/SCCS" );
- defaultExcludes.add( "**/SCCS/**" );
-
- // Visual SourceSafe
- defaultExcludes.add( "**/vssver.scc" );
-
- // Subversion
- defaultExcludes.add( "**/.svn" );
- defaultExcludes.add( "**/.svn/**" );
-
- // Mac
- defaultExcludes.add( "**/.DS_Store" );
-
- return defaultExcludes;
}
private void copyReplacingLineEndings( File source, File dest, String lineEndings )
Modified: maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml?rev=312503&r1=312502&r2=312503&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml Sun Oct 9 15:09:21 2005
@@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-beta-3</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.0-beta-1</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>antlr</groupId>
@@ -65,6 +65,10 @@
<groupId>checkstyle</groupId>
<artifactId>checkstyle-optional</artifactId>
<version>3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
</project>
Modified: maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=312503&r1=312502&r2=312503&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java (original)
+++ maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java Sun Oct 9 15:09:21 2005
@@ -369,14 +369,15 @@
excludesStr.append( excludes );
}
- for ( int i = 0; i < DEFAULT_EXCLUDES.length; i++ )
+ String[] defaultExcludes = FileUtils.getDefaultExcludes();
+ for ( int i = 0; i < defaultExcludes.length; i++ )
{
if ( excludesStr.length() > 0 )
{
excludesStr.append( "," );
}
- excludesStr.append( DEFAULT_EXCLUDES[i] );
+ excludesStr.append( defaultExcludes[i] );
}
List files;
Modified: maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml?rev=312503&r1=312502&r2=312503&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml Sun Oct 9 15:09:21 2005
@@ -2,7 +2,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-beta-1</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-pmd-plugin</artifactId>
@@ -24,12 +24,16 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.0-beta-1</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>saxpath</groupId>
<artifactId>saxpath</artifactId>
<version>1.0-FCS</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?rev=312503&r1=312502&r2=312503&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java (original)
+++ maven/components/trunk/maven-plugins/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java Sun Oct 9 15:09:21 2005
@@ -247,13 +247,14 @@
{
excludesStr.append( excludes );
}
- for ( int i = 0; i < DEFAULT_EXCLUDES.length; i++ )
+ String[] defaultExcludes = FileUtils.getDefaultExcludes();
+ for ( int i = 0; i < defaultExcludes.length; i++ )
{
if ( excludesStr.length() > 0 )
{
excludesStr.append( "," );
}
- excludesStr.append( DEFAULT_EXCLUDES[i] );
+ excludesStr.append( defaultExcludes[i] );
}
return FileUtils.getFiles( dir, includes, excludesStr.toString() );
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=312503&r1=312502&r2=312503&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java Sun Oct 9 15:09:21 2005
@@ -69,32 +69,6 @@
private static final String DEFAULT_TEMPLATE = RESOURCE_DIR + "/maven-site.vm";
/**
- * Patterns which should be excluded by default.
- */
- // TODO Push me into a shared area (plexus-utils?)
- private static final String[] DEFAULT_EXCLUDES = new String[]{
- // Miscellaneous typical temporary files
- "**/*~", "**/#*#", "**/.#*", "**/%*%", "**/._*",
-
- // CVS
- "**/CVS", "**/CVS/**", "**/.cvsignore",
-
- // SCCS
- "**/SCCS", "**/SCCS/**",
-
- // Visual SourceSafe
- "**/vssver.scc",
-
- // Subversion
- "**/.svn", "**/.svn/**",
-
- // Arch/Bazaar
- "**/.arch-ids", "**/.arch-ids/**",
-
- // Mac
- "**/.DS_Store"};
-
- /**
* Directory containing source for apt, fml and xdoc docs.
*
* @parameter expression="${basedir}/src/site"
@@ -294,7 +268,7 @@
// Try to find duplicate files
Map duplicate = new LinkedHashMap();
- String defaultExcludes = StringUtils.join( DEFAULT_EXCLUDES, "," );
+ String defaultExcludes = StringUtils.join( FileUtils.getDefaultExcludes(), "," );
if ( siteDirectoryFile.exists() )
{
Modified: maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java?rev=312503&r1=312502&r2=312503&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java (original)
+++ maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java Sun Oct 9 15:09:21 2005
@@ -25,6 +25,7 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringInputStream;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -43,26 +44,6 @@
extends AbstractMojo
implements MavenReport
{
- /**
- * @todo share, use default excludes from plexus utils.
- */
- protected static final String[] DEFAULT_EXCLUDES = {// Miscellaneous typical temporary files
- "**/*~", "**/#*#", "**/.#*", "**/%*%", "**/._*",
-
- // CVS
- "**/CVS", "**/CVS/**", "**/.cvsignore",
-
- // SCCS
- "**/SCCS", "**/SCCS/**",
-
- // Visual SourceSafe
- "**/vssver.scc",
-
- // Subversion
- "**/.svn", "**/.svn/**",
-
- // Mac
- "**/.DS_Store"};
private Sink sink;