From 6d54f7b09427a1859d073303e22ace64e42e21b3 Mon Sep 17 00:00:00 2001 From: Daniel Jue Date: Mon, 26 Sep 2016 12:06:39 -0400 Subject: [PATCH 1/3] Fixed package error. --- .../main/java/org/apache/metron/{ => spout}/pcap/Endianness.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename metron-platform/metron-pcap/src/main/java/org/apache/metron/{ => spout}/pcap/Endianness.java (100%) diff --git a/metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/Endianness.java b/metron-platform/metron-pcap/src/main/java/org/apache/metron/spout/pcap/Endianness.java similarity index 100% rename from metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/Endianness.java rename to metron-platform/metron-pcap/src/main/java/org/apache/metron/spout/pcap/Endianness.java From 1e45d059067f50afeadc22da13e3320990585367 Mon Sep 17 00:00:00 2001 From: Daniel Jue Date: Tue, 27 Sep 2016 10:07:47 -0400 Subject: [PATCH 2/3] Fix for METRON-451 SerDeUtils - java.lang.ClassNotFoundException: org.apache.storm.shade.org.joda.time.DateTime Took the same jodatime dependency from API's pom and put it in Common's pom. Not sure how this was building otherwise--it should not have been build-able without this dependency visible to this module. Suggest adding the version number as a variable that is controlled at a parent pom's dependency management section, so that the version numbers don't get out of sync between modules. --- metron-platform/metron-common/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml index 1595fdd0f1..47f21414ba 100644 --- a/metron-platform/metron-common/pom.xml +++ b/metron-platform/metron-common/pom.xml @@ -139,6 +139,11 @@ guava ${global_guava_version} compile + + + joda-time + joda-time + 2.3 org.apache.hbase From 896dc51ca0989170e91be709ecd40d020aeb35b9 Mon Sep 17 00:00:00 2001 From: Daniel Jue Date: Tue, 27 Sep 2016 10:12:17 -0400 Subject: [PATCH 3/3] Revert "Fix for METRON-451" This reverts commit 1e45d059067f50afeadc22da13e3320990585367. --- metron-platform/metron-common/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml index cce3cd621a..7a31e84c45 100644 --- a/metron-platform/metron-common/pom.xml +++ b/metron-platform/metron-common/pom.xml @@ -139,11 +139,6 @@ guava ${global_guava_version} compile - - - joda-time - joda-time - 2.3 org.apache.hbase