You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/11/13 22:11:54 UTC
[28/49] carbondata git commit: [CARBONDATA-1689] Fix parent pom
issues and correct CI link of README
[CARBONDATA-1689] Fix parent pom issues and correct CI link of README
This closes #1478
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/2de24063
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/2de24063
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/2de24063
Branch: refs/heads/fgdatamap
Commit: 2de24063227329a2ba058adbf79ec78abae919e7
Parents: 9e9d689
Author: chenliang613 <ch...@huawei.com>
Authored: Thu Nov 9 20:34:35 2017 +0800
Committer: ravipesala <ra...@gmail.com>
Committed: Thu Nov 9 23:49:14 2017 +0530
----------------------------------------------------------------------
README.md | 36 +++++++++++++++++-------------------
pom.xml | 6 ++++--
2 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/2de24063/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 297cece..f2b4e15 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,19 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
<img src="/docs/images/CarbonData_logo.png" width="200" height="40">
@@ -28,7 +26,7 @@ You can find the latest CarbonData document and learn more at:
## Status
Spark2.1:
-[](https://builds.apache.org/view/CarbonData/job/carbondata-master-spark-2.1/)
+[](https://builds.apache.org/view/A-D/view/CarbonData/job/carbondata-master-spark-2.1/badge/icon)
## Features
CarbonData file format is a columnar store in HDFS, it has many features that a modern columnar format has, such as splittable, compression schema ,complex data type etc, and CarbonData has following unique features:
http://git-wip-us.apache.org/repos/asf/carbondata/blob/2de24063/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8b1212d..342cb2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<snappy.version>1.1.2.6</snappy.version>
<hadoop.version>2.7.2</hadoop.version>
+ <scala.binary.version>2.11</scala.binary.version>
+ <scala.version>2.11.8</scala.version>
<hadoop.deps.scope>compile</hadoop.deps.scope>
<spark.deps.scope>compile</spark.deps.scope>
<scala.deps.scope>compile</scala.deps.scope>
@@ -427,8 +429,6 @@
<id>build-all</id>
<properties>
<spark.version>2.1.0</spark.version>
- <scala.binary.version>2.11</scala.binary.version>
- <scala.version>2.11.8</scala.version>
<maven.test.skip>true</maven.test.skip>
</properties>
<modules>
@@ -503,6 +503,8 @@
<sourceDirectory>${basedir}/integration/hive/src/main/java</sourceDirectory>
<sourceDirectory>${basedir}/integration/presto/src/main/scala</sourceDirectory>
<sourceDirectory>${basedir}/integration/presto/src/main/java</sourceDirectory>
+ <sourceDirectory>${basedir}/streaming/src/main/java</sourceDirectory>
+ <sourceDirectory>${basedir}/streaming/src/main/java</sourceDirectory>
</sourceDirectories>
</configuration>
</plugin>