[Hoxfix] Upgrade dev version to 1.5.0-SNAPSHOT and fix some small issues 1.Upgrade dev version to 1.5.0-SNAPSHOT 2.Fix carbon-spark-sql issue 3.Remove hadoop 2.2 profile
This closes #2359 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/4bb7e278 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/4bb7e278 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/4bb7e278 Branch: refs/heads/carbonstore Commit: 4bb7e2785f961b2697b7de2a3a2556c25a5bb6b3 Parents: 56bf4e4 Author: chenliang613 <chenliang...@huawei.com> Authored: Sat Jun 2 12:58:57 2018 +0800 Committer: ravipesala <ravi.pes...@gmail.com> Committed: Sat Jun 2 12:39:10 2018 +0530 ---------------------------------------------------------------------- assembly/pom.xml | 2 +- bin/carbon-spark-sql | 4 ++-- common/pom.xml | 2 +- core/pom.xml | 2 +- datamap/bloom/pom.xml | 2 +- datamap/examples/pom.xml | 2 +- datamap/lucene/pom.xml | 2 +- datamap/mv/core/pom.xml | 2 +- datamap/mv/plan/pom.xml | 2 +- examples/flink/pom.xml | 2 +- examples/spark2/pom.xml | 2 +- format/pom.xml | 2 +- hadoop/pom.xml | 2 +- integration/hive/pom.xml | 2 +- integration/presto/pom.xml | 2 +- integration/spark-common-cluster-test/pom.xml | 2 +- integration/spark-common-test/pom.xml | 2 +- integration/spark-common/pom.xml | 2 +- integration/spark2/pom.xml | 2 +- pom.xml | 8 +------- processing/pom.xml | 2 +- store/sdk/pom.xml | 2 +- store/search/pom.xml | 2 +- streaming/pom.xml | 2 +- 24 files changed, 25 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 56522d0..eb3d3a9 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/bin/carbon-spark-sql ---------------------------------------------------------------------- diff --git a/bin/carbon-spark-sql b/bin/carbon-spark-sql index 4b927d1..9916fef 100755 --- a/bin/carbon-spark-sql +++ b/bin/carbon-spark-sql @@ -36,13 +36,13 @@ export CARBON_SOURCE="$(cd "`dirname "$0"`"/..; pwd)" ASSEMBLY_DIR="$CARBON_SOURCE/assembly/target/scala-2.11" GREP_OPTIONS= -num_jars="$(ls -1 "$ASSEMBLY_DIR" | grep "^carbondata.*hadoop.*\.jar$" | wc -l)" +num_jars="$(ls -1 "$ASSEMBLY_DIR" | grep "^apache-carbondata.*\.jar$" | wc -l)" if [ "$num_jars" -eq "0" -a -z "$ASSEMBLY_DIR" ]; then echo "Failed to find Carbondata assembly in $ASSEMBLY_DIR." 1>&2 echo "You need to build Carbondata before running this program." 1>&2 exit 1 fi -ASSEMBLY_JARS="$(ls -1 "$ASSEMBLY_DIR" | grep "^carbondata.*hadoop.*\.jar$" || true)" +ASSEMBLY_JARS="$(ls -1 "$ASSEMBLY_DIR" | grep "^apache-carbondata.*\.jar$" || true)" if [ "$num_jars" -gt "1" ]; then echo "Found multiple Carbondata assembly jars in $ASSEMBLY_DIR:" 1>&2 echo "$ASSEMBLY_JARS" 1>&2 http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index 433d575..1209388 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index d9c756e..7d87037 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/datamap/bloom/pom.xml ---------------------------------------------------------------------- diff --git a/datamap/bloom/pom.xml b/datamap/bloom/pom.xml index b7db969..f13d477 100644 --- a/datamap/bloom/pom.xml +++ b/datamap/bloom/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/datamap/examples/pom.xml ---------------------------------------------------------------------- diff --git a/datamap/examples/pom.xml b/datamap/examples/pom.xml index 309828d..be65529 100644 --- a/datamap/examples/pom.xml +++ b/datamap/examples/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/datamap/lucene/pom.xml ---------------------------------------------------------------------- diff --git a/datamap/lucene/pom.xml b/datamap/lucene/pom.xml index bdb8876..c5c7555 100644 --- a/datamap/lucene/pom.xml +++ b/datamap/lucene/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/datamap/mv/core/pom.xml ---------------------------------------------------------------------- diff --git a/datamap/mv/core/pom.xml b/datamap/mv/core/pom.xml index 99a8e22..54960a1 100644 --- a/datamap/mv/core/pom.xml +++ b/datamap/mv/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/datamap/mv/plan/pom.xml ---------------------------------------------------------------------- diff --git a/datamap/mv/plan/pom.xml b/datamap/mv/plan/pom.xml index 6a36fc5..fcf0e51 100644 --- a/datamap/mv/plan/pom.xml +++ b/datamap/mv/plan/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/examples/flink/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flink/pom.xml b/examples/flink/pom.xml index b783435..6af8f19 100644 --- a/examples/flink/pom.xml +++ b/examples/flink/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/examples/spark2/pom.xml ---------------------------------------------------------------------- diff --git a/examples/spark2/pom.xml b/examples/spark2/pom.xml index 196bc16..7a55333 100644 --- a/examples/spark2/pom.xml +++ b/examples/spark2/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/format/pom.xml ---------------------------------------------------------------------- diff --git a/format/pom.xml b/format/pom.xml index 41197cf..039b0a0 100644 --- a/format/pom.xml +++ b/format/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop/pom.xml b/hadoop/pom.xml index 07883cd..1d7fab3 100644 --- a/hadoop/pom.xml +++ b/hadoop/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/integration/hive/pom.xml ---------------------------------------------------------------------- diff --git a/integration/hive/pom.xml b/integration/hive/pom.xml index 68245db..c144353 100644 --- a/integration/hive/pom.xml +++ b/integration/hive/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/integration/presto/pom.xml ---------------------------------------------------------------------- diff --git a/integration/presto/pom.xml b/integration/presto/pom.xml index c2d941a..bfa05f9 100644 --- a/integration/presto/pom.xml +++ b/integration/presto/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/integration/spark-common-cluster-test/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark-common-cluster-test/pom.xml b/integration/spark-common-cluster-test/pom.xml index d8aecc2..87e08d9 100644 --- a/integration/spark-common-cluster-test/pom.xml +++ b/integration/spark-common-cluster-test/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/integration/spark-common-test/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/pom.xml b/integration/spark-common-test/pom.xml index ae78523..b8629bf 100644 --- a/integration/spark-common-test/pom.xml +++ b/integration/spark-common-test/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/integration/spark-common/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark-common/pom.xml b/integration/spark-common/pom.xml index f011a75..599c6c8 100644 --- a/integration/spark-common/pom.xml +++ b/integration/spark-common/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/integration/spark2/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark2/pom.xml b/integration/spark2/pom.xml index 73d48ef..2bce694 100644 --- a/integration/spark2/pom.xml +++ b/integration/spark2/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e9551c0..1413fd1 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ <inceptionYear>2016</inceptionYear> <packaging>pom</packaging> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <licenses> <license> @@ -464,12 +464,6 @@ </build> </profile> <profile> - <id>hadoop-2.2.0</id> - <properties> - <hadoop.version>2.2.0</hadoop.version> - </properties> - </profile> - <profile> <id>spark-2.1</id> <properties> <spark.version>2.1.0</spark.version> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/processing/pom.xml ---------------------------------------------------------------------- diff --git a/processing/pom.xml b/processing/pom.xml index b1a103a..ab7c96c 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/store/sdk/pom.xml ---------------------------------------------------------------------- diff --git a/store/sdk/pom.xml b/store/sdk/pom.xml index af0d079..fbeb562 100644 --- a/store/sdk/pom.xml +++ b/store/sdk/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/store/search/pom.xml ---------------------------------------------------------------------- diff --git a/store/search/pom.xml b/store/search/pom.xml index 9d833f2..6acbbfb 100644 --- a/store/search/pom.xml +++ b/store/search/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/carbondata/blob/4bb7e278/streaming/pom.xml ---------------------------------------------------------------------- diff --git a/streaming/pom.xml b/streaming/pom.xml index b8c447d..0883f70 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>carbondata-parent</artifactId> <groupId>org.apache.carbondata</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>