svn commit: r1203182 - in /maven/maven-3/trunk: maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java pom.xml

[olamy]

Author: olamy
Date: Thu Nov 17 13:34:33 2011
New Revision: 1203182

URL: http://svn.apache.org/viewvc?rev=1203182&view=rev
Log:
[MNG-5201] upgrade aether to 1.13 and sisu to 2.3.0 .

Modified:
    
maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
    
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
    maven/maven-3/trunk/pom.xml

Modified: 
maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java?rev=1203182&r1=1203181&r2=1203182&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
 (original)
+++ 
maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
 Thu Nov 17 13:34:33 2011
@@ -21,8 +21,11 @@ package org.apache.maven.project;
 
 import java.io.File;
 
+import org.sonatype.aether.RepositorySystemSession;
 import org.sonatype.aether.artifact.Artifact;
 import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+import org.sonatype.aether.repository.LocalArtifactRequest;
+import org.sonatype.aether.repository.LocalArtifactResult;
 
 /**
  * @author Benjamin Bentmann
@@ -56,4 +59,17 @@ public class LegacyLocalRepositoryManage
         return path.toString();
     }
 
+    public LocalArtifactResult find( RepositorySystemSession session, 
LocalArtifactRequest request )
+    {
+           String path = getPathForLocalArtifact( request.getArtifact() );
+           File file = new File( getRepository().getBasedir(), path );
+        LocalArtifactResult result = new LocalArtifactResult( request );
+           if ( file.isFile() )
+        {
+               result.setFile( file );
+               result.setAvailable( true );
+           }
+           return result;
+       }
+
 }

Modified: 
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java?rev=1203182&r1=1203181&r2=1203182&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
 Thu Nov 17 13:34:33 2011
@@ -21,8 +21,11 @@ package org.apache.maven.project;
 
 import java.io.File;
 
+import org.sonatype.aether.RepositorySystemSession;
 import org.sonatype.aether.artifact.Artifact;
 import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+import org.sonatype.aether.repository.LocalArtifactRequest;
+import org.sonatype.aether.repository.LocalArtifactResult;
 
 /**
  * @author Benjamin Bentmann
@@ -56,4 +59,17 @@ public class LegacyLocalRepositoryManage
         return path.toString();
     }
 
+    public LocalArtifactResult find( RepositorySystemSession session, 
LocalArtifactRequest request )
+    {
+           String path = getPathForLocalArtifact( request.getArtifact() );
+           File file = new File( getRepository().getBasedir(), path );
+        LocalArtifactResult result = new LocalArtifactResult( request );
+           if ( file.isFile() )
+        {
+               result.setFile( file );
+               result.setAvailable( true );
+           }
+           return result;
+       }
+
 }

Modified: maven/maven-3/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1203182&r1=1203181&r2=1203182&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Thu Nov 17 13:34:33 2011
@@ -49,13 +49,13 @@
     <plexusVersion>1.5.5</plexusVersion>
     <plexusInterpolationVersion>1.14</plexusInterpolationVersion>
     <plexusUtilsVersion>2.0.6</plexusUtilsVersion>
-    <sisuInjectVersion>2.1.1</sisuInjectVersion>
+    <sisuInjectVersion>2.3.0</sisuInjectVersion>
     <wagonVersion>2.0</wagonVersion>
     <securityDispatcherVersion>1.3</securityDispatcherVersion>
     <cipherVersion>1.7</cipherVersion>
     <modelloVersion>1.4.1</modelloVersion>
     <jxpathVersion>1.3</jxpathVersion>
-    <aetherVersion>1.11</aetherVersion>
+    <aetherVersion>1.13</aetherVersion>
     
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <!-- Control the name of the distribution and information output by mvn -->
     <distributionId>apache-maven</distributionId>