Merge branch 'trunk' into branch-3.0-perf
diff --git a/ambari-metrics-hadoop-sink/pom.xml b/ambari-metrics-hadoop-sink/pom.xml
index a9d342f..83a2159 100644
--- a/ambari-metrics-hadoop-sink/pom.xml
+++ b/ambari-metrics-hadoop-sink/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<properties>
<sinkJarName>${project.artifactId}-with-common-${project.version}.jar</sinkJarName>
- <hadoop.version>3.0.0-beta1</hadoop.version>
+ <hadoopVersion>3.0.0-beta1</hadoopVersion>
</properties>
@@ -142,7 +142,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadoopVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
