diff --git a/README.md b/README.md index 142fa7d4..029a1255 100755 --- a/README.md +++ b/README.md @@ -303,8 +303,6 @@ To use it, add into the pom project stuff like that: - /home/khanh/.m2/repository - https://repo.maven.apache.org/maven2/ HDFS diff --git a/hadoop-unit-maven-plugin/src/main/java/fr/jetoile/hadoopunit/HadoopBootstrapStarter.java b/hadoop-unit-maven-plugin/src/main/java/fr/jetoile/hadoopunit/HadoopBootstrapStarter.java index 85d22bf6..9c2d1604 100644 --- a/hadoop-unit-maven-plugin/src/main/java/fr/jetoile/hadoopunit/HadoopBootstrapStarter.java +++ b/hadoop-unit-maven-plugin/src/main/java/fr/jetoile/hadoopunit/HadoopBootstrapStarter.java @@ -52,9 +52,11 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; -import java.util.*; - -import static com.sun.tools.doclint.Entity.prop; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Mojo(name = "embedded-start", defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST, threadSafe = false) @@ -66,11 +68,23 @@ public class HadoopBootstrapStarter extends AbstractMojo { @Parameter(property = "components", required = true) protected List components; - @Parameter(property = "localRepo", required = true) - protected String localRepo; + /** + * The current repository/network configuration of Maven. + * + * @parameter default-value="${repositorySystemSession}" + * @readonly + */ + @Parameter(property = "repoSession", defaultValue = "${repositorySystemSession}") + private RepositorySystemSession repoSession; - @Parameter(property = "centralRepo", required = true) - protected String centralRepo; + /** + * The project's remote repositories to use for the resolution. + * + * @parameter default-value="${project.remoteProjectRepositories}" + * @readonly + */ + @Parameter(property = "remoteRepos", defaultValue = "${project.remoteProjectRepositories}") + private List remoteRepos; private List componentProperties = new ArrayList<>(); @@ -93,7 +107,7 @@ public void serviceCreationFailed(Class type, Class impl, Throwable except public DefaultRepositorySystemSession newRepositorySystemSession(RepositorySystem system) { DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); - LocalRepository localRepo1 = new LocalRepository(localRepo); + LocalRepository localRepo1 = new LocalRepository(repoSession.getLocalRepository().getBasedir()); session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo1)); // session.setTransferListener(new ConsoleTransferListener()); @@ -103,11 +117,7 @@ public DefaultRepositorySystemSession newRepositorySystemSession(RepositorySyste } public List newRepositories(RepositorySystem system, RepositorySystemSession session) { - return new ArrayList<>(Arrays.asList(newCentralRepository())); - } - - private RemoteRepository newCentralRepository() { - return new RemoteRepository.Builder("central", "default", centralRepo).build(); + return remoteRepos; } @Override @@ -128,7 +138,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { collectRequest.setRoot(new Dependency(artifact, JavaScopes.COMPILE)); collectRequest.setRepositories(newRepositories(system, session)); - getLog().info("Resolving artifact " + artifact + " from " + centralRepo); + getLog().info("Resolving artifact " + artifact + " from " + remoteRepos.stream().map(r -> r.getId() + "-" + r.getUrl()).collect(Collectors.joining(", "))); DependencyRequest dependencyRequest = new DependencyRequest(collectRequest, classpathFilter); diff --git a/sample/kafka-spark-streaming/pom.xml b/sample/kafka-spark-streaming/pom.xml index 885aad2d..d9cd2afd 100644 --- a/sample/kafka-spark-streaming/pom.xml +++ b/sample/kafka-spark-streaming/pom.xml @@ -122,8 +122,6 @@ - /home/khanh/.m2/repository - https://repo.maven.apache.org/maven2/ ZOOKEEPER diff --git a/sample/kafka-stream/pom.xml b/sample/kafka-stream/pom.xml index d7dcba97..b5228c52 100644 --- a/sample/kafka-stream/pom.xml +++ b/sample/kafka-stream/pom.xml @@ -101,8 +101,6 @@ - /home/khanh/.m2/repository - https://repo.maven.apache.org/maven2/ ZOOKEEPER diff --git a/sample/parquet-spark/pom.xml b/sample/parquet-spark/pom.xml index 4d5c8815..39537170 100644 --- a/sample/parquet-spark/pom.xml +++ b/sample/parquet-spark/pom.xml @@ -158,8 +158,6 @@ - /home/khanh/.m2/repository - https://repo.maven.apache.org/maven2/ HDFS diff --git a/sample/solr-parquet-spark/pom.xml b/sample/solr-parquet-spark/pom.xml index ea3f795d..1d4b50b5 100644 --- a/sample/solr-parquet-spark/pom.xml +++ b/sample/solr-parquet-spark/pom.xml @@ -139,8 +139,6 @@ - /home/khanh/.m2/repository - https://repo.maven.apache.org/maven2/ HDFS diff --git a/sample/spark-streaming-cassandra/pom.xml b/sample/spark-streaming-cassandra/pom.xml index da02ccfc..9aed6a21 100644 --- a/sample/spark-streaming-cassandra/pom.xml +++ b/sample/spark-streaming-cassandra/pom.xml @@ -144,8 +144,6 @@ - /home/khanh/.m2/repository - https://repo.maven.apache.org/maven2/ ZOOKEEPER