This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-downloader.git
commit 043022c2cde4e67e52e0a290fa190c23f8adf44f Author: Robert Scholte <[email protected]> AuthorDate: Tue Sep 6 21:05:25 2011 +0000 Fix to support MRRESOURCES-55: Support groupId:artifactId:version:type and groupId:artifactId:version:type:classifier as resource bundle references Patch contributed by Andrew Phillips, reviewed and adjusted by Robert Scholte git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1165843 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/shared/downloader/DefaultDownloader.java | 27 ++++++++++++++++++++-- .../apache/maven/shared/downloader/Downloader.java | 9 ++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java b/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java index df86261..f949b0f 100644 --- a/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java +++ b/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java @@ -6,6 +6,7 @@ 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.artifact.resolver.ArtifactResolver; +import org.apache.maven.artifact.versioning.VersionRange; import java.io.File; import java.util.List; @@ -47,9 +48,31 @@ public class DefaultDownloader throws DownloadException, DownloadNotFoundException { + return download( groupId, artifactId, version, "jar", null, localRepository, remoteRepositories ); + } + + public File download( String groupId, + String artifactId, + String version, + String type, + String classifier, + ArtifactRepository localRepository, + List/*<ArtifactRepository>*/ remoteRepositories ) + throws DownloadException, DownloadNotFoundException + + { Artifact artifact = - artifactFactory.createArtifact( groupId, artifactId, version, Artifact.SCOPE_RUNTIME, "jar" ); + artifactFactory.createDependencyArtifact( groupId, artifactId, VersionRange.createFromVersion( version ), type, classifier, Artifact.SCOPE_RUNTIME ); + return download( artifact, localRepository, remoteRepositories ); + } + + private File download( Artifact artifact, + ArtifactRepository localRepository, + List/*<ArtifactRepository>*/ remoteRepositories ) + throws DownloadException, DownloadNotFoundException + + { try { artifactResolver.resolve( artifact, remoteRepositories, localRepository ); @@ -63,6 +86,6 @@ public class DefaultDownloader throw new DownloadNotFoundException( "Requested download does not exist.", e ); } - return artifact.getFile(); + return artifact.getFile(); } } diff --git a/src/main/java/org/apache/maven/shared/downloader/Downloader.java b/src/main/java/org/apache/maven/shared/downloader/Downloader.java index 2be384a..1077f0e 100644 --- a/src/main/java/org/apache/maven/shared/downloader/Downloader.java +++ b/src/main/java/org/apache/maven/shared/downloader/Downloader.java @@ -25,4 +25,13 @@ public interface Downloader ArtifactRepository localRepository, List remoteRepositories ) throws DownloadException, DownloadNotFoundException; + + public File download( String groupId, + String artifactId, + String version, + String type, + String classifier, + ArtifactRepository localRepository, + List remoteRepositories ) + throws DownloadException, DownloadNotFoundException; } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
