Author: mperham
Date: Tue Jan 16 09:02:55 2007
New Revision: 496769
URL: http://svn.apache.org/viewvc?view=rev&rev=496769
Log:
revert bad patch application
Removed:
maven/sandbox/maven/patches/MNG-1577/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/resources/dependencyManagement-pom.xml
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/resources/inheritance-repo/t04/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/resources/inheritance-repo/t05/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/resources/inheritance-repo/t06/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/resources/inheritance-repo/t07/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/resources/inheritance-repo/t08/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/resources/inheritance-repo/t09/
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/resources/inheritance-repo/t10/
Modified:
maven/sandbox/maven/patches/MNG-1577/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/sandbox/maven/patches/MNG-1577/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
maven/sandbox/maven/patches/MNG-1577/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven/sandbox/maven/patches/MNG-1577/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Modified:
maven/sandbox/maven/patches/MNG-1577/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven/patches/MNG-1577/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?view=diff&rev=496769&r1=496768&r2=496769
==============================================================================
---
maven/sandbox/maven/patches/MNG-1577/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
(original)
+++
maven/sandbox/maven/patches/MNG-1577/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Tue Jan 16 09:02:55 2007
@@ -22,11 +22,9 @@
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.artifact.versioning.ManagedVersionMap;
import java.util.ArrayList;
import java.util.Collections;
@@ -66,10 +64,7 @@
root.addDependencies( artifacts, remoteRepositories, filter );
- ManagedVersionMap versionMap = (managedVersions != null &&
managedVersions instanceof ManagedVersionMap) ?
- (ManagedVersionMap)managedVersions : new
ManagedVersionMap(managedVersions);
-
- recurse( root, resolvedArtifacts, versionMap, localRepository,
remoteRepositories, source, filter,
+ recurse( root, resolvedArtifacts, managedVersions, localRepository,
remoteRepositories, source, filter,
listeners );
Set set = new HashSet();
@@ -104,7 +99,7 @@
return result;
}
- private void recurse( ResolutionNode node, Map resolvedArtifacts,
ManagedVersionMap managedVersions,
+ private void recurse( ResolutionNode node, Map resolvedArtifacts, Map
managedVersions,
ArtifactRepository localRepository, List
remoteRepositories, ArtifactMetadataSource source,
ArtifactFilter filter, List listeners )
throws CyclicDependencyException, ArtifactResolutionException,
OverConstrainedVersionException
@@ -119,20 +114,11 @@
fireEvent( ResolutionListener.MANAGE_ARTIFACT, listeners, node,
artifact );
- // Before we update the version of the artifact, we need to know
- // whether we are working on a transitive dependency or not. This
- // allows depMgmt to always override transitive dependencies, while
- // explicit child override depMgmt. (viz. depMgmt should only
- // provide defaults to children, but should override transitives)
-
- if ( artifact.getVersion() != null
- && ( node.isChildOfRootNode() ?
node.getArtifact().getVersion() == null : true ) )
+ if ( artifact.getVersion() != null )
{
node.getArtifact().setVersion( artifact.getVersion() );
}
-
- if ( artifact.getScope() != null
- && ( node.isChildOfRootNode() ?
node.getArtifact().getScope() == null : true ) )
+ if ( artifact.getScope() != null )
{
node.getArtifact().setScope( artifact.getScope() );
}
@@ -285,31 +271,6 @@
fireEvent(
ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
}
- if ( managedVersions.containsKey( child.getKey() ) )
- {
- // If this child node is a managed dependency,
then we
- // need to ensure that any exclusions it presents
are
- // added to the artifact before we retrive the
metadata
- // for the artifact; otherwise we may end up with
unwanted
- // dependencies.
- Artifact ma = (Artifact) managedVersions.get(
child.getKey() );
- ArtifactFilter managedExclusionFilter =
ma.getDependencyFilter();
- if ( null != managedExclusionFilter )
- {
- if ( null != artifact.getDependencyFilter() )
- {
- AndArtifactFilter aaf = new
AndArtifactFilter();
- aaf.add( artifact.getDependencyFilter() );
- aaf.add( managedExclusionFilter );
- artifact.setDependencyFilter( aaf );
- }
- else
- {
- artifact.setDependencyFilter(
managedExclusionFilter );
- }
- }
- }
-
artifact.setDependencyTrail( node.getDependencyTrail()
);
ResolutionGroup rGroup = source.retrieve( artifact,
localRepository, remoteRepositories );
@@ -322,7 +283,6 @@
}
child.addDependencies( rGroup.getArtifacts(),
rGroup.getResolutionRepositories(), filter );
-
}
catch ( CyclicDependencyException e )
{
Modified:
maven/sandbox/maven/patches/MNG-1577/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven/patches/MNG-1577/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?view=diff&rev=496769&r1=496768&r2=496769
==============================================================================
---
maven/sandbox/maven/patches/MNG-1577/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
(original)
+++
maven/sandbox/maven/patches/MNG-1577/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Tue Jan 16 09:02:55 2007
@@ -28,7 +28,6 @@
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.artifact.versioning.ManagedVersionMap;
import org.codehaus.plexus.PlexusTestCase;
import java.util.ArrayList;
Modified:
maven/sandbox/maven/patches/MNG-1577/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven/patches/MNG-1577/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?view=diff&rev=496769&r1=496768&r2=496769
==============================================================================
---
maven/sandbox/maven/patches/MNG-1577/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
(original)
+++
maven/sandbox/maven/patches/MNG-1577/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
Tue Jan 16 09:02:55 2007
@@ -81,7 +81,6 @@
ArtifactResolutionResult result =
artifactResolver.resolveTransitively( Collections.singleton( artifact ),
project.getArtifact(),
-
project.getManagedVersionMap(),
localRepository,
project.getRemoteArtifactRepositories(),
artifactMetadataSource, filter );
Modified:
maven/sandbox/maven/patches/MNG-1577/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven/patches/MNG-1577/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?view=diff&rev=496769&r1=496768&r2=496769
==============================================================================
---
maven/sandbox/maven/patches/MNG-1577/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/sandbox/maven/patches/MNG-1577/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Tue Jan 16 09:02:55 2007
@@ -621,7 +621,6 @@
repositories.addAll( project.getRemoteArtifactRepositories() );
ArtifactResolutionResult result =
artifactResolver.resolveTransitively( dependencies, pluginArtifact,
-
project.getManagedVersionMap(),
localRepository, repositories,
artifactMetadataSource,
artifactFilter );
@@ -1158,9 +1157,7 @@
project.setDependencyArtifacts( project.createArtifacts(
artifactFactory, null, null ) );
}
ArtifactResolutionResult result =
artifactResolver.resolveTransitively( project.getDependencyArtifacts(),
-
artifact,
-
project.getManagedVersionMap(),
-
context.getLocalRepository(),
+
artifact, context.getLocalRepository(),
project.getRemoteArtifactRepositories(),
artifactMetadataSource, filter );
Modified:
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?view=diff&rev=496769&r1=496768&r2=496769
==============================================================================
---
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Jan 16 09:02:55 2007
@@ -30,15 +30,12 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.artifact.versioning.ManagedVersionMap;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.DistributionManagement;
-import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
@@ -271,8 +268,6 @@
MavenProject project = new MavenProject( superModel );
- project.setManagedVersionMap(createManagedVersionMap(projectId,
superModel.getDependencyManagement(), null));
-
project.setActiveProfiles( activeProfiles );
project.setOriginalModel( superModel );
@@ -333,8 +328,7 @@
String projectId = safeVersionlessKey( project.getGroupId(),
project.getArtifactId() );
- // Map managedVersions = createManagedVersionMap( projectId,
project.getDependencyManagement() );
- Map managedVersions = project.getManagedVersionMap();
+ Map managedVersions = createManagedVersionMap( projectId,
project.getDependencyManagement() );
ensureMetadataSourceIsInitialized();
@@ -386,22 +380,13 @@
}
}
- private Map createManagedVersionMap( String projectId,
DependencyManagement dependencyManagement, MavenProject parent)
+ private Map createManagedVersionMap( String projectId,
DependencyManagement dependencyManagement )
throws ProjectBuildingException
{
- Map map = null;
- List deps;
- if ( dependencyManagement != null && (deps =
dependencyManagement.getDependencies()) != null && deps.size() > 0)
- {
- map = new ManagedVersionMap(map);
- org.codehaus.plexus.logging.Logger logger = getLogger();
- boolean isDebug = logger.isDebugEnabled();
-
- if (isDebug)
- {
- logger.debug("Adding managed depedendencies for " + projectId);
- }
-
+ Map map;
+ if ( dependencyManagement != null &&
dependencyManagement.getDependencies() != null )
+ {
+ map = new HashMap();
for ( Iterator i =
dependencyManagement.getDependencies().iterator(); i.hasNext(); )
{
Dependency d = (Dependency) i.next();
@@ -413,26 +398,6 @@
versionRange, d.getType(),
d.getClassifier(), d.getScope(),
d.isOptional() );
- if (isDebug)
- {
- logger.debug(" " + artifact);
- }
-
- // If the dependencyManagement section listed exclusions,
- // add them to the managed artifacts here so that
transitive
- // dependencies will be excluded if necessary.
- if ( null != d.getExclusions() &&
!d.getExclusions().isEmpty() ) {
- List exclusions = new ArrayList();
- Iterator exclItr = d.getExclusions().iterator();
- while (exclItr.hasNext()) {
- Exclusion e = (Exclusion) exclItr.next();
- exclusions.add(e.getGroupId() + ":" +
e.getArtifactId());
- }
- ExcludesArtifactFilter eaf = new
ExcludesArtifactFilter( exclusions );
- artifact.setDependencyFilter( eaf );
- } else {
- artifact.setDependencyFilter( null );
- }
map.put( d.getManagementKey(), artifact );
}
catch ( InvalidVersionSpecificationException e )
@@ -442,7 +407,7 @@
}
}
}
- else if (map == null)
+ else
{
map = Collections.EMPTY_MAP;
}
@@ -833,8 +798,6 @@
}
}
- project.setManagedVersionMap(createManagedVersionMap(projectId,
project.getDependencyManagement(), project.getParent()));
-
return project;
}
@@ -1063,10 +1026,10 @@
Parent parentModel = model.getParent();
- String projectId = safeVersionlessKey( model.getGroupId(),
model.getArtifactId() );
-
if ( parentModel != null )
{
+ String projectId = safeVersionlessKey( model.getGroupId(),
model.getArtifactId() );
+
if ( StringUtils.isEmpty( parentModel.getGroupId() ) )
{
throw new ProjectBuildingException( projectId, "Missing
groupId element from parent element" );
Modified:
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?view=diff&rev=496769&r1=496768&r2=496769
==============================================================================
---
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Tue Jan 16 09:02:55 2007
@@ -19,7 +19,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.artifact.versioning.ManagedVersionMap;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
@@ -137,8 +136,6 @@
private Map extensionArtifactMap;
- private Map managedVersionMap;
-
private Map projectReferences = new HashMap();
private Build buildOverlay;
@@ -252,12 +249,7 @@
if ( project.artifact != null )
{
this.artifact = ArtifactUtils.copyArtifact( project.artifact );
- }
-
- if ( project.getManagedVersionMap() != null )
- {
- setManagedVersionMap( new ManagedVersionMap(
project.getManagedVersionMap() ) );
- }
+ }
}
// TODO: Find a way to use <relativePath/> here...it's tricky, because the
moduleProject
@@ -1482,16 +1474,6 @@
public Model getOriginalModel()
{
return originalModel;
- }
-
- public void setManagedVersionMap( Map map )
- {
- this.managedVersionMap = map;
- }
-
- public Map getManagedVersionMap()
- {
- return this.managedVersionMap;
}
public boolean equals( Object other )
Modified:
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java?view=diff&rev=496769&r1=496768&r2=496769
==============================================================================
---
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
(original)
+++
maven/sandbox/maven/patches/MNG-1577/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Tue Jan 16 09:02:55 2007
@@ -18,15 +18,9 @@
import java.io.File;
import java.io.IOException;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.List;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
-import org.apache.maven.model.DependencyManagement;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.artifact.versioning.ManagedVersionMap;
public class MavenProjectTest
extends AbstractMavenProjectTestCase
@@ -44,7 +38,7 @@
childModel.setArtifactId( "artifact" );
MavenProject childProject = new MavenProject( childModel );
-
+
File childFile = new File( System.getProperty( "java.io.tmpdir" ),
"maven-project-tests" + System.currentTimeMillis() + "/child/pom.xml" );
childProject.setFile( childFile );
@@ -52,7 +46,7 @@
String adjustment = parentProject.getModulePathAdjustment(
childProject );
assertNotNull( adjustment );
-
+
assertEquals( "..", adjustment );
}
@@ -95,33 +89,6 @@
MavenProject clonedProject = new MavenProject( projectToClone );
assertEquals( "maven-core", clonedProject.getArtifactId() );
- Map clonedMap = clonedProject.getManagedVersionMap();
- assertNotNull("ManagedVersionMap not copied", clonedMap);
- assertTrue("ManagedVersionMap is not empty", clonedMap.isEmpty());
- }
-
- public void testCopyConstructorWithDependencyManagement()
- throws Exception
- {
- File f = getFileForClasspathResource( "dependencyManagement-pom.xml" );
- MavenProject projectToClone = getProjectWithDependencies( f );
- DependencyManagement dep = projectToClone.getDependencyManagement();
- assertNotNull("No dependencyManagement", dep);
- List list = dep.getDependencies();
- assertNotNull("No dependencies", list);
- assertTrue("Empty dependency list", !list.isEmpty());
-
- Map map = projectToClone.getManagedVersionMap();
- assertNotNull("No ManagedVersionMap", map);
- assertTrue("ManagedVersionMap is empty", !map.isEmpty());
-
- MavenProject clonedProject = new MavenProject( projectToClone );
- assertEquals( "maven-core", clonedProject.getArtifactId() );
- Map clonedMap = clonedProject.getManagedVersionMap();
- assertNotNull("ManagedVersionMap not copied", clonedMap);
- assertTrue("ManagedVersionMap is empty", !clonedMap.isEmpty());
- assertTrue("Not a ManagedVersionMap", clonedMap instanceof
ManagedVersionMap);
- assertTrue("ManagedVersionMap does not contain test key",
clonedMap.containsKey("maven-test:maven-test-b:jar"));
}
public void testGetModulePathAdjustment()
