You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2015/06/20 21:25:46 UTC
svn commit: r1686665 - in /maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugin/dependency/GetMojo.java
test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
Author: rfscholte
Date: Sat Jun 20 19:25:46 2015
New Revision: 1686665
URL: http://svn.apache.org/r1686665
Log:
[MDEP-495] Remove deprecated parameter
removed repositoryId and repositoryUrl from 'get' goal
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java?rev=1686665&r1=1686664&r2=1686665&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java Sat Jun 20 19:25:46 2015
@@ -127,22 +127,6 @@ public class GetMojo
private String packaging = "jar";
/**
- * The id of the repository from which we'll download the artifact
- *
- * @deprecated Use remoteRepositories
- */
- @Parameter( property = "repoId", defaultValue = "temp" )
- private String repositoryId = "temp";
-
- /**
- * The url of the repository from which we'll download the artifact. DEPRECATED Use remoteRepositories
- *
- * @deprecated Use remoteRepositories
- */
- @Parameter( property = "repoUrl" )
- private String repositoryUrl;
-
- /**
* Repositories in the format id::[layout]::url or just url, separated by comma.
* ie. central::default::http://repo1.maven.apache.org/maven2,myrepo::::http://repo.acme.com,http://repo.acme2.com
*/
@@ -251,15 +235,6 @@ public class GetMojo
}
}
- if ( repositoryUrl != null )
- {
- getLog().warn( "repositoryUrl parameter is deprecated. Use remoteRepositories instead" );
- ArtifactRepository remoteRepo =
- artifactRepositoryFactory.createArtifactRepository( repositoryId, repositoryUrl, getLayout( "default" ),
- always, always );
- repoList.add( remoteRepo );
- }
-
try
{
if ( transitive )
@@ -316,7 +291,7 @@ public class GetMojo
throws MojoFailureException
{
// if it's a simple url
- String id = repositoryId;
+ String id = "temp";
ArtifactRepositoryLayout layout = getLayout( "default" );
String url = repo;
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java?rev=1686665&r1=1686664&r2=1686665&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java Sat Jun 20 19:25:46 2015
@@ -86,7 +86,7 @@ public class TestGetMojo
{
// Set properties, transitive = default value = true
setVariableValueToObject( mojo, "transitive", Boolean.FALSE );
- setVariableValueToObject( mojo, "repositoryUrl", "http://repo1.maven.apache.org/maven2" );
+ setVariableValueToObject( mojo, "remoteRepositories", "central::default::http://repo1.maven.apache.org/maven2" );
setVariableValueToObject( mojo, "groupId", "org.apache.maven" );
setVariableValueToObject( mojo, "artifactId", "maven-model" );
setVariableValueToObject( mojo, "version", "2.0.9" );
@@ -108,7 +108,7 @@ public class TestGetMojo
{
// Set properties, transitive = default value = true
setVariableValueToObject( mojo, "transitive", Boolean.FALSE );
- setVariableValueToObject( mojo, "repositoryUrl", "http://repo1.maven.apache.org/maven2" );
+ setVariableValueToObject( mojo, "remoteRepositories", "central::default::http://repo1.maven.apache.org/maven2" );
setVariableValueToObject( mojo, "groupId", "org.apache.maven" );
setVariableValueToObject( mojo, "artifactId", "maven-model" );
setVariableValueToObject( mojo, "version", "2.0.9" );