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/29 09:21:16 UTC
carbondata git commit: [CARBONDATA-1819]Remove profiles for Spark-2.1
and Spark-2.2 in module assembly and spark-common-test
Repository: carbondata
Updated Branches:
refs/heads/master 5af6d27ab -> aa9014a9b
[CARBONDATA-1819]Remove profiles for Spark-2.1 and Spark-2.2 in module assembly and spark-common-test
This closes #1578
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/aa9014a9
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/aa9014a9
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/aa9014a9
Branch: refs/heads/master
Commit: aa9014a9b87f0018c8b64e7494718a6918861fe3
Parents: 5af6d27
Author: Zhang Zhichao <44...@qq.com>
Authored: Tue Nov 28 15:28:29 2017 +0800
Committer: Ravindra Pesala <ra...@gmail.com>
Committed: Wed Nov 29 14:50:06 2017 +0530
----------------------------------------------------------------------
assembly/pom.xml | 29 +++++-----------------------
integration/spark-common-test/pom.xml | 31 ++++++------------------------
2 files changed, 11 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/aa9014a9/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 49a1a52..76ad8a5 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -56,6 +56,11 @@
<artifactId>carbondata-processing</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.carbondata</groupId>
+ <artifactId>carbondata-spark2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -126,30 +131,6 @@
</build>
<profiles>
<profile>
- <id>spark-2.1</id>
- <!-- default -->
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.carbondata</groupId>
- <artifactId>carbondata-spark2</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>spark-2.2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.carbondata</groupId>
- <artifactId>carbondata-spark2</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>include-all</id>
<properties>
<hadoop.deps.scope>compile</hadoop.deps.scope>
http://git-wip-us.apache.org/repos/asf/carbondata/blob/aa9014a9/integration/spark-common-test/pom.xml
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/pom.xml b/integration/spark-common-test/pom.xml
index bc810de..2580b95 100644
--- a/integration/spark-common-test/pom.xml
+++ b/integration/spark-common-test/pom.xml
@@ -93,6 +93,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.carbondata</groupId>
+ <artifactId>carbondata-spark2</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-hive-thriftserver_${scala.binary.version}</artifactId>
<scope>test</scope>
@@ -328,31 +334,6 @@
</build>
<profiles>
<profile>
- <id>spark-2.1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.carbondata</groupId>
- <artifactId>carbondata-spark2</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>spark-2.2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.carbondata</groupId>
- <artifactId>carbondata-spark2</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>sdvtest</id>
<properties>
<maven.test.skip>true</maven.test.skip>