Author: jdcasey
Date: Tue Mar 7 19:26:16 2006
New Revision: 384106
URL: http://svn.apache.org/viewcvs?rev=384106&view=rev
Log:
rolling back accidental commit.
Removed:
maven/components/trunk/maven-core-it/it1020/
maven/components/trunk/maven-core-it/it1021/
Modified:
maven/components/trunk/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
Modified:
maven/components/trunk/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml?rev=384106&r1=384105&r2=384106&view=diff
==============================================================================
---
maven/components/trunk/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml
(original)
+++
maven/components/trunk/maven-core-it/it0095/sub1/src/test/verifier/verifications.xml
Tue Mar 7 19:26:16 2006
@@ -2,7 +2,7 @@
<files>
<file>
<location>target/effective-pom.xml</location>
- <contains>scp://host/path/parent/sub1</contains>
+ <contains>scp://host/path/sub1</contains>
</file>
<file>
<location>target/effective-pom.xml</location>
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=384106&r1=384105&r2=384106&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Tue Mar 7 19:26:16 2006
@@ -336,8 +336,6 @@
artifact.setFile( new File( d.getSystemPath() ) );
}
- ArtifactFilter artifactFilter = dependencyFilter;
-
if ( artifact != null && ( dependencyFilter == null ||
dependencyFilter.include( artifact ) ) )
{
if ( d.getExclusions() != null && !d.getExclusions().isEmpty()
)
@@ -356,15 +354,15 @@
AndArtifactFilter filter = new AndArtifactFilter();
filter.add( dependencyFilter );
filter.add( newFilter );
- artifactFilter = filter;
+ dependencyFilter = filter;
}
else
{
- artifactFilter = newFilter;
+ dependencyFilter = newFilter;
}
}
- artifact.setDependencyFilter( artifactFilter );
+ artifact.setDependencyFilter( dependencyFilter );
if ( project != null )
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=384106&r1=384105&r2=384106&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Tue Mar 7 19:26:16 2006
@@ -108,7 +108,7 @@
}
}
- assembleDistributionInheritence( child, parent, appendPaths );
+ assembleDistributionInheritence( child, parent, childPathAdjustment,
appendPaths );
// issueManagement
if ( child.getIssueManagement() == null )
@@ -399,7 +399,8 @@
}
}
- private void assembleDistributionInheritence( Model child, Model parent,
boolean appendPaths )
+ private void assembleDistributionInheritence( Model child, Model parent,
String childPathAdjustment,
+ boolean appendPaths )
{
if ( parent.getDistributionManagement() != null )
{
@@ -431,7 +432,7 @@
if ( site.getUrl() != null )
{
site.setUrl(
- appendPath( site.getUrl(), child.getArtifactId(),
null, appendPaths ) );
+ appendPath( site.getUrl(), child.getArtifactId(),
childPathAdjustment, appendPaths ) );
}
}
}
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java?rev=384106&r1=384105&r2=384106&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
Tue Mar 7 19:26:16 2006
@@ -10,7 +10,6 @@
import org.apache.maven.project.injection.ModelDefaultsInjector;
import org.codehaus.plexus.PlexusTestCase;
-import java.util.Arrays;
import java.util.Map;
public class MavenMetadataSourceTest
@@ -106,57 +105,6 @@
//check for back-propagation of default scope.
assertEquals( "default scope NOT back-propagated to dependency.",
Artifact.SCOPE_TEST, dep.getScope() );
- }
-
- public void testExcludeDoesNotAffectAllDependencies()
- throws Exception
- {
- String groupId = "org.apache.maven";
- String artifactId = "maven-model";
- String version = "1.0";
-
- Dependency dep1 = new Dependency();
-
- dep1.setGroupId( groupId );
- dep1.setArtifactId( artifactId + "1" );
- dep1.setVersion( version );
- dep1.setExclusions( Arrays.asList( new String[] { "exclude1:exclude1"
} ) );
-
- Model model = new Model();
-
- model.addDependency( dep1 );
-
- Dependency dep2 = new Dependency();
- dep2.setGroupId( groupId );
- dep2.setArtifactId( artifactId + "2" );
- dep1.setVersion( version );
-
- model.addDependency( dep2 );
-
- MavenProject project = new MavenProject( model );
-
- ModelDefaultsInjector injector = (ModelDefaultsInjector) lookup(
ModelDefaultsInjector.ROLE );
-
- injector.injectDefaults( model );
-
- ArtifactFactory factory = (ArtifactFactory) lookup(
ArtifactFactory.ROLE );
-
- project.setArtifacts( project.createArtifacts( factory, null, null ) );
-
- String key = ArtifactUtils.versionlessKey( groupId, artifactId );
-
- Map artifactMap = project.getArtifactMap();
-
- assertNotNull( "artifact-map should not be null.", artifactMap );
- assertEquals( "artifact-map should contain 1 element.", 1,
artifactMap.size() );
-
- Artifact artifact = (Artifact) artifactMap.get( key );
-
- assertNotNull( "dependency artifact not found in map.", artifact );
- assertEquals( "dependency artifact has wrong scope.",
Artifact.SCOPE_TEST, artifact.getScope() );
-
- //check for back-propagation of default scope.
- assertEquals( "default scope NOT back-propagated to dependency.",
Artifact.SCOPE_TEST, dep1.getScope() );
}
}
