You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2015/11/27 11:49:25 UTC
svn commit: r1716825 - in /maven/shared/trunk/file-management: pom.xml
src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
Author: khmarbaise
Date: Fri Nov 27 10:49:25 2015
New Revision: 1716825
URL: http://svn.apache.org/viewvc?rev=1716825&view=rev
Log:
[MSHARED-467] Upgrade Maven 3.X Only JDK 1.6
Upgraded parent from version 21 to 22
Using JDK 1.6
Upgraded maven-shared-utils to 3.0.0
modello-maven-plugin using parent version
apache-rat-plugin configuration now appends configurations
instead of replacing it.
Improved some code parts (Java 5 like).
Modified:
maven/shared/trunk/file-management/pom.xml
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
Modified: maven/shared/trunk/file-management/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/file-management/pom.xml?rev=1716825&r1=1716824&r2=1716825&view=diff
==============================================================================
--- maven/shared/trunk/file-management/pom.xml (original)
+++ maven/shared/trunk/file-management/pom.xml Fri Nov 27 10:49:25 2015
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>21</version>
+ <version>22</version>
<relativePath>../../pom/maven/maven-shared-components/pom.xml</relativePath>
</parent>
@@ -43,7 +43,7 @@ under the License.
</contributors>
<prerequisites>
- <maven>2.2.1</maven>
+ <maven>${mavenVersion}</maven>
</prerequisites>
<scm>
@@ -61,13 +61,18 @@ under the License.
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
</site>
</distributionManagement>
+ <properties>
+ <mavenVersion>3.0</mavenVersion>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ </properties>
<dependencies>
<!-- Maven -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.2.1</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -78,9 +83,14 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>0.7</version>
+ <version>3.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0.22</version>
+ </dependency>
<!-- Test -->
<dependency>
<groupId>junit</groupId>
@@ -95,8 +105,8 @@ under the License.
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.4.1</version>
<configuration>
+ <useJava5>true</useJava5>
<version>1.1.0</version>
<models>
<model>src/main/mdo/fileset.mdo</model>
@@ -124,18 +134,10 @@ under the License.
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<exclude>src/test/resources/test*/**/*.txt</exclude>
- </excludes>
+ </excludes>
</configuration>
- <executions>
- <execution>
- <id>check</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java?rev=1716825&r1=1716824&r2=1716825&view=diff
==============================================================================
--- maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java (original)
+++ maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java Fri Nov 27 10:49:25 2015
@@ -19,6 +19,19 @@ package org.apache.maven.shared.model.fi
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.shared.io.logging.DefaultMessageHolder;
import org.apache.maven.shared.io.logging.MessageHolder;
@@ -33,20 +46,6 @@ import org.apache.maven.shared.utils.io.
import org.apache.maven.shared.utils.io.FileUtils;
import org.codehaus.plexus.logging.Logger;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* Provides operations for use with FileSet instances, such as retrieving the included/excluded files, deleting all
* matching entries, etc.
@@ -413,9 +412,9 @@ public class FileSetManager
return Collections.EMPTY_SET;
}
- Set includes = new HashSet( Arrays.asList( scanner.getIncludedDirectories() ) );
- Collection excludes = new ArrayList( Arrays.asList( scanner.getExcludedDirectories() ) );
- Collection linksForDeletion = new ArrayList();
+ Set<String> includes = new HashSet<String>( Arrays.asList( scanner.getIncludedDirectories() ) );
+ List<String> excludes = new ArrayList<String>( Arrays.asList( scanner.getExcludedDirectories() ) );
+ List<String> linksForDeletion = new ArrayList<String>();
if ( !fileSet.isFollowSymlinks() )
{
@@ -435,7 +434,7 @@ public class FileSetManager
messages.addDebugMessage( "Marked for preserve (with followSymlinks == false): " + excludes ).flush();
}
- List includedDirsAndSymlinks = Arrays.asList( scanner.getIncludedDirectories() );
+ List<String> includedDirsAndSymlinks = Arrays.asList( scanner.getIncludedDirectories() );
linksForDeletion.addAll( excludes );
linksForDeletion.retainAll( includedDirsAndSymlinks );
@@ -456,7 +455,7 @@ public class FileSetManager
return includes;
}
- private Set findDeletableFiles( FileSet fileSet, Set deletableDirectories )
+ private Set<String> findDeletableFiles( FileSet fileSet, Set<String> deletableDirectories )
{
if ( verbose && messages != null )
{
@@ -470,10 +469,10 @@ public class FileSetManager
return deletableDirectories;
}
- Set includes = deletableDirectories;
+ Set<String> includes = deletableDirectories;
includes.addAll( Arrays.asList( scanner.getIncludedFiles() ) );
- Collection excludes = new ArrayList( Arrays.asList( scanner.getExcludedFiles() ) );
- Collection linksForDeletion = new ArrayList();
+ List<String> excludes = new ArrayList<String>( Arrays.asList( scanner.getExcludedFiles() ) );
+ List<String> linksForDeletion = new ArrayList<String>();
if ( !fileSet.isFollowSymlinks() )
{
@@ -493,7 +492,7 @@ public class FileSetManager
messages.addDebugMessage( "Marked for preserve (with followSymlinks == false): " + excludes ).flush();
}
- List includedFilesAndSymlinks = Arrays.asList( scanner.getIncludedFiles() );
+ List<String> includedFilesAndSymlinks = Arrays.asList( scanner.getIncludedFiles() );
linksForDeletion.addAll( excludes );
linksForDeletion.retainAll( includedFilesAndSymlinks );
@@ -524,7 +523,7 @@ public class FileSetManager
* @param deletablePaths The relative paths to files/directories which are scheduled for deletion, must not be
* <code>null</code>.
*/
- private void excludeParentDirectoriesOfExcludedPaths( Collection excludedPaths, Set deletablePaths )
+ private void excludeParentDirectoriesOfExcludedPaths( List<String> excludedPaths, Set<String> deletablePaths )
{
for ( Iterator it = excludedPaths.iterator(); it.hasNext(); )
{
Modified: maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java?rev=1716825&r1=1716824&r2=1716825&view=diff
==============================================================================
--- maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java (original)
+++ maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java Fri Nov 27 10:49:25 2015
@@ -27,14 +27,14 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.apache.maven.shared.model.fileset.FileSet;
import org.apache.maven.shared.utils.cli.CommandLineException;
import org.apache.maven.shared.utils.cli.Commandline;
import org.apache.maven.shared.utils.io.FileUtils;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
/**
* Test the FileSet
*
@@ -43,24 +43,24 @@ import org.apache.maven.shared.utils.io.
public class FileSetUtilsTest
extends TestCase
{
- private Set testDirectories = new HashSet();
+ private Set<File> testDirectories = new HashSet<File>();
- private Set linkFiles = new HashSet();
+ private Set<File> linkFiles = new HashSet<File>();
/** {@inheritDoc} */
public void tearDown()
throws IOException
{
- for ( Iterator it = linkFiles.iterator(); it.hasNext(); )
+ for ( Iterator<File> it = linkFiles.iterator(); it.hasNext(); )
{
- File linkFile = (File) it.next();
+ File linkFile = it.next();
linkFile.delete();
}
- for ( Iterator it = testDirectories.iterator(); it.hasNext(); )
+ for ( Iterator<File> it = testDirectories.iterator(); it.hasNext(); )
{
- File dir = (File) it.next();
+ File dir = it.next();
FileUtils.deleteDirectory( dir );
}