Kaynağa Gözat

[livy] Use the hadoop versions specified in the hue-parent maven pom.xml

Erick Tryzelaar 10 yıl önce
ebeveyn
işleme
9f1b32c
2 değiştirilmiş dosya ile 9 ekleme ve 10 silme
  1. 3 6
      apps/spark/java/pom.xml
  2. 6 4
      maven/pom.xml

+ 3 - 6
apps/spark/java/pom.xml

@@ -48,15 +48,12 @@
     </organization>
 
     <properties>
-        <javaVersion>1.7</javaVersion>
-        <hadoop.version>2.5.0</hadoop.version>
         <guava.version>11.0.2</guava.version>
         <jetty.version>8.1.14.v20131031</jetty.version>
         <json4s.version>3.2.11</json4s.version>
         <logback.version>1.1.2</logback.version>
         <scala.version>2.10.3</scala.version>
         <scalatra.version>2.2.1</scalatra.version>
-        <spark.version>1.1.0</spark.version>
         <dispatch.version>0.11.2</dispatch.version>
     </properties>
 
@@ -184,7 +181,7 @@
                             <version>[3.0.0,)</version>
                         </requireMavenVersion>
                         <requireJavaVersion>
-                            <version>[${javaVersion}.0,${javaVersion}.1000}]</version>
+                            <version>[${minJavaVersion}.0,${maxJavaVersion}.1000}]</version>
                         </requireJavaVersion>
                         <requireOS>
                             <family>unix</family>
@@ -219,8 +216,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>${javaVersion}</source>
-                    <target>${javaVersion}</target>
+                    <source>${sourceJavaVersion}</source>
+                    <target>${targetJavaVersion}</target>
                 </configuration>
             </plugin>
 

+ 6 - 4
maven/pom.xml

@@ -37,7 +37,9 @@
   </licenses>
 
   <properties>
-    <hadoop.version>2.5.0-mr1-cdh5.3.0-SNAPSHOT</hadoop.version>
+    <hadoop-mr1.version>2.5.0-mr1-cdh5.3.0-SNAPSHOT</hadoop-mr1.version>
+    <hadoop.version>2.5.0-cdh5.3.0-SNAPSHOT</hadoop.version>
+    <spark.version>1.1.0</spark.version>
     <slf4j.version>1.6.1</slf4j.version>
     <commons-logging.version>1.0.4</commons-logging.version>
     <thrift.version>0.9.0</thrift.version>
@@ -123,12 +125,12 @@
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-core</artifactId>
-        <version>${hadoop.version}</version>
+        <version>${hadoop-mr1.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-client</artifactId>
-        <version>${hadoop.version}</version>
+        <version>${hadoop-mr1.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -148,7 +150,7 @@
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-test</artifactId>
-        <version>${hadoop.version}</version>
+        <version>${hadoop-mr1.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-logging</groupId>