carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chenliang...@apache.org
Subject [1/2] incubator-carbondata git commit: Added new profile to build all modules
Date Tue, 10 Jan 2017 13:39:12 GMT
Repository: incubator-carbondata
Updated Branches:
  refs/heads/master 0a9a6ca06 -> 1ce882483


Added new profile to build all modules


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

Branch: refs/heads/master
Commit: ffc07ac1947fec24bcbe9fc899427acd943bdce0
Parents: 0a9a6ca
Author: ravipesala <ravi.pesala@gmail.com>
Authored: Tue Jan 10 17:58:44 2017 +0530
Committer: chenliang613 <chenliang613@apache.org>
Committed: Tue Jan 10 21:37:58 2017 +0800

----------------------------------------------------------------------
 assembly/pom.xml           |  8 ++++----
 examples/spark2/pom.xml    |  3 +++
 integration/spark2/pom.xml |  3 +++
 pom.xml                    | 34 ++++++++++++++++++++++++++++------
 4 files changed, 38 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ffc07ac1/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7390a7c..ce57ca1 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -127,10 +127,6 @@
   <profiles>
     <profile>
       <id>spark-1.5</id>
-      <!-- default -->
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.carbondata</groupId>
@@ -141,6 +137,10 @@
     </profile>
     <profile>
       <id>spark-1.6</id>
+      <!-- default -->
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.carbondata</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ffc07ac1/examples/spark2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/spark2/pom.xml b/examples/spark2/pom.xml
index a462dfa..e392e6f 100644
--- a/examples/spark2/pom.xml
+++ b/examples/spark2/pom.xml
@@ -30,6 +30,9 @@
   <name>Apache CarbonData :: Spark2 Examples</name>
 
   <properties>
+    <spark.version>2.1.0</spark.version>
+    <scala.binary.version>2.11</scala.binary.version>
+    <scala.version>2.11.8</scala.version>
     <dev.path>${basedir}/../../dev</dev.path>
   </properties>
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ffc07ac1/integration/spark2/pom.xml
----------------------------------------------------------------------
diff --git a/integration/spark2/pom.xml b/integration/spark2/pom.xml
index edcc0e3..2c125c5 100644
--- a/integration/spark2/pom.xml
+++ b/integration/spark2/pom.xml
@@ -30,6 +30,9 @@
   <name>Apache CarbonData :: Spark2</name>
 
   <properties>
+    <spark.version>2.1.0</spark.version>
+    <scala.binary.version>2.11</scala.binary.version>
+    <scala.version>2.11.8</scala.version>
     <dev.path>${basedir}/../../dev</dev.path>
   </properties>
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ffc07ac1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ed8ce4..22e3695 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,9 +107,6 @@
     <hadoop.version>2.2.0</hadoop.version>
     <kettle.version>4.4.0-stable</kettle.version>
     <use.kettle>true</use.kettle>
-    <spark.version>1.5.2</spark.version>
-    <scala.binary.version>2.10</scala.binary.version>
-    <scala.version>2.10.4</scala.version>
     <hadoop.deps.scope>compile</hadoop.deps.scope>
     <spark.deps.scope>compile</spark.deps.scope>
     <scala.deps.scope>compile</scala.deps.scope>
@@ -293,12 +290,32 @@
 
   <profiles>
     <profile>
+      <!--This profile does not build spark module, so user should explicitly give spark
profile also like spark-1.6 -->
       <id>build-with-format</id>
       <modules>
         <module>format</module>
       </modules>
     </profile>
     <profile>
+      <!-- This profile only should be used for release prepare to cover all the modules
-->
+      <id>build-all</id>
+      <properties>
+        <spark.version>1.6.2</spark.version>
+        <scala.binary.version>2.10</scala.binary.version>
+        <scala.version>2.10.4</scala.version>
+        <maven.test.skip>true</maven.test.skip>
+        <flink.version>1.1.4</flink.version>
+      </properties>
+      <modules>
+        <module>format</module>
+        <module>integration/spark</module>
+        <module>examples/spark</module>
+        <module>integration/spark2</module>
+        <module>examples/spark2</module>
+        <module>examples/flink</module>
+      </modules>
+    </profile>
+    <profile>
       <id>hadoop-2.2.0</id>
       <!-- default -->
       <properties>
@@ -313,9 +330,11 @@
     </profile>
     <profile>
       <id>spark-1.5</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
+      <properties>
+        <spark.version>1.5.2</spark.version>
+        <scala.binary.version>2.10</scala.binary.version>
+        <scala.version>2.10.4</scala.version>
+      </properties>
       <modules>
         <module>integration/spark</module>
         <module>examples/spark</module>
@@ -323,6 +342,9 @@
     </profile>
     <profile>
       <id>spark-1.6</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <properties>
         <spark.version>1.6.2</spark.version>
         <scala.binary.version>2.10</scala.binary.version>


Mime
View raw message