svn commit: r1626386 - /maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java

[krosenvold]

Author: krosenvold
Date: Sat Sep 20 06:18:24 2014
New Revision: 1626386

URL: http://svn.apache.org/r1626386
Log:
Converted atest to use regular zip

Modified:
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java?rev=1626386&r1=1626385&r2=1626386&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java
 Sat Sep 20 06:18:24 2014
@@ -20,14 +20,14 @@ package org.apache.maven.plugin.javadoc;
  */
 
 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;
 
 import java.io.File;
 import java.util.Enumeration;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 /**
  * @author <a href="mailto:och...@apache.org";>Maria Odea Ching</a>
@@ -56,7 +56,7 @@ public class JavadocJarTest
         //validate contents of jar file
         ZipFile jar = new ZipFile( generatedFile );
         Set<String> set = new HashSet<String>();
-        for( Enumeration<ZipEntry> entries = jar.getEntries(); 
entries.hasMoreElements(); )
+        for( Enumeration<? extends ZipEntry> entries = jar.entries(); 
entries.hasMoreElements(); )
         {
             ZipEntry entry = entries.nextElement();
             set.add( entry.getName() );