Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-5201] upgrade aether to 1.13 and sisu to 2.3.0 . 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1203182 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-11-17 13:34:33 +00:00
parent f561a2b0e1
commit 0cc2c9b227
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
View File

@ -21,8 +21,11 @@ package org.apache.maven.project;
import java.io.File; import java.io.File;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.artifact.Artifact; import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager; import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
import org.sonatype.aether.repository.LocalArtifactRequest;
import org.sonatype.aether.repository.LocalArtifactResult;
/** /**
* @author Benjamin Bentmann * @author Benjamin Bentmann
@ -56,4 +59,17 @@ public class LegacyLocalRepositoryManager
return path.toString(); 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;
}
} }

16
maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
View File

@ -21,8 +21,11 @@ package org.apache.maven.project;
import java.io.File; import java.io.File;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.artifact.Artifact; import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager; import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
import org.sonatype.aether.repository.LocalArtifactRequest;
import org.sonatype.aether.repository.LocalArtifactResult;
/** /**
* @author Benjamin Bentmann * @author Benjamin Bentmann
@ -56,4 +59,17 @@ public class LegacyLocalRepositoryManager
return path.toString(); 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;
}
} }

4
pom.xml
View File

@ -49,13 +49,13 @@
<plexusVersion>1.5.5</plexusVersion> <plexusVersion>1.5.5</plexusVersion>
<plexusInterpolationVersion>1.14</plexusInterpolationVersion> <plexusInterpolationVersion>1.14</plexusInterpolationVersion>
<plexusUtilsVersion>2.0.6</plexusUtilsVersion> <plexusUtilsVersion>2.0.6</plexusUtilsVersion>
<sisuInjectVersion>2.1.1</sisuInjectVersion> <sisuInjectVersion>2.3.0</sisuInjectVersion>
<wagonVersion>2.0</wagonVersion> <wagonVersion>2.0</wagonVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion> <securityDispatcherVersion>1.3</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion> <cipherVersion>1.7</cipherVersion>
<modelloVersion>1.4.1</modelloVersion> <modelloVersion>1.4.1</modelloVersion>
<jxpathVersion>1.3</jxpathVersion> <jxpathVersion>1.3</jxpathVersion>
<aetherVersion>1.11</aetherVersion> <aetherVersion>1.13</aetherVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn --> <!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId> <distributionId>apache-maven</distributionId>