Repository: carbondata Updated Branches: refs/heads/master 311a5b7e3 -> 0bf597d9e
http://git-wip-us.apache.org/repos/asf/carbondata/blob/0bf597d9/integration/spark2/pom.xml ---------------------------------------------------------------------- diff --git a/integration/spark2/pom.xml b/integration/spark2/pom.xml index a09bd62..ed01728 100644 --- a/integration/spark2/pom.xml +++ b/integration/spark2/pom.xml @@ -38,16 +38,6 @@ <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-spark-common</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.spark</groupId> - <artifactId>spark-hive-thriftserver_2.10</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.spark</groupId> - <artifactId>spark-sql_2.10</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.spark</groupId> http://git-wip-us.apache.org/repos/asf/carbondata/blob/0bf597d9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e7dd0e5..39dc565 100644 --- a/pom.xml +++ b/pom.xml @@ -416,7 +416,7 @@ <profiles> <profile> - <!--This profile does not build spark module, so user should explicitly give spark profile also like spark-1.6 --> + <!--This profile does not build spark module, so user should explicitly give spark profile also like spark-2.1 --> <id>build-with-format</id> <modules> <module>format</module> @@ -426,15 +426,13 @@ <!-- This profile only should be used for release prepare to cover all the modules --> <id>build-all</id> <properties> - <spark.version>1.6.2</spark.version> - <scala.binary.version>2.10</scala.binary.version> - <scala.version>2.10.4</scala.version> + <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> <module>format</module> - <module>integration/spark</module> - <module>examples/spark</module> <module>integration/spark2</module> <module>examples/spark2</module> <module>integration/hive</module> @@ -467,65 +465,6 @@ </properties> </profile> <profile> - <id>spark-1.5</id> - <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> - <module>examples/flink</module> - </modules> - </profile> - <profile> - <id>spark-1.6</id> - <properties> - <spark.version>1.6.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> - <module>examples/flink</module> - </modules> - <build> - <plugins> - <plugin> - <groupId>org.eluder.coveralls</groupId> - <artifactId>coveralls-maven-plugin</artifactId> - <version>4.3.0</version> - <configuration> - <repoToken>Q8mcBW8dw34wjNiPAMx0SFQidspIwHw8g</repoToken> - <sourceEncoding>UTF-8</sourceEncoding> - <jacocoReports> - <jacocoReport>${basedir}/target/carbondata-coverage-report/carbondata-coverage-report.xml - </jacocoReport> - </jacocoReports> - <sourceDirectories> - <sourceDirectory>${basedir}/common/src/main/java</sourceDirectory> - <sourceDirectory>${basedir}/core/src/main/java</sourceDirectory> - <sourceDirectory>${basedir}/processing/src/main/java</sourceDirectory> - <sourceDirectory>${basedir}/hadoop/src/main/java</sourceDirectory> - <sourceDirectory>${basedir}/integration/spark-common/src/main/scala</sourceDirectory> - <sourceDirectory>${basedir}/integration/spark-common/src/main/java</sourceDirectory> - <sourceDirectory>${basedir}/integration/spark-common-test/src/main/scala</sourceDirectory> - <sourceDirectory>${basedir}/integration/spark-common-test/src/main/java</sourceDirectory> - <sourceDirectory>${basedir}/integration/hive/src/main/scala</sourceDirectory> - <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}/integration/spark/src/main/scala</sourceDirectory> - <sourceDirectory>${basedir}/integration/spark/src/main/java</sourceDirectory> - </sourceDirectories> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>spark-2.1</id> <activation> <activeByDefault>true</activeByDefault> http://git-wip-us.apache.org/repos/asf/carbondata/blob/0bf597d9/processing/pom.xml ---------------------------------------------------------------------- diff --git a/processing/pom.xml b/processing/pom.xml index 03c8b57..7b53803 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -38,12 +38,6 @@ <groupId>org.apache.carbondata</groupId> <artifactId>carbondata-core</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.spark</groupId> - <artifactId>spark-sql_2.10</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.spark</groupId>