svn commit: r659724 - in /maven/artifact/branches/CAP: pom.xml src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionException.java

[jvanzyl]

Author: jvanzyl
Date: Fri May 23 17:16:48 2008
New Revision: 659724

URL: http://svn.apache.org/viewvc?rev=659724&view=rev
Log:
o add dependency to mercury and dump everything else for now until the graph is 
working with the SAT solver.

Modified:
    maven/artifact/branches/CAP/pom.xml
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionException.java

Modified: maven/artifact/branches/CAP/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/pom.xml?rev=659724&r1=659723&r2=659724&view=diff
==============================================================================
--- maven/artifact/branches/CAP/pom.xml (original)
+++ maven/artifact/branches/CAP/pom.xml Fri May 23 17:16:48 2008
@@ -46,31 +46,9 @@
       <version>1.0-alpha-43</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-beta-2</version>
-    </dependency>
-    <dependency>
-      <groupId>aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-      <version>1.5.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-file</artifactId>
-      <version>1.0-beta-2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>1.2_Java1.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.retrotranslator</groupId>
-      <artifactId>retrotranslator-runtime</artifactId>
-      <version>1.2.1</version>
+      <groupId>org.apache.maven.mercury</groupId>
+      <artifactId>mercury</artifactId>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionException.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionException.java?rev=659724&r1=659723&r2=659724&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionException.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionException.java
 Fri May 23 17:16:48 2008
@@ -10,8 +10,6 @@
 public class ConflictResolutionException
 extends Exception
 {
-       private static final long serialVersionUID = 2677613140287940255L;
-
        public ConflictResolutionException()
        {
        }