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: Make the default profile work with build-with-format profile
Date Mon, 09 Jan 2017 11:55:27 GMT
Repository: incubator-carbondata
Updated Branches:
  refs/heads/master 4703a9a86 -> b046ccb22


Make the default profile work with build-with-format profile

Make the default profile work with build-with-format profile

Fixed comment


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

Branch: refs/heads/master
Commit: b5c7350bac6a3acf6c45797b9191b6d248be2a2b
Parents: 4703a9a
Author: ravipesala <ravi.pesala@gmail.com>
Authored: Mon Jan 9 13:53:49 2017 +0530
Committer: chenliang613 <chenliang613@apache.org>
Committed: Mon Jan 9 19:53:07 2017 +0800

----------------------------------------------------------------------
 assembly/pom.xml | 14 +++-----------
 pom.xml          | 11 +++--------
 2 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/b5c7350b/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c170e08..7390a7c 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -34,6 +34,9 @@
     <carbondata.jar.dir>scala-${scala.binary.version}</carbondata.jar.dir>
     <carbondata.jar.basename>carbondata_${scala.binary.version}-${project.version}-shade-hadoop${hadoop.version}.jar</carbondata.jar.basename>
     <carbondata.jar>${project.build.directory}/${carbondata.jar.dir}/${carbondata.jar.basename}</carbondata.jar>
+    <hadoop.deps.scope>provided</hadoop.deps.scope>
+    <spark.deps.scope>provided</spark.deps.scope>
+    <scala.deps.scope>provided</scala.deps.scope>
     <dev.path>${basedir}/../dev</dev.path>
   </properties>
 
@@ -157,17 +160,6 @@
       </dependencies>
     </profile>
     <profile>
-      <id>provided</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <hadoop.deps.scope>provided</hadoop.deps.scope>
-        <spark.deps.scope>provided</spark.deps.scope>
-        <scala.deps.scope>provided</scala.deps.scope>
-      </properties>
-    </profile>
-    <profile>
       <id>include-all</id>
       <properties>
         <hadoop.deps.scope>compile</hadoop.deps.scope>

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/b5c7350b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f68b24b..9ed8ce4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,9 @@
     <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>
@@ -313,11 +316,6 @@
       <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>
@@ -386,9 +384,6 @@
       </build>
     </profile>
     <profile>
-      <id>provided</id>
-    </profile>
-    <profile>
       <id>include-all</id>
     </profile>
     <profile>


Mime
View raw message