http://git-wip-us.apache.org/repos/asf/metron/blob/e8213918/metron-platform/metron-storm-kafka-override/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-storm-kafka-override/pom.xml b/metron-platform/metron-storm-kafka-override/pom.xml index b50bb91..3dd2d11 100644 --- a/metron-platform/metron-storm-kafka-override/pom.xml +++ b/metron-platform/metron-storm-kafka-override/pom.xml @@ -47,6 +47,14 @@ <scope>provided</scope> <exclusions> <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + <exclusion> <artifactId>servlet-api</artifactId> <groupId>javax.servlet</groupId> </exclusion>
http://git-wip-us.apache.org/repos/asf/metron/blob/e8213918/metron-platform/metron-storm-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-storm-kafka/pom.xml b/metron-platform/metron-storm-kafka/pom.xml index d420389..30bbc85 100644 --- a/metron-platform/metron-storm-kafka/pom.xml +++ b/metron-platform/metron-storm-kafka/pom.xml @@ -52,6 +52,14 @@ <scope>provided</scope> <exclusions> <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> <artifactId>servlet-api</artifactId> <groupId>javax.servlet</groupId> </exclusion> http://git-wip-us.apache.org/repos/asf/metron/blob/e8213918/metron-platform/metron-test-utilities/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-test-utilities/pom.xml b/metron-platform/metron-test-utilities/pom.xml index 8865b62..7c223a9 100644 --- a/metron-platform/metron-test-utilities/pom.xml +++ b/metron-platform/metron-test-utilities/pom.xml @@ -112,6 +112,14 @@ <scope>provided</scope> <exclusions> <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + <exclusion> <artifactId>servlet-api</artifactId> <groupId>javax.servlet</groupId> </exclusion> http://git-wip-us.apache.org/repos/asf/metron/blob/e8213918/metron-platform/metron-writer/pom.xml ---------------------------------------------------------------------- diff --git a/metron-platform/metron-writer/pom.xml b/metron-platform/metron-writer/pom.xml index 3456094..7254e3b 100644 --- a/metron-platform/metron-writer/pom.xml +++ b/metron-platform/metron-writer/pom.xml @@ -130,6 +130,14 @@ <scope>provided</scope> <exclusions> <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + <exclusion> <artifactId>servlet-api</artifactId> <groupId>javax.servlet</groupId> </exclusion> http://git-wip-us.apache.org/repos/asf/metron/blob/e8213918/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4678dff..98c942a 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ <global_hadoop_version>${base_hadoop_version}</global_hadoop_version> <global_hbase_version>${base_hbase_version}</global_hbase_version> <global_flume_version>${base_flume_version}</global_flume_version> - <global_elasticsearch_version>2.3.3</global_elasticsearch_version> + <global_elasticsearch_version>5.6.2</global_elasticsearch_version> <global_json_simple_version>1.1.1</global_json_simple_version> <global_metrics_version>3.0.2</global_metrics_version> <global_junit_version>4.12</global_junit_version> @@ -119,7 +119,7 @@ <global_kryo_serializers_version>0.38</global_kryo_serializers_version> <global_reflections_version>0.9.10</global_reflections_version> <global_checkstyle_version>8.0</global_checkstyle_version> - <argLine></argLine> + <global_log4j_core_version>2.1</global_log4j_core_version> </properties> <profiles> @@ -159,7 +159,7 @@ <version>${global_surefire_version}</version> <configuration> <!-- Skip the default running of this plug-in (or everything is run twice...see below) --> - <argLine>@{argLine} -Xmx2048m</argLine> + <argLine>-Xmx2048m</argLine> <skip>true</skip> <!-- Show 100% of the lines from the stack trace (doesn't work) --> <trimStackTrace>false</trimStackTrace> @@ -324,8 +324,6 @@ <exclude>**/src/main/sample/data/**</exclude> <exclude>**/dependency-reduced-pom.xml</exclude> <exclude>**/target/**</exclude> - <!-- pickle file - binary format --> - <exclude>**/src/main/resources/common-services/KIBANA/4.5.1/package/scripts/dashboard/dashboard.p</exclude> <!-- Files from Chef/bento --> <exclude>**/packer-build/scripts/**</exclude> <exclude>**/packer-build/bin/**</exclude>
