This is an automated email from the ASF dual-hosted git repository. nickallen 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 1ae45a9 METRON-2012 Unable to Execute Stellar Functions Against HBase in the REPL (nickwallen) closes apache/metron#1345 1ae45a9 is described below commit 1ae45a97dc73ee468f6d45052fbfa63c3bca19b8 Author: nickwallen <n...@nickallen.org> AuthorDate: Wed Mar 6 13:56:16 2019 -0500 METRON-2012 Unable to Execute Stellar Functions Against HBase in the REPL (nickwallen) closes apache/metron#1345 --- metron-analytics/metron-profiler-client/pom.xml | 314 ++++++--------------- .../profiler/client/stellar/WindowLookback.java | 25 +- .../metron/profiler/client/window/Window.java | 15 +- .../client/stellar/WindowLookbackTest.java | 11 +- metron-analytics/metron-profiler-common/pom.xml | 64 +---- .../metron/profiler/DefaultMessageDistributor.java | 2 - metron-analytics/metron-profiler-repl/pom.xml | 6 + metron-analytics/metron-profiler-storm/pom.xml | 8 +- metron-contrib/metron-performance/pom.xml | 10 +- metron-platform/elasticsearch-shaded/pom.xml | 9 +- metron-platform/metron-common/pom.xml | 6 +- metron-platform/metron-data-management/pom.xml | 30 +- metron-platform/metron-elasticsearch/pom.xml | 95 +++++-- metron-platform/metron-enrichment/pom.xml | 28 +- metron-platform/metron-indexing/pom.xml | 32 +-- metron-platform/metron-management/pom.xml | 6 +- metron-platform/metron-pcap-backend/pom.xml | 27 +- metron-platform/metron-solr/pom.xml | 5 +- .../metron-storm-kafka-override/pom.xml | 9 +- metron-platform/metron-writer/pom.xml | 12 +- metron-stellar/stellar-common/pom.xml | 5 +- 21 files changed, 299 insertions(+), 420 deletions(-) diff --git a/metron-analytics/metron-profiler-client/pom.xml b/metron-analytics/metron-profiler-client/pom.xml index 0238214..b667991 100644 --- a/metron-analytics/metron-profiler-client/pom.xml +++ b/metron-analytics/metron-profiler-client/pom.xml @@ -25,68 +25,33 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <guava_version>${global_hbase_guava_version}</guava_version> </properties> <dependencies> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>${global_hadoop_version}</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${global_hadoop_version}</version> - <exclusions> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>commons-httpclient</artifactId> - <groupId>commons-httpclient</groupId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - <scope>provided</scope> - </dependency> - <dependency> <groupId>de.jollyday</groupId> <artifactId>jollyday</artifactId> <version>0.5.2</version> </dependency> <dependency> + <groupId>com.github.ben-manes.caffeine</groupId> + <artifactId>caffeine</artifactId> + <version>${global_caffeine_version}</version> + </dependency> + <dependency> <groupId>org.apache.metron</groupId> <artifactId>metron-profiler-common</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.metron</groupId> - <artifactId>metron-hbase</artifactId> + <artifactId>metron-common</artifactId> <version>${project.parent.version}</version> <exclusions> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.metron</groupId> - <artifactId>metron-hbase</artifactId> - <version>${project.parent.version}</version> - <scope>test</scope> - <type>test-jar</type> - <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -94,87 +59,45 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${global_hadoop_version}</version> - <exclusions> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>commons-httpclient</artifactId> - <groupId>commons-httpclient</groupId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - <scope>provided</scope> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava_version}</version> </dependency> <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${global_hbase_version}</version> + <groupId>org.apache.metron</groupId> + <artifactId>metron-hbase</artifactId> + <version>${project.parent.version}</version> <exclusions> <exclusion> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> + <artifactId>hadoop-hdfs</artifactId> </exclusion> <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </exclusion> </exclusions> - <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.storm</groupId> - <artifactId>storm-core</artifactId> - <version>${global_storm_version}</version> - <scope>provided</scope> + <groupId>org.apache.metron</groupId> + <artifactId>metron-hbase</artifactId> + <version>${project.parent.version}</version> + <scope>test</scope> + <type>test-jar</type> <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> - <exclusion> - <artifactId>log4j-over-slf4j</artifactId> <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>disruptor</artifactId> - <groupId>com.googlecode.disruptor</groupId> - </exclusion> - <exclusion> - <artifactId>log4j-slf4j-impl</artifactId> - <groupId>org.apache.logging.log4j</groupId> + <artifactId>slf4j-log4j12</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>${global_hadoop_version}</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.hbase</groupId> - <artifactId>hbase-server</artifactId> + <artifactId>hbase-client</artifactId> <version>${global_hbase_version}</version> <exclusions> <exclusion> @@ -183,92 +106,20 @@ </exclusion> <exclusion> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> </exclusion> - </exclusions> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>${global_hadoop_version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>${global_hadoop_version}</version> - <scope>test</scope> - <exclusions> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>${global_hadoop_version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - <version>${global_hbase_version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>${global_mockito_version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.metron</groupId> - <artifactId>metron-integration-test</artifactId> - <version>${project.parent.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>${global_antlr_version}</version> - </dependency> - </dependencies> <build> <plugins> @@ -287,7 +138,6 @@ </execution> </executions> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> @@ -307,12 +157,12 @@ <goal>shade</goal> </goals> <configuration> - <relocations> - <relocation> - <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava</shadedPattern> - </relocation> - </relocations> + <relocations> + <relocation> + <pattern>com.google.common</pattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> + </relocation> + </relocations> <filters> <filter> <artifact>*:*</artifact> @@ -323,51 +173,51 @@ </excludes> </filter> </filters> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> - <resources> - <resource>.yaml</resource> - <resource>LICENSE.txt</resource> - <resource>ASL2.0</resource> - <resource>NOTICE.txt</resource> - </resources> - </transformer> - <!-- UNCOMMENT THIS IF YOU NEED TO REGENERATE THE BEST GUESS NOTICES FILE WHICH REQUIRES PRUNING EVERY RELEASE --> - <!--transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> - <addHeader>false</addHeader> - <projectName>${project.name}</projectName> - </transformer--> + <transformers> + <transformer + implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resources> + <resource>.yaml</resource> + <resource>LICENSE.txt</resource> + <resource>ASL2.0</resource> + <resource>NOTICE.txt</resource> + </resources> + </transformer> + <!-- UNCOMMENT THIS IF YOU NEED TO REGENERATE THE BEST GUESS NOTICES FILE WHICH REQUIRES PRUNING EVERY RELEASE --> + <!--transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> + <addHeader>false</addHeader> + <projectName>${project.name}</projectName> + </transformer--> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass></mainClass> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </configuration> - <executions> - <execution> - <id>make-assembly</id> <!-- this is used for inheritance merges --> - <phase>package</phase> <!-- bind to the packaging phase --> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> -</project> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <mainClass></mainClass> + </transformer> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptor>src/main/assembly/assembly.xml</descriptor> + </configuration> + <executions> + <execution> + <id>make-assembly</id> <!-- this is used for inheritance merges --> + <phase>package</phase> <!-- bind to the packaging phase --> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> + </project> diff --git a/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/stellar/WindowLookback.java b/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/stellar/WindowLookback.java index 273b244..e44ec16 100644 --- a/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/stellar/WindowLookback.java +++ b/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/stellar/WindowLookback.java @@ -19,21 +19,20 @@ */ package org.apache.metron.profiler.client.stellar; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import org.apache.metron.profiler.ProfilePeriod; +import org.apache.metron.profiler.client.window.Window; +import org.apache.metron.profiler.client.window.WindowProcessor; +import org.apache.metron.stellar.common.utils.ConversionUtils; import org.apache.metron.stellar.dsl.Context; import org.apache.metron.stellar.dsl.ParseException; import org.apache.metron.stellar.dsl.Stellar; import org.apache.metron.stellar.dsl.StellarFunction; -import org.apache.metron.stellar.common.utils.ConversionUtils; -import org.apache.metron.profiler.ProfilePeriod; -import org.apache.metron.profiler.client.window.Window; -import org.apache.metron.profiler.client.window.WindowProcessor; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @Stellar( @@ -79,8 +78,8 @@ public class WindowLookback implements StellarFunction { TimeUnit tickUnit = TimeUnit.valueOf(ProfilerClientConfig.PROFILER_PERIOD_UNITS.get(effectiveConfigs, String.class)); Window w = null; try { - w = windowCache.get(windowSelector, () -> WindowProcessor.process(windowSelector)); - } catch (ExecutionException e) { + w = windowCache.get(windowSelector, (selector) -> WindowProcessor.process(selector)); + } catch (ParseException e) { throw new IllegalStateException("Unable to process " + windowSelector + ": " + e.getMessage(), e); } long end = w.getEndMillis(now); @@ -94,10 +93,10 @@ public class WindowLookback implements StellarFunction { @Override public void initialize(Context context) { - windowCache = CacheBuilder.newBuilder() - .maximumSize(200) - .expireAfterAccess(10, TimeUnit.MINUTES) - .build(); + windowCache = Caffeine.newBuilder() + .maximumSize(200) + .expireAfterAccess(10, TimeUnit.MINUTES) + .build(); } @Override diff --git a/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/window/Window.java b/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/window/Window.java index 9fd6339..3d8e0b7 100644 --- a/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/window/Window.java +++ b/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/window/Window.java @@ -19,13 +19,14 @@ */ package org.apache.metron.profiler.client.window; -import com.google.common.collect.Iterables; +import org.apache.commons.lang3.Range; + import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.function.Function; import java.util.function.Predicate; -import org.apache.commons.lang3.Range; +import java.util.stream.Collectors; /** * A window is intended to compute the set of window intervals across time based on a reference time. @@ -74,7 +75,10 @@ public class Window { * applied to the window interval start time, then a field is included unless it's explicitly excluded */ public Iterable<Predicate<Long>> getIncludes(long now) { - return Iterables.transform(includes, f -> f.apply(now)); + return includes + .stream() + .map(include -> include.apply(now)) + .collect(Collectors.toList()); } void setIncludes(List<Function<Long, Predicate<Long>>> includes) { @@ -90,7 +94,10 @@ public class Window { * Exclusions trump inclusions. */ public Iterable<Predicate<Long>> getExcludes(long now){ - return Iterables.transform(excludes, f -> f.apply(now)); + return excludes + .stream() + .map(exclude -> exclude.apply(now)) + .collect(Collectors.toList()); } void setExcludes(List<Function<Long, Predicate<Long>>> excludes) { diff --git a/metron-analytics/metron-profiler-client/src/test/java/org/apache/metron/profiler/client/stellar/WindowLookbackTest.java b/metron-analytics/metron-profiler-client/src/test/java/org/apache/metron/profiler/client/stellar/WindowLookbackTest.java index 9ef1805..df6235f 100644 --- a/metron-analytics/metron-profiler-client/src/test/java/org/apache/metron/profiler/client/stellar/WindowLookbackTest.java +++ b/metron-analytics/metron-profiler-client/src/test/java/org/apache/metron/profiler/client/stellar/WindowLookbackTest.java @@ -19,7 +19,6 @@ */ package org.apache.metron.profiler.client.stellar; -import com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.Range; import org.apache.metron.stellar.dsl.Context; import org.apache.metron.stellar.dsl.DefaultVariableResolver; @@ -58,11 +57,11 @@ public class WindowLookbackTest { //profile duration to 1 minute instead of 15 minutes (the default), then we should see //the correct number of profiles. long durationMs = 60000; - State state = test("1 hour", new Date() - , Optional.of( - ImmutableMap.of( ProfilerClientConfig.PROFILER_PERIOD.getKey(), 1 ) - ) - ,Assertions.NOT_EMPTY,Assertions.CONTIGUOUS); + + Map<String, Object> config = new HashMap<>(); + config.put(ProfilerClientConfig.PROFILER_PERIOD.getKey(), 1); + + State state = test("1 hour", new Date(), Optional.of(config), Assertions.NOT_EMPTY, Assertions.CONTIGUOUS); Assert.assertEquals(TimeUnit.HOURS.toMillis(1) / durationMs, state.periods.size()); } diff --git a/metron-analytics/metron-profiler-common/pom.xml b/metron-analytics/metron-profiler-common/pom.xml index f1811bf..67952e5 100644 --- a/metron-analytics/metron-profiler-common/pom.xml +++ b/metron-analytics/metron-profiler-common/pom.xml @@ -28,43 +28,9 @@ </properties> <dependencies> <dependency> - <groupId>com.github.ben-manes.caffeine</groupId> - <artifactId>caffeine</artifactId> - <version>${global_caffeine_version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>${global_hadoop_version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${global_hadoop_version}</version> - <exclusions> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>commons-httpclient</artifactId> - <groupId>commons-httpclient</groupId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.metron</groupId> + <artifactId>metron-common</artifactId> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.apache.metron</groupId> @@ -75,27 +41,11 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${global_hadoop_version}</version> - <exclusions> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> <exclusion> - <artifactId>commons-httpclient</artifactId> - <groupId>commons-httpclient</groupId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </exclusion> </exclusions> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> @@ -114,6 +64,10 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> </exclusions> <scope>provided</scope> </dependency> diff --git a/metron-analytics/metron-profiler-common/src/main/java/org/apache/metron/profiler/DefaultMessageDistributor.java b/metron-analytics/metron-profiler-common/src/main/java/org/apache/metron/profiler/DefaultMessageDistributor.java index ef2ff2c..db22df1 100644 --- a/metron-analytics/metron-profiler-common/src/main/java/org/apache/metron/profiler/DefaultMessageDistributor.java +++ b/metron-analytics/metron-profiler-common/src/main/java/org/apache/metron/profiler/DefaultMessageDistributor.java @@ -24,7 +24,6 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.CacheWriter; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.RemovalCause; -import com.github.benmanes.caffeine.cache.RemovalListener; import com.github.benmanes.caffeine.cache.Ticker; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.metron.common.configuration.profiler.ProfileConfig; @@ -40,7 +39,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.function.Function; diff --git a/metron-analytics/metron-profiler-repl/pom.xml b/metron-analytics/metron-profiler-repl/pom.xml index 8aa4dd4..812e176 100644 --- a/metron-analytics/metron-profiler-repl/pom.xml +++ b/metron-analytics/metron-profiler-repl/pom.xml @@ -42,6 +42,12 @@ <groupId>org.apache.metron</groupId> <artifactId>metron-profiler-client</artifactId> <version>${project.parent.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.metron</groupId> diff --git a/metron-analytics/metron-profiler-storm/pom.xml b/metron-analytics/metron-profiler-storm/pom.xml index 0aadb58..30566fd 100644 --- a/metron-analytics/metron-profiler-storm/pom.xml +++ b/metron-analytics/metron-profiler-storm/pom.xml @@ -25,9 +25,15 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <guava_version>${global_hbase_guava_version}</guava_version> </properties> <dependencies> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava_version}</version> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> <version>${global_hadoop_version}</version> @@ -362,7 +368,7 @@ <relocations> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava.metron-profiler</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> <relocation> <pattern>com.fasterxml.jackson</pattern> diff --git a/metron-contrib/metron-performance/pom.xml b/metron-contrib/metron-performance/pom.xml index b4ee452..627d6c6 100644 --- a/metron-contrib/metron-performance/pom.xml +++ b/metron-contrib/metron-performance/pom.xml @@ -27,12 +27,14 @@ </parent> <description>Performance Testing Utilities</description> <url>https://metron.apache.org/</url> - + <properties> + <guava_version>${global_guava_version}</guava_version> + </properties> <dependencies> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${global_guava_version}</version> + <version>${guava_version}</version> </dependency> <dependency> <groupId>org.apache.metron</groupId> @@ -87,8 +89,8 @@ </filters> <relocations> <relocation> - <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.perf.guava</shadedPattern> + <pattern>com.google.common</pattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> </relocations> <transformers> diff --git a/metron-platform/elasticsearch-shaded/pom.xml b/metron-platform/elasticsearch-shaded/pom.xml index 919f18a..f33fdfe 100644 --- a/metron-platform/elasticsearch-shaded/pom.xml +++ b/metron-platform/elasticsearch-shaded/pom.xml @@ -23,11 +23,14 @@ <artifactId>elasticsearch-shaded</artifactId> <name>elasticsearch-shaded</name> <url>https://metron.apache.org/</url> + <properties> + <guava_version>18.0</guava_version> + </properties> <dependencies> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> + <version>${guava_version}</version> </dependency> <dependency> <groupId>io.netty</groupId> @@ -118,7 +121,7 @@ <exclude>META-INF/*.RSA</exclude> </excludes> </filter> - </filters> + </filters> <relocations> <!-- The REST API has conflicts with these packages --> <relocation> @@ -127,7 +130,7 @@ </relocation> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava.elasticsearch-shaded</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> </relocations> <artifactSet> diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml index 8155016..4735044 100644 --- a/metron-platform/metron-common/pom.xml +++ b/metron-platform/metron-common/pom.xml @@ -28,6 +28,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <commons.config.version>1.10</commons.config.version> + <guava_version>${global_guava_version}</guava_version> </properties> <repositories> <repository> @@ -193,7 +194,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${global_guava_version}</version> + <version>${guava_version}</version> <scope>compile</scope> </dependency> <dependency> @@ -443,13 +444,12 @@ <relocations> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> <relocation> <pattern>org.apache.commons.beanutils</pattern> <shadedPattern>org.apache.metron.beanutils</shadedPattern> </relocation> - </relocations> <transformers> <transformer diff --git a/metron-platform/metron-data-management/pom.xml b/metron-platform/metron-data-management/pom.xml index 9e6bdf1..72412ed 100644 --- a/metron-platform/metron-data-management/pom.xml +++ b/metron-platform/metron-data-management/pom.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software - Foundation (ASF) under one or more contributor license agreements. See the - NOTICE file distributed with this work for additional information regarding - copyright ownership. The ASF licenses this file to You under the Apache License, - Version 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed - under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES - OR CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the License. +<!-- + Licensed to the Apache Software + Foundation (ASF) under one or more contributor license agreements. See the + NOTICE file distributed with this work for additional information regarding + copyright ownership. The ASF licenses this file to You under the Apache License, + Version 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed + under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES + OR CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -27,13 +27,13 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <lucene.test.version>5.5.0</lucene.test.version> + <guava_version>${global_hbase_guava_version}</guava_version> </properties> - <dependencies> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${global_hbase_guava_version}</version> + <version>${guava_version}</version> </dependency> <dependency> <groupId>javax.xml.bind</groupId> @@ -368,11 +368,11 @@ <exclude>META-INF/*.RSA</exclude> </excludes> </filter> - </filters> + </filters> <relocations> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava.dataload</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> <relocation> <pattern>org.apache.http</pattern> diff --git a/metron-platform/metron-elasticsearch/pom.xml b/metron-platform/metron-elasticsearch/pom.xml index 534f22c..c387d1e 100644 --- a/metron-platform/metron-elasticsearch/pom.xml +++ b/metron-platform/metron-elasticsearch/pom.xml @@ -26,6 +26,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <guava_version>${global_hbase_guava_version}</guava_version> </properties> <dependencies> <dependency> @@ -35,22 +36,28 @@ </dependency> <dependency> <groupId>org.apache.metron</groupId> - <artifactId>metron-enrichment</artifactId> + <artifactId>metron-common</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.metron</groupId> + <artifactId>metron-storm-kafka</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.metron</groupId> + <artifactId>metron-writer</artifactId> + <version>${project.parent.version}</version> + </dependency> + <dependency> + <groupId>org.apache.metron</groupId> + <artifactId>metron-hbase</artifactId> <version>${project.parent.version}</version> - <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> + </dependency> + <dependency> + <groupId>org.apache.storm</groupId> + <artifactId>flux-core</artifactId> + <version>${global_flux_version}</version> </dependency> <dependency> <groupId>org.apache.storm</groupId> @@ -78,12 +85,6 @@ <version>4.4.9</version> </dependency> <dependency> - <groupId>org.elasticsearch.plugin</groupId> - <artifactId>transport-netty4-client</artifactId> - <version>${global_elasticsearch_version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.metron</groupId> <artifactId>metron-hbase</artifactId> <version>${project.parent.version}</version> @@ -101,6 +102,11 @@ </exclusions> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava_version}</version> + </dependency> + <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-client</artifactId> <version>${global_hbase_version}</version> @@ -113,6 +119,14 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -124,6 +138,10 @@ <artifactId>servlet-api</artifactId> <groupId>javax.servlet</groupId> </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -157,6 +175,19 @@ </exclusions> </dependency> <dependency> + <!-- must be near the top of the dependencies to force retrieval of the correct netty version --> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>4.1.13.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.elasticsearch.plugin</groupId> + <artifactId>transport-netty4-client</artifactId> + <version>${global_elasticsearch_version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> <version>${global_kafka_version}</version> @@ -170,11 +201,6 @@ </exclusions> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - <version>3.10.5.Final</version> - </dependency> - <dependency> <groupId>org.apache.metron</groupId> <artifactId>metron-integration-test</artifactId> <version>${project.parent.version}</version> @@ -184,6 +210,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -216,9 +250,14 @@ <version>${project.parent.version}</version> <type>test-jar</type> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> - <build> <plugins> <plugin> @@ -262,7 +301,7 @@ <relocations> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava.metron-elasticsearch</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> <relocation> <pattern>com.fasterxml.jackson</pattern> diff --git a/metron-platform/metron-enrichment/pom.xml b/metron-platform/metron-enrichment/pom.xml index 9f6e993..74eb4e4 100644 --- a/metron-platform/metron-enrichment/pom.xml +++ b/metron-platform/metron-enrichment/pom.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software - Foundation (ASF) under one or more contributor license agreements. See the - NOTICE file distributed with this work for additional information regarding - copyright ownership. The ASF licenses this file to You under the Apache License, - Version 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed - under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES - OR CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the License. +<!-- + Licensed to the Apache Software + Foundation (ASF) under one or more contributor license agreements. See the + NOTICE file distributed with this work for additional information regarding + copyright ownership. The ASF licenses this file to You under the Apache License, + Version 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed + under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES + OR CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -30,7 +30,7 @@ <storm.hdfs.version>0.1.2</storm.hdfs.version> <commons-compress.version>1.13</commons-compress.version> <geoip.version>2.12.0</geoip.version> - <guava.version>${global_hbase_guava_version}</guava.version> + <guava_version>${global_hbase_guava_version}</guava_version> </properties> <dependencies> <dependency> @@ -242,7 +242,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${global_hbase_guava_version}</version> + <version>${guava_version}</version> </dependency> <dependency> <groupId>org.apache.kafka</groupId> @@ -372,7 +372,7 @@ </relocation> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava.enrichment</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> </relocations> <artifactSet> diff --git a/metron-platform/metron-indexing/pom.xml b/metron-platform/metron-indexing/pom.xml index 8a5f5ec..d2c0f6d 100644 --- a/metron-platform/metron-indexing/pom.xml +++ b/metron-platform/metron-indexing/pom.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software - Foundation (ASF) under one or more contributor license agreements. See the - NOTICE file distributed with this work for additional information regarding - copyright ownership. The ASF licenses this file to You under the Apache License, - Version 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed - under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES - OR CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the License. +<!-- + Licensed to the Apache Software + Foundation (ASF) under one or more contributor license agreements. See the + NOTICE file distributed with this work for additional information regarding + copyright ownership. The ASF licenses this file to You under the Apache License, + Version 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed + under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES + OR CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -28,7 +28,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <slf4j.version>1.7.7</slf4j.version> <storm.hdfs.version>0.1.2</storm.hdfs.version> - <guava.version>${global_hbase_guava_version}</guava.version> + <guava_version>${global_hbase_guava_version}</guava_version> </properties> <dependencies> <dependency> @@ -67,7 +67,6 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> @@ -79,8 +78,7 @@ </exclusion> </exclusions> <scope>provided</scope> - </dependency> - + </dependency> <dependency> <groupId>org.apache.storm</groupId> <artifactId>storm-core</artifactId> @@ -123,7 +121,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${global_guava_version}</version> + <version>${guava_version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -252,7 +250,7 @@ <relocations> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> </relocations> <transformers> diff --git a/metron-platform/metron-management/pom.xml b/metron-platform/metron-management/pom.xml index b969306..8dd6e62 100644 --- a/metron-platform/metron-management/pom.xml +++ b/metron-platform/metron-management/pom.xml @@ -29,9 +29,9 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <commons.config.version>1.10</commons.config.version> <antlr.version>4.5</antlr.version> + <guava_version>${global_guava_version}</guava_version> </properties> <dependencies> - <dependency> <groupId>org.apache.metron</groupId> <artifactId>metron-common</artifactId> @@ -91,7 +91,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${global_guava_version}</version> + <version>${guava_version}</version> <scope>compile</scope> </dependency> <dependency> @@ -229,7 +229,7 @@ <relocations> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> </relocations> <transformers> diff --git a/metron-platform/metron-pcap-backend/pom.xml b/metron-platform/metron-pcap-backend/pom.xml index 641a887..b16fa91 100644 --- a/metron-platform/metron-pcap-backend/pom.xml +++ b/metron-platform/metron-pcap-backend/pom.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software - Foundation (ASF) under one or more contributor license agreements. See the - NOTICE file distributed with this work for additional information regarding - copyright ownership. The ASF licenses this file to You under the Apache License, - Version 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed - under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES - OR CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the License. +<!-- + Licensed to the Apache Software + Foundation (ASF) under one or more contributor license agreements. See the + NOTICE file distributed with this work for additional information regarding + copyright ownership. The ASF licenses this file to You under the Apache License, + Version 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed + under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES + OR CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -27,12 +27,13 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <commons.config.version>1.10</commons.config.version> + <guava_version>${global_hbase_guava_version}</guava_version> </properties> <dependencies> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${global_hbase_guava_version}</version> + <version>${guava_version}</version> <scope>compile</scope> </dependency> <dependency> @@ -260,7 +261,7 @@ <relocations> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> </relocations> <transformers> diff --git a/metron-platform/metron-solr/pom.xml b/metron-platform/metron-solr/pom.xml index 5523fd5..79077b7 100644 --- a/metron-platform/metron-solr/pom.xml +++ b/metron-platform/metron-solr/pom.xml @@ -26,12 +26,13 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <guava_version>${global_guava_version}</guava_version> </properties> <dependencies> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${global_guava_version}</version> + <version>${guava_version}</version> </dependency> <dependency> <groupId>org.apache.solr</groupId> @@ -300,7 +301,7 @@ <relocations> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava.metron-solr</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> <relocation> <pattern>com.fasterxml.jackson</pattern> diff --git a/metron-platform/metron-storm-kafka-override/pom.xml b/metron-platform/metron-storm-kafka-override/pom.xml index 7ef7bb7..29847fb 100644 --- a/metron-platform/metron-storm-kafka-override/pom.xml +++ b/metron-platform/metron-storm-kafka-override/pom.xml @@ -28,9 +28,15 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <commons.config.version>1.10</commons.config.version> + <guava_version>16.0.1</guava_version> </properties> <dependencies> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava_version}</version> + </dependency> + <dependency> <groupId>org.apache.storm</groupId> <artifactId>storm-kafka-client</artifactId> <version>${global_storm_kafka_version}</version> @@ -93,7 +99,6 @@ </exclusions> </dependency> </dependencies> - <build> <plugins> <plugin> @@ -123,7 +128,7 @@ <relocations> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.storm.kafka.override.guava.common</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> <relocation> <pattern>com.google.thirdparty</pattern> diff --git a/metron-platform/metron-writer/pom.xml b/metron-platform/metron-writer/pom.xml index a11ce6e..818e66d 100644 --- a/metron-platform/metron-writer/pom.xml +++ b/metron-platform/metron-writer/pom.xml @@ -29,9 +29,15 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <commons.config.version>1.10</commons.config.version> <antlr.version>4.5</antlr.version> + <guava_version>${global_hbase_guava_version}</guava_version> </properties> <dependencies> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava_version}</version> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> <version>${global_hadoop_version}</version> @@ -60,6 +66,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> </exclusions> <scope>provided</scope> </dependency> @@ -270,7 +280,7 @@ <relocations> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.guava</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> </relocations> <transformers> diff --git a/metron-stellar/stellar-common/pom.xml b/metron-stellar/stellar-common/pom.xml index c5cf58a..81a7455 100644 --- a/metron-stellar/stellar-common/pom.xml +++ b/metron-stellar/stellar-common/pom.xml @@ -27,6 +27,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <commons.config.version>1.10</commons.config.version> + <guava_version>${global_guava_version}</guava_version> </properties> <dependencies> <dependency> @@ -176,7 +177,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${global_guava_version}</version> + <version>${guava_version}</version> <optional>true</optional> <scope>compile</scope> </dependency> @@ -328,7 +329,7 @@ </relocation> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.metron.stellar.guava</shadedPattern> + <shadedPattern>org.apache.metron.guava.${guava_version}</shadedPattern> </relocation> <relocation> <pattern>org.apache.commons.beanutils</pattern>