You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/01/24 22:09:55 UTC
svn commit: r1235501 - in /maven/plugins/trunk/maven-assembly-plugin: ./
src/test/java/org/apache/maven/plugin/assembly/archive/
src/test/java/org/apache/maven/plugin/assembly/filter/
Author: krosenvold
Date: Tue Jan 24 21:09:55 2012
New Revision: 1235501
URL: http://svn.apache.org/viewvc?rev=1235501&view=rev
Log:
o Updated deps
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1235501&r1=1235500&r2=1235501&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Jan 24 21:09:55 2012
@@ -52,7 +52,7 @@ under the License.
<properties>
<mdoVersion>1.1.2</mdoVersion>
- <mavenArchiverVersion>2.4.1</mavenArchiverVersion>
+ <mavenArchiverVersion>2.5</mavenArchiverVersion>
<mavenFilteringVersion>1.0</mavenFilteringVersion>
<mavenVersion>2.2.1</mavenVersion>
<testOutputToFile>true</testOutputToFile>
@@ -92,12 +92,12 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.13</version>
+ <version>1.15</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>1.1</version>
+ <version>2.1</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -123,7 +123,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
- <version>1.0.1</version>
+ <version>2.0.2</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -148,7 +148,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>2.0.5</version>
+ <version>3.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java?rev=1235501&r1=1235500&r2=1235501&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java Tue Jan 24 21:09:55 2012
@@ -19,27 +19,27 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.util.Collections;
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.testutils.MockManager;
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.archiver.ArchiveFinalizer;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.util.IOUtil;
-import org.easymock.MockControl;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.net.JarURLConnection;
-import java.net.URL;
-import java.util.Collections;
import junit.framework.TestCase;
+import org.easymock.MockControl;
public class ManifestCreationFinalizerTest
extends TestCase
@@ -84,13 +84,13 @@ public class ManifestCreationFinalizerTe
File tempDir = fileManager.createTempDir();
- File manifestFile = fileManager.createFile( tempDir, "MANIFEST.MF", "Main-Class: Stuff" );
+ File manifestFile = fileManager.createFile( tempDir, "MANIFEST.MF", "Main-Class: Stuff\n" );
config.setManifestFile( manifestFile );
JarArchiver archiver = new JarArchiver();
- archiver.setArchiveFinalizers( Collections.singletonList( new ManifestCreationFinalizer(
+ archiver.setArchiveFinalizers( Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer(
project,
config ) ) );
@@ -127,7 +127,7 @@ public class ManifestCreationFinalizerTe
JarArchiver archiver = new JarArchiver();
- archiver.setArchiveFinalizers( Collections.singletonList( new ManifestCreationFinalizer(
+ archiver.setArchiveFinalizers( Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer(
project,
config ) ) );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java?rev=1235501&r1=1235500&r2=1235501&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java Tue Jan 24 21:09:55 2012
@@ -19,8 +19,23 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
import org.codehaus.plexus.archiver.ArchiveEntry;
+import org.codehaus.plexus.archiver.ArchiveFinalizer;
import org.codehaus.plexus.archiver.ArchivedFileSet;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
@@ -33,30 +48,14 @@ import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import junit.framework.TestCase;
import org.jdom.Document;
import org.jdom.JDOMException;
import org.jdom.Text;
import org.jdom.input.SAXBuilder;
import org.jdom.xpath.XPath;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import junit.framework.TestCase;
-
public class ComponentsXmlArchiverFileFilterTest
extends TestCase
{
@@ -265,7 +264,7 @@ public class ComponentsXmlArchiverFileFi
final File descriptorFile = fileManager.createTempFile();
- archiver.setArchiveFinalizers( Collections.singletonList( filter ) );
+ archiver.setArchiveFinalizers( Collections.<ArchiveFinalizer>singletonList( filter ) );
archiver.createArchive();
@@ -335,10 +334,8 @@ public class ComponentsXmlArchiverFileFi
xmlWriter.startElement( "component-set" );
xmlWriter.startElement( "components" );
- for ( final Iterator<ComponentDef> it = componentDefs.iterator(); it.hasNext(); )
+ for ( final ComponentDef def : componentDefs )
{
- final ComponentDef def = it.next();
-
xmlWriter.startElement( "component" );
xmlWriter.startElement( "role" );
@@ -581,6 +578,10 @@ public class ComponentsXmlArchiverFileFi
throw new NoSuchElementException();
}
+ public void remove()
+ {
+ throw new NoSuchElementException();
+ }
};
}