This is an automated email from the ASF dual-hosted git repository. mmiklavcic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/metron.git
The following commit(s) were added to refs/heads/master by this push: new 9c69ffc METRON-2036 Maven builds fail locally in HDFSWriterTest (mmiklavc) closes apache/metron#1357 9c69ffc is described below commit 9c69ffc8559830096a6138a5ef8fb3c31ea5bca3 Author: mmiklavc <michael.miklav...@gmail.com> AuthorDate: Thu Mar 14 14:06:44 2019 -0600 METRON-2036 Maven builds fail locally in HDFSWriterTest (mmiklavc) closes apache/metron#1357 --- metron-platform/metron-parsing/metron-parsers/pom.xml | 6 ------ metron-platform/metron-writer/pom.xml | 6 ++++++ .../org/apache/metron/writer/hdfs/HdfsWriterTest.java | 8 ++++++++ pom.xml | 18 ++++++++++++++++++ 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/metron-platform/metron-parsing/metron-parsers/pom.xml b/metron-platform/metron-parsing/metron-parsers/pom.xml index 83825f6..9645fb9 100644 --- a/metron-platform/metron-parsing/metron-parsers/pom.xml +++ b/metron-platform/metron-parsing/metron-parsers/pom.xml @@ -63,12 +63,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.metron</groupId> - <artifactId>metron-parsers-common</artifactId> - <version>${project.parent.version}</version> - <scope>compile</scope> - </dependency> <!-- Test dependencies --> <dependency> diff --git a/metron-platform/metron-writer/pom.xml b/metron-platform/metron-writer/pom.xml index 818e66d..45cba9d 100644 --- a/metron-platform/metron-writer/pom.xml +++ b/metron-platform/metron-writer/pom.xml @@ -228,6 +228,12 @@ <artifactId>stellar-common</artifactId> <version>${project.parent.version}</version> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${global_httpclient_version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/metron-platform/metron-writer/src/test/java/org/apache/metron/writer/hdfs/HdfsWriterTest.java b/metron-platform/metron-writer/src/test/java/org/apache/metron/writer/hdfs/HdfsWriterTest.java index 1d71c8a..ed78bf8 100644 --- a/metron-platform/metron-writer/src/test/java/org/apache/metron/writer/hdfs/HdfsWriterTest.java +++ b/metron-platform/metron-writer/src/test/java/org/apache/metron/writer/hdfs/HdfsWriterTest.java @@ -37,6 +37,7 @@ import org.apache.storm.task.TopologyContext; import org.json.simple.JSONObject; import org.junit.Assert; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -53,6 +54,13 @@ public class HdfsWriterTest { private File folder; private FileNameFormat testFormat; + @BeforeClass + public static void beforeAll() throws Exception { + // See https://issues.apache.org/jira/browse/METRON-2036 + // The need for this should go away when JUnit 4.13 is released and we can upgrade. + Thread.interrupted(); + } + @Before public void setup() throws IOException { // Ensure each test has a unique folder to work with. diff --git a/pom.xml b/pom.xml index 8b660c6..7e886aa 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,24 @@ <module>metron-stellar</module> </modules> + <!-- + Note: Regarding adding dependencies and managing classpath: + + https://docs.oracle.com/javase/8/docs/technotes/tools/findingclasses.html + + * In general, classes referenced by a JAR-class-path entry are found as though they were part of the JAR file. The + JAR files that appear in the JAR-class-path are searched after any earlier class path entries, and before any + entries that appear later in the class path. + + * However, if the JAR-class-path points to a JAR file that was already searched (for example, an extension, or a + JAR file that was listed earlier in the class path) then that JAR file will not be searched again. (This + optimization improves efficiency and prevents circular searches.) Such a JAR file is searched at the point that it + appears, earlier in the class path. + + * If a JAR file is installed as an extension, then any JAR-class-path it defines is ignored. All the classes + required by an extension are presumed to be part of the SDK or to have themselves been installed as extensions. + --> + <repositories> <repository> <id>clojars.org</id>