You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/10/30 07:57:05 UTC

svn commit: r1635408 - in /maven/shared/trunk/maven-downloader: pom.xml src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java src/main/java/org/apache/maven/shared/downloader/Downloader.java

Author: hboutemy
Date: Thu Oct 30 06:57:05 2014
New Revision: 1635408

URL: http://svn.apache.org/r1635408
Log:
upgraded parent pom

Modified:
    maven/shared/trunk/maven-downloader/pom.xml
    maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
    maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java

Modified: maven/shared/trunk/maven-downloader/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/pom.xml?rev=1635408&r1=1635407&r2=1635408&view=diff
==============================================================================
--- maven/shared/trunk/maven-downloader/pom.xml (original)
+++ maven/shared/trunk/maven-downloader/pom.xml Thu Oct 30 06:57:05 2014
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>20</version>
+    <version>21</version>
     <relativePath>../maven-shared-components/pom.xml</relativePath>
   </parent>
 

Modified: maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java?rev=1635408&r1=1635407&r2=1635408&view=diff
==============================================================================
--- maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java (original)
+++ maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java Thu Oct 30 06:57:05 2014
@@ -47,50 +47,35 @@ public class DefaultDownloader
      */
     private ArtifactFactory artifactFactory;
 
-    public File download( String groupId,
-                          String artifactId,
-                          String version,
-                          File localRepository,
+    public File download( String groupId, String artifactId, String version, File localRepository,
                           String[] remoteRepositories )
         throws DownloadException, DownloadNotFoundException
-
     {
-        throw new RuntimeException( "Unsupported method, instead use" +
-        		"org.apache.maven.shared.downloader.DefaultDownloader.download( String, String, String, ArtifactRepository, List )" );
+        throw new RuntimeException( "Unsupported method, instead use org.apache.maven.shared.downloader."
+            + "DefaultDownloader.download( String, String, String, ArtifactRepository, List )" );
     }
 
-    public File download( String groupId,
-                          String artifactId,
-                          String version,
-                          ArtifactRepository localRepository,
-                          List/*<ArtifactRepository>*/ remoteRepositories )
+    public File download( String groupId, String artifactId, String version, ArtifactRepository localRepository,
+                          List/* <ArtifactRepository> */remoteRepositories )
         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 )
+    public File download( String groupId, String artifactId, String version, String type, String classifier,
+                          ArtifactRepository localRepository, List/* <ArtifactRepository> */remoteRepositories )
         throws DownloadException, DownloadNotFoundException
-
     {
         Artifact artifact =
-            artifactFactory.createDependencyArtifact( groupId, artifactId, VersionRange.createFromVersion( version ), type, classifier, Artifact.SCOPE_RUNTIME );
+            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 )
+    private File download( Artifact artifact, ArtifactRepository localRepository,
+                           List/* <ArtifactRepository> */remoteRepositories )
         throws DownloadException, DownloadNotFoundException
-        
     {
         try
         {

Modified: maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java?rev=1635408&r1=1635407&r2=1635408&view=diff
==============================================================================
--- maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java (original)
+++ maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java Thu Oct 30 06:57:05 2014
@@ -31,26 +31,15 @@ public interface Downloader
 {
     String ROLE = Downloader.class.getName();
 
-    public File download( String groupId,
-                          String artifactId,
-                          String version,
-                          File localRepository,
-                          String[] remoteRepositories )
+    File download( String groupId, String artifactId, String version, File localRepository,
+                   String[] remoteRepositories )
         throws DownloadException, DownloadNotFoundException;
 
-    public File download( String groupId,
-                          String artifactId,
-                          String version,
-                          ArtifactRepository localRepository,
-                          List remoteRepositories )
+    File download( String groupId, String artifactId, String version, ArtifactRepository localRepository,
+                   List remoteRepositories )
         throws DownloadException, DownloadNotFoundException;
 
-    public File download( String groupId,
-                          String artifactId,
-                          String version,
-                          String type,
-                          String classifier,
-                          ArtifactRepository localRepository,
-                          List remoteRepositories )
+    File download( String groupId, String artifactId, String version, String type, String classifier,
+                   ArtifactRepository localRepository, List remoteRepositories )
         throws DownloadException, DownloadNotFoundException;
 }