You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/09/04 01:40:40 UTC
ambari git commit: AMBARI-13004. Fix Storm sink compile time deps
with latest version updates. (swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 46f09e860 -> 8e41fda85
AMBARI-13004. Fix Storm sink compile time deps with latest version updates. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8e41fda8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8e41fda8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8e41fda8
Branch: refs/heads/branch-2.1
Commit: 8e41fda8557a5b6e0db37eb4edaee217e217500f
Parents: 46f09e8
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Thu Sep 3 16:40:10 2015 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Thu Sep 3 16:40:18 2015 -0700
----------------------------------------------------------------------
.../timeline/AbstractTimelineMetricsSink.java | 2 +-
.../ambari-metrics-storm-sink/pom.xml | 28 +++++++++++++++-----
.../storm/StormTimelineMetricsReporter.java | 4 +--
.../sink/storm/StormTimelineMetricsSink.java | 4 +--
4 files changed, 27 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e41fda8/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
index f18f52a..5aba016 100644
--- a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
+++ b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
@@ -20,13 +20,13 @@ package org.apache.hadoop.metrics2.sink.timeline;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
-import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.map.AnnotationIntrospector;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.xc.JaxbAnnotationIntrospector;
+
import java.io.IOException;
import java.net.ConnectException;
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e41fda8/ambari-metrics/ambari-metrics-storm-sink/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-storm-sink/pom.xml b/ambari-metrics/ambari-metrics-storm-sink/pom.xml
index 553b5f6..90115ee 100644
--- a/ambari-metrics/ambari-metrics-storm-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-storm-sink/pom.xml
@@ -31,7 +31,8 @@ limitations under the License.
<packaging>jar</packaging>
<properties>
- <storm.version>0.9.3.2.2.1.0-2340</storm.version>
+ <!--<storm.version>0.9.3.2.2.1.0-2340</storm.version>-->
+ <storm.version>0.10.0.2.3.2.0-2766</storm.version>
</properties>
<build>
@@ -103,7 +104,8 @@ limitations under the License.
<include>org.apache.hadoop:hadoop-annotations</include>
<include>commons-httpclient:commons-httpclient</include>
<include>commons-logging:commons-logging</include>
- <include>commons-lang:commons-lang</include>
+ <include>org.apache.commons:commons-lang3</include>
+ <include>commons-codec:commons-codec</include>
</includes>
</artifactSet>
<relocations>
@@ -116,10 +118,6 @@ limitations under the License.
<shadedPattern>org.apache.hadoop.metrics2.sink.relocated.commons.httpclient</shadedPattern>
</relocation>
<relocation>
- <pattern>org.apache.commons.lang</pattern>
- <shadedPattern>org.apache.hadoop.metrics2.sink.relocated.commons.lang</shadedPattern>
- </relocation>
- <relocation>
<pattern>org.apache.hadoop.classification</pattern>
<shadedPattern>org.apache.hadoop.metrics2.sink.relocated.hadoop.classification</shadedPattern>
</relocation>
@@ -127,6 +125,14 @@ limitations under the License.
<pattern>org.codehaus.jackson</pattern>
<shadedPattern>org.apache.hadoop.metrics2.sink.relocated.jackson</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.apache.commons.lang3</pattern>
+ <shadedPattern>org.apache.hadoop.metrics2.sink.relocated.commons.lang3</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons.codec</pattern>
+ <shadedPattern>org.apache.hadoop.metrics2.sink.relocated.commons.codec</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</plugin>
@@ -134,6 +140,16 @@ limitations under the License.
</build>
<dependencies>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.8</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.storm</groupId>
<artifactId>storm-core</artifactId>
<version>${storm.version}</version>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e41fda8/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
index 04b4b90..5e27cf8 100644
--- a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
+++ b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
@@ -24,8 +24,8 @@ import backtype.storm.generated.TopologySummary;
import backtype.storm.metric.IClusterReporter;
import backtype.storm.utils.NimbusClient;
import backtype.storm.utils.Utils;
-import org.apache.commons.lang.ClassUtils;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.Validate;
import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e41fda8/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java
index b7827bb..36339c5 100644
--- a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java
+++ b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java
@@ -22,8 +22,8 @@ import backtype.storm.metric.api.IMetricsConsumer;
import backtype.storm.task.IErrorReporter;
import backtype.storm.task.TopologyContext;
-import org.apache.commons.lang.ClassUtils;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.math.NumberUtils;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink;