浏览代码

AMBARI-14138. Upgrade Ambari Views to Hadoop 2.7.1 jar which has the fix for HDFS-7931

Srimanth Gunturi 10 年之前
父节点
当前提交
fec19f364f

+ 1 - 2
contrib/views/capacity-scheduler/pom.xml

@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
-            <version>${hadoop-version}</version>
+            <version>${hadoop.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>tomcat</groupId>
@@ -92,7 +92,6 @@
     </dependencies>
 
     <properties>
-      <hadoop-version>2.6.0</hadoop-version>
       <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
       <ui.directory>${basedir}/src/main/resources/ui</ui.directory>
     </properties>

+ 3 - 4
contrib/views/files/pom.xml

@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdfs</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
         <exclusions>
             <exclusion>
                 <groupId>tomcat</groupId>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
         <exclusions>
             <exclusion>
                 <groupId>tomcat</groupId>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-minicluster</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -110,7 +110,6 @@
 
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
-    <hadoop-version>2.6.0</hadoop-version>
     <nodejs.directory>${basedir}/target/nodejs</nodejs.directory>
     <npm.version>1.4.3</npm.version>
     <ui.directory>${basedir}/src/main/resources/ui</ui.directory>

+ 6 - 7
contrib/views/hive/pom.xml

@@ -101,7 +101,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdfs</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
         <exclusions>
             <exclusion>
                 <groupId>tomcat</groupId>
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
         <exclusions>
             <exclusion>
                 <groupId>tomcat</groupId>
@@ -123,17 +123,17 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-common</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-core</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-yarn-client</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.ws.rs</groupId>
@@ -193,7 +193,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-minicluster</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -224,7 +224,6 @@
   </dependencies>
 
   <properties>
-    <hadoop-version>2.7.0</hadoop-version>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
     <hive-version>1.0.0</hive-version>
     <ambari.version>1.3.0.0-SNAPSHOT</ambari.version>

+ 3 - 4
contrib/views/pig/pom.xml

@@ -85,7 +85,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdfs</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
         <exclusions>
             <exclusion>
                 <groupId>tomcat</groupId>
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
         <exclusions>
             <exclusion>
                 <groupId>tomcat</groupId>
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-minicluster</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -139,7 +139,6 @@
 
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
-    <hadoop-version>2.2.0</hadoop-version>
     <ambari.version>2.0.0.0-SNAPSHOT</ambari.version>
     <ui.directory>${basedir}/src/main/resources/ui/pig-web</ui.directory>
   </properties>

+ 1 - 0
contrib/views/pom.xml

@@ -31,6 +31,7 @@
   <properties>
     <ambari.version>2.0.0.0-SNAPSHOT</ambari.version>
     <ambari.dir>${project.parent.parent.basedir}</ambari.dir>
+    <hadoop.version>2.7.1</hadoop.version>
   </properties>
   <modules>
     <module>files</module>

+ 5 - 6
contrib/views/utils/pom.xml

@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdfs</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
         <exclusions>
             <exclusion>
                 <groupId>tomcat</groupId>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
         <exclusions>
             <exclusion>
                 <groupId>tomcat</groupId>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-yarn-common</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-minicluster</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -136,13 +136,12 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-azure</artifactId>
-      <version>${hadoop-version}</version>
+      <version>${hadoop.version}</version>
     </dependency>
   </dependencies>
 
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
-    <hadoop-version>2.7.0</hadoop-version>
   </properties>
   <build>
   </build>