You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2018/01/08 10:51:41 UTC
carbondata git commit: [CARBONDATA-2006] project level update
Repository: carbondata
Updated Branches:
refs/heads/2.2.1 [created] 4d642db94
[CARBONDATA-2006] project level update
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/4d642db9
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/4d642db9
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/4d642db9
Branch: refs/heads/2.2.1
Commit: 4d642db94233a253822b8b9267cb0b7a7464f42c
Parents: ed2c01f
Author: chenliang613 <ch...@huawei.com>
Authored: Mon Jan 8 18:49:54 2018 +0800
Committer: chenliang613 <ch...@huawei.com>
Committed: Mon Jan 8 18:49:54 2018 +0800
----------------------------------------------------------------------
NOTICE | 2 +-
build/README.md | 23 +++-----------------
.../execution/command/carbonTableSchema.scala | 0
integration/spark2/pom.xml | 2 +-
pom.xml | 8 +++----
5 files changed, 9 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/4d642db9/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 3440816..fb63d08 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache CarbonData
-Copyright 2016-2017 The Apache Software Foundation
+Copyright 2016 and onwards The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/carbondata/blob/4d642db9/build/README.md
----------------------------------------------------------------------
diff --git a/build/README.md b/build/README.md
index ab53877..65e58d8 100644
--- a/build/README.md
+++ b/build/README.md
@@ -25,31 +25,14 @@
* [Apache Thrift 0.9.3](http://archive.apache.org/dist/thrift/0.9.3/)
## Build command
-From 1.3.0 onwards, CarbonData supports spark 2.x, build without test,by default carbondata takes Spark 2.1.0 to build the project
+Build with different supported versions of Spark, by default using Spark 2.2.1 to build
```
-mvn -DskipTests clean package
-```
-
-Build with test
-```
-mvn clean package
-```
-
-Before 1.3.0, build with different supported versions of Spark
-```
-mvn -DskipTests -Pspark-1.5 -Dspark.version=1.5.1 clean package
-mvn -DskipTests -Pspark-1.5 -Dspark.version=1.5.2 clean package
-
-mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.1 clean package
-mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.2 clean package
-mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.3 clean package
-
mvn -DskipTests -Pspark-2.1 -Dspark.version=2.1.0 clean package
+mvn -DskipTests -Pspark-2.2 -Dspark.version=2.2.1 clean package
```
-
## For contributors : To build the format code after any changes, please follow the below command.
Note:Need install Apache Thrift 0.9.3
```
-mvn clean -DskipTests -Pbuild-with-format -Pspark-2.1 package
+mvn clean -DskipTests -Pbuild-with-format -Pspark-2.2 package
```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata/blob/4d642db9/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/carbondata/blob/4d642db9/integration/spark2/pom.xml
----------------------------------------------------------------------
diff --git a/integration/spark2/pom.xml b/integration/spark2/pom.xml
index e470b23..472435e 100644
--- a/integration/spark2/pom.xml
+++ b/integration/spark2/pom.xml
@@ -154,7 +154,7 @@
<profile>
<id>build-all</id>
<properties>
- <spark.version>2.1.0</spark.version>
+ <spark.version>2.2.1</spark.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.8</scala.version>
</properties>
http://git-wip-us.apache.org/repos/asf/carbondata/blob/4d642db9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6253285..0cbfc7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -428,7 +428,7 @@
<!-- This profile only should be used for release prepare to cover all the modules -->
<id>build-all</id>
<properties>
- <spark.version>2.1.0</spark.version>
+ <spark.version>2.2.1</spark.version>
<maven.test.skip>true</maven.test.skip>
</properties>
<modules>
@@ -460,9 +460,6 @@
</profile>
<profile>
<id>spark-2.1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<properties>
<spark.version>2.1.0</spark.version>
<scala.binary.version>2.11</scala.binary.version>
@@ -513,6 +510,9 @@
</profile>
<profile>
<id>spark-2.2</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<properties>
<spark.version>2.2.1</spark.version>
<scala.binary.version>2.11</scala.binary.version>