From 657a5ac346bcf9779d0ee78bc8b3f009d66a0346 Mon Sep 17 00:00:00 2001 From: Bingkun Guo Date: Fri, 30 Oct 2015 10:48:18 -0500 Subject: [PATCH] fix pull-deps remoteRepository option --- docs/content/operations/pull-deps.md | 4 ++-- .../src/main/java/io/druid/cli/PullDependencies.java | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/content/operations/pull-deps.md b/docs/content/operations/pull-deps.md index 493be449fde..58197b5ff03 100644 --- a/docs/content/operations/pull-deps.md +++ b/docs/content/operations/pull-deps.md @@ -27,9 +27,9 @@ layout: doc_page A local repostiry that Maven will use to put downloaded files. Then pull-deps will lay these files out into the extensions directory as needed. -`-r` or `--remoteRepositories` +`-r` or `--remoteRepository` - A JSON Array list of remote repositories to load dependencies from. + Add a remote repository to the default remote repository list, which includes https://repo1.maven.org/maven2/ and https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local `-d` or `--defaultVersion` diff --git a/services/src/main/java/io/druid/cli/PullDependencies.java b/services/src/main/java/io/druid/cli/PullDependencies.java index 319cae7ceef..062cf886e5f 100644 --- a/services/src/main/java/io/druid/cli/PullDependencies.java +++ b/services/src/main/java/io/druid/cli/PullDependencies.java @@ -106,11 +106,11 @@ public class PullDependencies implements Runnable public String localRepository = String.format("%s/%s", System.getProperty("user.home"), ".m2/repository"); @Option( - name = {"-r", "--remoteRepositories"}, - title = "A JSON Array list of remote repositories to load dependencies from.", + name = {"-r", "--remoteRepository"}, + title = "Add a remote repository to the default remote repository list, which includes https://repo1.maven.org/maven2/ and https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local", required = false ) - List remoteRepositories = ImmutableList.of( + List remoteRepositories = Lists.newArrayList( "https://repo1.maven.org/maven2/", "https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local" ); @@ -157,6 +157,12 @@ public class PullDependencies implements Runnable createRootExtensionsDirectory(extensionsDir); createRootExtensionsDirectory(hadoopDependenciesDir); + log.info( + "Start pull-deps with local repository [%s] and remote repositories [%s]", + localRepository, + remoteRepositories + ); + try { log.info("Start downloading dependencies for extension coordinates: [%s]", coordinates); for (final String coordinate : coordinates) {