Author: krosenvold
Date: Fri Sep 19 22:17:31 2014
New Revision: 1626353
URL: http://svn.apache.org/r1626353
Log:
Minor changes of api usage in plexus-archiver to avoid upcoming removals
Modified:
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/testutil/Assertions.java
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/AbstractSourcePluginTestCase.java
Modified:
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java?rev=1626353&r1=1626352&r2=1626353&view=diff
==============================================================================
---
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
Fri Sep 19 22:17:31 2014
@@ -23,10 +23,10 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.codehaus.plexus.archiver.zip.ZipEntry;
-import org.codehaus.plexus.archiver.zip.ZipFile;
import org.codehaus.plexus.util.FileUtils;
/**
@@ -124,7 +124,7 @@ public class RarMojoTest
ZipFile rar = new ZipFile( rarFile );
- Enumeration entries = rar.getEntries();
+ Enumeration<? extends ZipEntry> entries = rar.entries();
assertTrue( entries.hasMoreElements() );
@@ -195,7 +195,7 @@ public class RarMojoTest
ZipFile rar = new ZipFile( rarFile );
- Enumeration entries = rar.getEntries();
+ Enumeration<? extends ZipEntry> entries = rar.entries();
assertTrue( entries.hasMoreElements() );
@@ -268,18 +268,18 @@ public class RarMojoTest
ZipFile rar = new ZipFile( rarFile );
- Enumeration entries = rar.getEntries();
+ Enumeration<? extends ZipEntry> entries = rar.entries();
assertTrue( entries.hasMoreElements() );
assertEquals( 0, getSizeOfExpectedFiles( entries, expectedFiles ) );
}
- private int getSizeOfExpectedFiles( Enumeration entries, List
expectedFiles )
+ private int getSizeOfExpectedFiles( Enumeration<? extends ZipEntry>
entries, List expectedFiles )
{
while ( entries.hasMoreElements() )
{
- ZipEntry entry = (ZipEntry) entries.nextElement();
+ ZipEntry entry = entries.nextElement();
if ( expectedFiles.contains( entry.getName() ) )
{
Modified:
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/testutil/Assertions.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/testutil/Assertions.java?rev=1626353&r1=1626352&r2=1626353&view=diff
==============================================================================
---
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/testutil/Assertions.java
(original)
+++
maven/plugins/trunk/maven-repository-plugin/src/test/java/org/apache/maven/plugins/repository/testutil/Assertions.java
Fri Sep 19 22:17:31 2014
@@ -19,13 +19,12 @@ package org.apache.maven.plugins.reposit
* under the License.
*/
-import org.codehaus.plexus.archiver.zip.ZipFile;
-
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import java.util.zip.ZipFile;
import junit.framework.Assert;
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java?rev=1626353&r1=1626352&r2=1626353&view=diff
==============================================================================
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Fri Sep 19 22:17:31 2014
@@ -274,7 +274,7 @@ public abstract class AbstractSourceJarM
archiveProjectContent( subProject, archiver.getArchiver() );
}
- if ( !archiver.getArchiver().getFiles().isEmpty() || forceCreation )
+ if ( archiver.getArchiver().getResources().hasNext() || forceCreation )
{
if ( useDefaultManifestFile && defaultManifestFile.exists() &&
archive.getManifestFile() == null )
Modified:
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/AbstractSourcePluginTestCase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/AbstractSourcePluginTestCase.java?rev=1626353&r1=1626352&r2=1626353&view=diff
==============================================================================
---
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/AbstractSourcePluginTestCase.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/AbstractSourcePluginTestCase.java
Fri Sep 19 22:17:31 2014
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.source;
*/
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.codehaus.plexus.archiver.zip.ZipFile;
import java.io.File;
import java.io.IOException;
@@ -29,6 +28,7 @@ import java.util.Enumeration;
import java.util.Set;
import java.util.TreeSet;
import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
/**
* @author Stephane Nicoll
@@ -47,7 +47,6 @@ public abstract class AbstractSourcePlug
* Execute the source plugin for the specified project.
*
* @param projectName the name of the project
- * @return the base directory of the project
* @throws Exception if an error occurred
*/
protected void executeMojo( final String projectName, String classifier )
@@ -174,7 +173,7 @@ public abstract class AbstractSourcePlug
throws IOException
{
ZipFile jar = new ZipFile( jarFile );
- Enumeration entries = jar.getEntries();
+ Enumeration<? extends ZipEntry> entries = jar.entries();
if ( expectedFiles.length == 0 )
{
@@ -184,11 +183,11 @@ public abstract class AbstractSourcePlug
{
assertTrue( entries.hasMoreElements() );
- Set expected = new TreeSet( Arrays.asList( expectedFiles ) );
+ Set<String> expected = new TreeSet<String>( Arrays.asList(
expectedFiles ) );
while ( entries.hasMoreElements() )
{
- ZipEntry entry = (ZipEntry) entries.nextElement();
+ ZipEntry entry = entries.nextElement();
assertTrue( "Not expecting " + entry.getName() + " in " +
jarFile, expected.remove( entry.getName() ) );
}
