This is an automated email from the ASF dual-hosted git repository. srdo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push: new 443d99a STORM-3424: storm-submit-tools: fix all checkstyle warnings new 08d2b9e Merge pull request #3039 from krichter722/checkstyle-submit-tools 443d99a is described below commit 443d99a8da9e346763887d73914b42ceeabab3d9 Author: Karl-Philipp Richter <krich...@posteo.de> AuthorDate: Tue Jun 25 21:21:49 2019 +0200 STORM-3424: storm-submit-tools: fix all checkstyle warnings --- storm-submit-tools/pom.xml | 2 +- .../submit/command/DependencyResolverMain.java | 30 +++++++++++++++++----- .../org/apache/storm/submit/dependency/Booter.java | 4 +-- .../submit/dependency/RepositorySystemFactory.java | 4 +-- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/storm-submit-tools/pom.xml b/storm-submit-tools/pom.xml index 2036d81..3ff57df 100644 --- a/storm-submit-tools/pom.xml +++ b/storm-submit-tools/pom.xml @@ -115,7 +115,7 @@ <artifactId>maven-checkstyle-plugin</artifactId> <!--Note - the version would be inherited--> <configuration> - <maxAllowedViolations>38</maxAllowedViolations> + <maxAllowedViolations>0</maxAllowedViolations> </configuration> </plugin> <plugin> diff --git a/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java b/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java index 908d238..777bf74 100644 --- a/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java +++ b/storm-submit-tools/src/main/java/org/apache/storm/submit/command/DependencyResolverMain.java @@ -223,12 +223,30 @@ public class DependencyResolverMain { private static Options buildOptions() { Options options = new Options(); - options.addOption(null, OPTION_ARTIFACTS_LONG, true, "REQUIRED string representation of artifacts"); - options.addOption(null, OPTION_ARTIFACT_REPOSITORIES_LONG, true, "OPTIONAL string representation of artifact repositories"); - options.addOption(null, OPTION_MAVEN_LOCAL_REPOSITORY_DIRECTORY_LONG, true, "OPTIONAL string representation of local maven repository directory path"); - options.addOption(null, OPTION_PROXY_URL_LONG, true, "OPTIONAL URL representation of proxy server"); - options.addOption(null, OPTION_PROXY_USERNAME_LONG, true, "OPTIONAL Username of proxy server (basic auth)"); - options.addOption(null, OPTION_PROXY_PASSWORD_LONG, true, "OPTIONAL Password of proxy server (basic auth)"); + options.addOption(null, + OPTION_ARTIFACTS_LONG, + true, + "REQUIRED string representation of artifacts"); + options.addOption(null, + OPTION_ARTIFACT_REPOSITORIES_LONG, + true, + "OPTIONAL string representation of artifact repositories"); + options.addOption(null, + OPTION_MAVEN_LOCAL_REPOSITORY_DIRECTORY_LONG, + true, + "OPTIONAL string representation of local maven repository directory path"); + options.addOption(null, + OPTION_PROXY_URL_LONG, + true, + "OPTIONAL URL representation of proxy server"); + options.addOption(null, + OPTION_PROXY_USERNAME_LONG, + true, + "OPTIONAL Username of proxy server (basic auth)"); + options.addOption(null, + OPTION_PROXY_PASSWORD_LONG, + true, + "OPTIONAL Password of proxy server (basic auth)"); return options; } } diff --git a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/Booter.java b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/Booter.java index 5b60faf..87b5e76 100644 --- a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/Booter.java +++ b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/Booter.java @@ -18,6 +18,8 @@ package org.apache.storm.submit.dependency; +import java.io.File; + import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystem; @@ -25,8 +27,6 @@ import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.LocalRepository; import org.eclipse.aether.repository.RemoteRepository; -import java.io.File; - /** * Manage mvn repository. */ diff --git a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/RepositorySystemFactory.java b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/RepositorySystemFactory.java index 2f358cd..0783baf 100644 --- a/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/RepositorySystemFactory.java +++ b/storm-submit-tools/src/main/java/org/apache/storm/submit/dependency/RepositorySystemFactory.java @@ -18,6 +18,8 @@ package org.apache.storm.submit.dependency; +import org.apache.maven.repository.internal.MavenRepositorySystemUtils; + import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory; import org.eclipse.aether.impl.DefaultServiceLocator; @@ -26,8 +28,6 @@ import org.eclipse.aether.spi.connector.transport.TransporterFactory; import org.eclipse.aether.transport.file.FileTransporterFactory; import org.eclipse.aether.transport.http.HttpTransporterFactory; -import org.apache.maven.repository.internal.MavenRepositorySystemUtils; - /** * Get maven repository instance. */