You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/03 08:16:14 UTC

[02/32] git commit: Fix pom file for scala binary version

Fix pom file for scala binary version


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/88186617
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/88186617
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/88186617

Branch: refs/heads/master
Commit: 8818661721a2705a0f3d9aff6187f2eee12aa2eb
Parents: 96e25e5
Author: Raymond Liu <ra...@intel.com>
Authored: Tue Dec 17 10:14:26 2013 +0800
Committer: Raymond Liu <ra...@intel.com>
Committed: Fri Jan 3 12:12:37 2014 +0800

----------------------------------------------------------------------
 yarn/2.0/pom.xml       | 2 +-
 yarn/2.2/pom.xml       | 2 +-
 yarn/assembly/pom.xml  | 6 +++---
 yarn/common/pom.xml    | 2 +-
 yarn/pom.xml           | 2 +-
 yarn/scheduler/pom.xml | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/88186617/yarn/2.0/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/2.0/pom.xml b/yarn/2.0/pom.xml
index e53686f..7106a80 100644
--- a/yarn/2.0/pom.xml
+++ b/yarn/2.0/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.spark</groupId>
-    <artifactId>spark-yarn-aggregator_${scala.binary.version}</artifactId>
+    <artifactId>spark-yarn-aggregator_2.10</artifactId>
     <version>0.9.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/88186617/yarn/2.2/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/2.2/pom.xml b/yarn/2.2/pom.xml
index aa1146e..8acb749 100644
--- a/yarn/2.2/pom.xml
+++ b/yarn/2.2/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.spark</groupId>
-    <artifactId>spark-yarn-aggregator_${scala.binary.version}</artifactId>
+    <artifactId>spark-yarn-aggregator_2.10</artifactId>
     <version>0.9.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/88186617/yarn/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/assembly/pom.xml b/yarn/assembly/pom.xml
index 659b8c5..7bac1ed 100644
--- a/yarn/assembly/pom.xml
+++ b/yarn/assembly/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.spark</groupId>
-    <artifactId>spark-yarn-aggregator_${scala.binary.version}</artifactId>
+    <artifactId>spark-yarn-aggregator_2.10</artifactId>
     <version>0.9.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
@@ -70,7 +70,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.spark</groupId>
-          <artifactId>spark-yarn-2.0-api_2.10</artifactId>
+          <artifactId>spark-yarn-2.0-api_${scala.binary.version}</artifactId>
           <version>${project.version}</version>
         </dependency>
       </dependencies>
@@ -81,7 +81,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.spark</groupId>
-          <artifactId>spark-yarn-2.2-api_2.10</artifactId>
+          <artifactId>spark-yarn-2.2-api_${scala.binary.version}</artifactId>
           <version>${project.version}</version>
         </dependency>
       </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/88186617/yarn/common/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/common/pom.xml b/yarn/common/pom.xml
index d194ff4..2ffe972 100644
--- a/yarn/common/pom.xml
+++ b/yarn/common/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.spark</groupId>
-    <artifactId>spark-yarn-aggregator_${scala.binary.version}</artifactId>
+    <artifactId>spark-yarn-aggregator_2.10</artifactId>
     <version>0.9.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/88186617/yarn/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/pom.xml b/yarn/pom.xml
index d3c417f..689fe86 100644
--- a/yarn/pom.xml
+++ b/yarn/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <groupId>org.apache.spark</groupId>
-  <artifactId>spark-yarn-aggregator_${scala.binary.version}</artifactId>
+  <artifactId>spark-yarn-aggregator_2.10</artifactId>
   <packaging>pom</packaging>
   <name>Spark Project YARN Aggregator</name>
   <url>http://spark.incubator.apache.org/</url>

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/88186617/yarn/scheduler/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/scheduler/pom.xml b/yarn/scheduler/pom.xml
index 8723b7b..cbc5b30 100644
--- a/yarn/scheduler/pom.xml
+++ b/yarn/scheduler/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.spark</groupId>
-    <artifactId>spark-yarn-aggregator_${scala.binary.version}</artifactId>
+    <artifactId>spark-yarn-aggregator_2.10</artifactId>
     <version>0.9.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>