You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/07/15 21:24:29 UTC
svn commit: r794373 [7/9] - in /maven/components/branches/MNG-4221:
maven-compat/ maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/deployer/
maven-compat/src/main/java/org/apache/maven/artifact/...
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/SnapshotArtifactRepositoryMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/SnapshotArtifactRepositoryMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/SnapshotArtifactRepositoryMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/AbstractArtifactResolutionException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/AbstractArtifactResolutionException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/AbstractArtifactResolutionException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/AbstractArtifactResolutionException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryPolicy;
/**
* Base class for artifact resolution exceptions.
@@ -239,7 +239,7 @@
return sb.toString();
}
- protected static String constructMissingArtifactMessage( String message,
+ public static String constructMissingArtifactMessage( String message,
String indentation,
String groupId,
String artifactId,
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/AbstractArtifactResolutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/AbstractArtifactResolutionException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/AbstractArtifactResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/CyclicDependencyException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/CyclicDependencyException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/CyclicDependencyException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/CyclicDependencyException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,7 @@
*/
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
/**
* Indiciates a cycle in the dependency graph.
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/CyclicDependencyException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/CyclicDependencyException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/CyclicDependencyException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DebugResolutionListener.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DebugResolutionListener.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DebugResolutionListener.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DebugResolutionListener.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
import org.codehaus.plexus.logging.Logger;
/**
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DebugResolutionListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DebugResolutionListener.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DebugResolutionListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultResolutionErrorHandler.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultResolutionErrorHandler.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultResolutionErrorHandler.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultResolutionErrorHandler.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,9 @@
import java.util.Collection;
import java.util.List;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.codehaus.plexus.component.annotations.Component;
/**
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultResolutionErrorHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultResolutionErrorHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultResolutionErrorHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/MultipleArtifactsNotFoundException.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/MultipleArtifactsNotFoundException.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/MultipleArtifactsNotFoundException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/MultipleArtifactsNotFoundException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,8 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/**
* Exception caused when one or more artifacts can not be resolved because they are not found in the
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/MultipleArtifactsNotFoundException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/MultipleArtifactsNotFoundException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/MultipleArtifactsNotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionErrorHandler.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionErrorHandler.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionErrorHandler.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionErrorHandler.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,8 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
+
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionErrorHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionErrorHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionErrorHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListener.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListener.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListener.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListener.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
/**
* Listens to the resolution process and handles events.
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListener.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListenerForDepMgmt.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListenerForDepMgmt.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListenerForDepMgmt.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListenerForDepMgmt.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListenerForDepMgmt.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListenerForDepMgmt.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListenerForDepMgmt.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionNode.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionNode.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionNode.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionNode.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,10 +27,10 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.OverConstrainedVersionException;
public class ResolutionNode
{
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionNode.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionNode.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java:751453-767358,767708-768832
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java Wed Jul 15 19:24:20 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.artifact.resolver.ResolutionNode;
+import org.apache.maven.repository.legacy.resolver.ResolutionNode;
/**
* Determines which version of an artifact to use when there are conflicting declarations.
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java Wed Jul 15 19:24:20 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.artifact.resolver.ResolutionNode;
+import org.apache.maven.repository.legacy.resolver.ResolutionNode;
import org.codehaus.plexus.component.annotations.Component;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java Wed Jul 15 19:24:20 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.artifact.resolver.ResolutionNode;
+import org.apache.maven.repository.legacy.resolver.ResolutionNode;
import org.codehaus.plexus.component.annotations.Component;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java Wed Jul 15 19:24:20 2009
@@ -19,9 +19,9 @@
* under the License.
*/
-import org.apache.maven.artifact.resolver.ResolutionNode;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
+import org.apache.maven.repository.legacy.resolver.ResolutionNode;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.OverConstrainedVersionException;
import org.codehaus.plexus.component.annotations.Component;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java Wed Jul 15 19:24:20 2009
@@ -19,9 +19,9 @@
* under the License.
*/
-import org.apache.maven.artifact.resolver.ResolutionNode;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
+import org.apache.maven.repository.legacy.resolver.ResolutionNode;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.OverConstrainedVersionException;
import org.codehaus.plexus.component.annotations.Component;
/**
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/filter:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/filter:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter:751453-767358,767708-768832
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/AndArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/AndArtifactFilter.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/AndArtifactFilter.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/AndArtifactFilter.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.filter;
+package org.apache.maven.repository.legacy.resolver.filter;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ArtifactFilter.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ArtifactFilter.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ArtifactFilter.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.filter;
+package org.apache.maven.repository.legacy.resolver.filter;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ExcludesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ExcludesArtifactFilter.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ExcludesArtifactFilter.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ExcludesArtifactFilter.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.filter;
+package org.apache.maven.repository.legacy.resolver.filter;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ExclusionSetFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ExclusionSetFilter.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ExclusionSetFilter.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ExclusionSetFilter.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.filter;
+package org.apache.maven.repository.legacy.resolver.filter;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/IncludesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/IncludesArtifactFilter.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/IncludesArtifactFilter.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/IncludesArtifactFilter.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.filter;
+package org.apache.maven.repository.legacy.resolver.filter;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/InversionArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/InversionArtifactFilter.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/InversionArtifactFilter.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/InversionArtifactFilter.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.filter;
+package org.apache.maven.repository.legacy.resolver.filter;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/OrArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/OrArtifactFilter.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/OrArtifactFilter.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/OrArtifactFilter.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.filter;
+package org.apache.maven.repository.legacy.resolver.filter;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ScopeArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ScopeArtifactFilter.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ScopeArtifactFilter.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ScopeArtifactFilter.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.filter;
+package org.apache.maven.repository.legacy.resolver.filter;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/TypeArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/TypeArtifactFilter.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/TypeArtifactFilter.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/TypeArtifactFilter.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.filter;
+package org.apache.maven.repository.legacy.resolver.filter;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java Wed Jul 15 19:24:20 2009
@@ -22,15 +22,15 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Metadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
-import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.repository.legacy.WagonManager;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.ArtifactRepositoryMetadata;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadata;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataManager;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataResolutionException;
+import org.apache.maven.repository.legacy.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java Wed Jul 15 19:24:20 2009
@@ -22,11 +22,11 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
-import org.apache.maven.artifact.installer.ArtifactInstallationException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.repository.legacy.deployer.ArtifactDeploymentException;
+import org.apache.maven.repository.legacy.installer.ArtifactInstallationException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java Wed Jul 15 19:24:20 2009
@@ -22,11 +22,11 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
-import org.apache.maven.artifact.installer.ArtifactInstallationException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.repository.legacy.deployer.ArtifactDeploymentException;
+import org.apache.maven.repository.legacy.installer.ArtifactInstallationException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/** Manages multiple ArtifactTransformation instances and applies them in succession. */
public interface ArtifactTransformationManager
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java Wed Jul 15 19:24:20 2009
@@ -22,11 +22,11 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
-import org.apache.maven.artifact.installer.ArtifactInstallationException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.repository.legacy.deployer.ArtifactDeploymentException;
+import org.apache.maven.repository.legacy.installer.ArtifactInstallationException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java Wed Jul 15 19:24:20 2009
@@ -22,11 +22,11 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataResolutionException;
import org.codehaus.plexus.component.annotations.Component;
@Component(role=ArtifactTransformation.class, hint="latest")
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java Wed Jul 15 19:24:20 2009
@@ -23,12 +23,12 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.ArtifactRepositoryMetadata;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataResolutionException;
import org.codehaus.plexus.component.annotations.Component;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java Wed Jul 15 19:24:20 2009
@@ -26,15 +26,15 @@
import java.util.TimeZone;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.Metadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
import org.apache.maven.artifact.repository.metadata.Snapshot;
-import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.repository.legacy.deployer.ArtifactDeploymentException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadata;
+import org.apache.maven.repository.legacy.repository.metadata.RepositoryMetadataResolutionException;
+import org.apache.maven.repository.legacy.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/versioning:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/versioning:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/versioning:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/versioning:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/versioning:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning:751453-767358,767708-768832
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ArtifactVersion.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ArtifactVersion.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ArtifactVersion.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ArtifactVersion.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.versioning;
+package org.apache.maven.repository.legacy.versioning;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ComparableVersion.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ComparableVersion.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ComparableVersion.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ComparableVersion.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.versioning;
+package org.apache.maven.repository.legacy.versioning;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/DefaultArtifactVersion.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/DefaultArtifactVersion.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/DefaultArtifactVersion.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/DefaultArtifactVersion.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.versioning;
+package org.apache.maven.repository.legacy.versioning;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/InvalidVersionSpecificationException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/InvalidVersionSpecificationException.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/InvalidVersionSpecificationException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/InvalidVersionSpecificationException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.versioning;
+package org.apache.maven.repository.legacy.versioning;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ManagedVersionMap.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ManagedVersionMap.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ManagedVersionMap.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ManagedVersionMap.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.versioning;
+package org.apache.maven.repository.legacy.versioning;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/OverConstrainedVersionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/OverConstrainedVersionException.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/OverConstrainedVersionException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/OverConstrainedVersionException.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.versioning;
+package org.apache.maven.repository.legacy.versioning;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +22,8 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/**
* Occurs when ranges exclude each other and no valid value remains.
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/Restriction.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/Restriction.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/Restriction.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/Restriction.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.versioning;
+package org.apache.maven.repository.legacy.versioning;
/*
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/VersionRange.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/VersionRange.java?rev=794373&r1=790177&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/VersionRange.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/VersionRange.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.versioning;
+package org.apache.maven.repository.legacy.versioning;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java Wed Jul 15 19:24:20 2009
@@ -3,7 +3,6 @@
import java.util.Collection;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactScopeEnum;
/**
* Artifact Metadata that is resolved independent of Artifact itself.
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactScopeEnum.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactScopeEnum.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactScopeEnum.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactScopeEnum.java Wed Jul 15 19:24:20 2009
@@ -1,4 +1,6 @@
-package org.apache.maven.artifact;
+package org.apache.maven.repository.metadata;
+
+import org.apache.maven.artifact.Artifact;
/**
* Type safe reincarnation of Artifact scope. Also supplies the <code>DEFAULT_SCOPE<code> as well
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactScopeEnum.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactScopeEnum.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactScopeEnum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java:751453-767358,767708-768832
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java Wed Jul 15 19:24:20 2009
@@ -4,7 +4,6 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.artifact.ArtifactScopeEnum;
/**
* classpath container that is aware of the classpath scope
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java Wed Jul 15 19:24:20 2009
@@ -1,6 +1,5 @@
package org.apache.maven.repository.metadata;
-import org.apache.maven.artifact.ArtifactScopeEnum;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java Wed Jul 15 19:24:20 2009
@@ -5,7 +5,6 @@
import java.util.Comparator;
import java.util.List;
-import org.apache.maven.artifact.ArtifactScopeEnum;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java Wed Jul 15 19:24:20 2009
@@ -1,7 +1,7 @@
package org.apache.maven.repository.metadata;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.DefaultArtifactVersion;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Configuration;
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java Wed Jul 15 19:24:20 2009
@@ -23,7 +23,6 @@
import java.util.List;
import java.util.TreeSet;
-import org.apache.maven.artifact.ArtifactScopeEnum;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java Wed Jul 15 19:24:20 2009
@@ -19,7 +19,6 @@
* under the License.
*/
-import org.apache.maven.artifact.ArtifactScopeEnum;
/**
* Resolves conflicts in the supplied dependency graph.
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java Wed Jul 15 19:24:20 2009
@@ -6,7 +6,6 @@
import java.util.Map;
import java.util.TreeSet;
-import org.apache.maven.artifact.ArtifactScopeEnum;
/**
* maven dependency metadata graph
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java Wed Jul 15 19:24:20 2009
@@ -1,6 +1,5 @@
package org.apache.maven.repository.metadata;
-import org.apache.maven.artifact.ArtifactScopeEnum;
/**
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java Wed Jul 15 19:24:20 2009
@@ -1,6 +1,5 @@
package org.apache.maven.repository.metadata;
-import org.apache.maven.artifact.ArtifactScopeEnum;
/**
* metadata graph vertice - just a wrapper around artifact's metadata
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java Wed Jul 15 19:24:20 2009
@@ -2,7 +2,7 @@
import java.util.Collection;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/**
*
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java Wed Jul 15 19:24:20 2009
@@ -2,7 +2,7 @@
import java.util.List;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/** @author Oleg Gusakov */
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java Wed Jul 15 19:24:20 2009
@@ -1,6 +1,5 @@
package org.apache.maven.repository.metadata;
-import org.apache.maven.artifact.ArtifactScopeEnum;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java Wed Jul 15 19:24:20 2009
@@ -21,7 +21,7 @@
import java.util.List;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
/**
* Provides some metadata operations, like querying the remote repository for a list of versions available for an
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java Wed Jul 15 19:24:20 2009
@@ -1,7 +1,6 @@
package org.apache.maven.repository.metadata;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactScopeEnum;
/**
* metadata [dirty] Tree
*
Modified: maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java Wed Jul 15 19:24:20 2009
@@ -27,12 +27,12 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.repository.legacy.factory.ArtifactFactory;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.repository.legacy.repository.DefaultArtifactRepository;
+import org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.PlexusTestCase;
/**