Author: jdcasey
Date: Tue Mar 7 19:09:44 2006
New Revision: 384105
URL: http://svn.apache.org/viewcvs?rev=384105&view=rev
Log:
(Merged from 384102.) Fixing site URL calculation to disregard child module
path adjustment.
Added:
maven/components/trunk/maven-core-it/it1020/
maven/components/trunk/maven-core-it/it1020/child/
maven/components/trunk/maven-core-it/it1020/child/pom.xml (with props)
maven/components/trunk/maven-core-it/it1020/child/src/
maven/components/trunk/maven-core-it/it1020/child/src/main/
maven/components/trunk/maven-core-it/it1020/child/src/main/java/
maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/
maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/apache/
maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/apache/maven/
maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/apache/maven/it1019/
maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/apache/maven/it1019/TestClass.java
(with props)
maven/components/trunk/maven-core-it/it1020/goals.txt (with props)
maven/components/trunk/maven-core-it/it1020/pom.xml (with props)
maven/components/trunk/maven-core-it/it1021/
maven/components/trunk/maven-core-it/it1021/goals.txt (with props)
maven/components/trunk/maven-core-it/it1021/pom.xml (with props)
maven/components/trunk/maven-core-it/it1021/src/
maven/components/trunk/maven-core-it/it1021/src/main/
maven/components/trunk/maven-core-it/it1021/src/main/java/
maven/components/trunk/maven-core-it/it1021/src/main/java/org/
maven/components/trunk/maven-core-it/it1021/src/main/java/org/apache/
maven/components/trunk/maven-core-it/it1021/src/main/java/org/apache/maven/
maven/components/trunk/maven-core-it/it1021/src/main/java/org/apache/maven/it1019/
maven/components/trunk/maven-core-it/it1021/src/main/java/org/apache/maven/it1019/TestClass.java
(with props)
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=384105&r1=384104&r2=384105&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:09:44 2006
@@ -2,7 +2,7 @@
<files>
<file>
<location>target/effective-pom.xml</location>
- <contains>scp://host/path/sub1</contains>
+ <contains>scp://host/path/parent/sub1</contains>
</file>
<file>
<location>target/effective-pom.xml</location>
Added: maven/components/trunk/maven-core-it/it1020/child/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it1020/child/pom.xml?rev=384105&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it1020/child/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it1020/child/pom.xml Tue Mar 7
19:09:44 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.it</groupId>
+ <artifactId>maven-core-it1020</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>maven-core-it1020-child</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: maven/components/trunk/maven-core-it/it1020/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it1020/child/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/components/trunk/maven-core-it/it1020/child/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/apache/maven/it1019/TestClass.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/apache/maven/it1019/TestClass.java?rev=384105&view=auto
==============================================================================
---
maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/apache/maven/it1019/TestClass.java
(added)
+++
maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/apache/maven/it1019/TestClass.java
Tue Mar 7 19:09:44 2006
@@ -0,0 +1,9 @@
+package org.apache.maven.it1019;
+
+import org.jaxen.Context;
+
+public class TestClass
+{
+ private Context context;
+}
+
Propchange:
maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/apache/maven/it1019/TestClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/apache/maven/it1019/TestClass.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
maven/components/trunk/maven-core-it/it1020/child/src/main/java/org/apache/maven/it1019/TestClass.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it1020/goals.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it1020/goals.txt?rev=384105&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it1020/goals.txt (added)
+++ maven/components/trunk/maven-core-it/it1020/goals.txt Tue Mar 7 19:09:44
2006
@@ -0,0 +1 @@
+compile
Propchange: maven/components/trunk/maven-core-it/it1020/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it1020/goals.txt
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/components/trunk/maven-core-it/it1020/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it1020/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it1020/pom.xml?rev=384105&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it1020/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it1020/pom.xml Tue Mar 7 19:09:44 2006
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.it</groupId>
+ <artifactId>maven-core-it1020</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>child</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1-beta-2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.0.5</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Propchange: maven/components/trunk/maven-core-it/it1020/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it1020/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/components/trunk/maven-core-it/it1020/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it1021/goals.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it1021/goals.txt?rev=384105&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it1021/goals.txt (added)
+++ maven/components/trunk/maven-core-it/it1021/goals.txt Tue Mar 7 19:09:44
2006
@@ -0,0 +1 @@
+compile
Propchange: maven/components/trunk/maven-core-it/it1021/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it1021/goals.txt
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/components/trunk/maven-core-it/it1021/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it1021/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it1021/pom.xml?rev=384105&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it1021/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it1021/pom.xml Tue Mar 7 19:09:44 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.it</groupId>
+ <artifactId>maven-core-it1019</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1-beta-2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.0.5</version>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: maven/components/trunk/maven-core-it/it1021/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it1021/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/components/trunk/maven-core-it/it1021/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-core-it/it1021/src/main/java/org/apache/maven/it1019/TestClass.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it1021/src/main/java/org/apache/maven/it1019/TestClass.java?rev=384105&view=auto
==============================================================================
---
maven/components/trunk/maven-core-it/it1021/src/main/java/org/apache/maven/it1019/TestClass.java
(added)
+++
maven/components/trunk/maven-core-it/it1021/src/main/java/org/apache/maven/it1019/TestClass.java
Tue Mar 7 19:09:44 2006
@@ -0,0 +1,9 @@
+package org.apache.maven.it1019;
+
+import org.jaxen.Context;
+
+public class TestClass
+{
+ private Context context;
+}
+
Propchange:
maven/components/trunk/maven-core-it/it1021/src/main/java/org/apache/maven/it1019/TestClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-core-it/it1021/src/main/java/org/apache/maven/it1019/TestClass.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
maven/components/trunk/maven-core-it/it1021/src/main/java/org/apache/maven/it1019/TestClass.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
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=384105&r1=384104&r2=384105&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:09:44 2006
@@ -336,6 +336,8 @@
artifact.setFile( new File( d.getSystemPath() ) );
}
+ ArtifactFilter artifactFilter = dependencyFilter;
+
if ( artifact != null && ( dependencyFilter == null ||
dependencyFilter.include( artifact ) ) )
{
if ( d.getExclusions() != null && !d.getExclusions().isEmpty()
)
@@ -354,15 +356,15 @@
AndArtifactFilter filter = new AndArtifactFilter();
filter.add( dependencyFilter );
filter.add( newFilter );
- dependencyFilter = filter;
+ artifactFilter = filter;
}
else
{
- dependencyFilter = newFilter;
+ artifactFilter = newFilter;
}
}
- artifact.setDependencyFilter( dependencyFilter );
+ artifact.setDependencyFilter( artifactFilter );
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=384105&r1=384104&r2=384105&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:09:44 2006
@@ -108,7 +108,7 @@
}
}
- assembleDistributionInheritence( child, parent, childPathAdjustment,
appendPaths );
+ assembleDistributionInheritence( child, parent, appendPaths );
// issueManagement
if ( child.getIssueManagement() == null )
@@ -399,8 +399,7 @@
}
}
- private void assembleDistributionInheritence( Model child, Model parent,
String childPathAdjustment,
- boolean appendPaths )
+ private void assembleDistributionInheritence( Model child, Model parent,
boolean appendPaths )
{
if ( parent.getDistributionManagement() != null )
{
@@ -432,7 +431,7 @@
if ( site.getUrl() != null )
{
site.setUrl(
- appendPath( site.getUrl(), child.getArtifactId(),
childPathAdjustment, appendPaths ) );
+ appendPath( site.getUrl(), child.getArtifactId(),
null, 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=384105&r1=384104&r2=384105&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:09:44 2006
@@ -10,6 +10,7 @@
import org.apache.maven.project.injection.ModelDefaultsInjector;
import org.codehaus.plexus.PlexusTestCase;
+import java.util.Arrays;
import java.util.Map;
public class MavenMetadataSourceTest
@@ -105,6 +106,57 @@
//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() );
}
}
