Author: jdcasey
Date: Mon Apr 17 09:18:25 2006
New Revision: 394723
URL: http://svn.apache.org/viewcvs?rev=394723&view=rev
Log:
(Merging from 394684 on trunk.) [MJAR-6] Fixing pollution of Extensions-List by
test-scoped dependencies.
Added:
maven/components/branches/maven-2.0.x/maven-archiver/src/test/
- copied from r394684, maven/components/trunk/maven-archiver/src/test/
maven/components/branches/maven-2.0.x/maven-archiver/src/test/java/
- copied from r394684,
maven/components/trunk/maven-archiver/src/test/java/
maven/components/branches/maven-2.0.x/maven-archiver/src/test/java/org/
- copied from r394684,
maven/components/trunk/maven-archiver/src/test/java/org/
maven/components/branches/maven-2.0.x/maven-archiver/src/test/java/org/apache/
- copied from r394684,
maven/components/trunk/maven-archiver/src/test/java/org/apache/
maven/components/branches/maven-2.0.x/maven-archiver/src/test/java/org/apache/maven/
- copied from r394684,
maven/components/trunk/maven-archiver/src/test/java/org/apache/maven/
maven/components/branches/maven-2.0.x/maven-archiver/src/test/java/org/apache/maven/archiver/
- copied from r394684,
maven/components/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/
maven/components/branches/maven-2.0.x/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
- copied unchanged from r394684,
maven/components/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
maven/components/branches/maven-2.0.x/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java
- copied unchanged from r394684,
maven/components/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java
Modified:
maven/components/branches/maven-2.0.x/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Modified:
maven/components/branches/maven-2.0.x/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java?rev=394723&r1=394722&r2=394723&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Mon Apr 17 09:18:25 2006
@@ -151,6 +151,10 @@
for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
{
Artifact artifact = (Artifact) iter.next();
+ if ( "test".equals( artifact.getScope() ) )
+ {
+ continue;
+ }
// TODO: type of ejb should be added too?
if ( "jar".equals( artifact.getType() ) )
{