diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/catalyst/pom.xml | 13 | ||||
| -rw-r--r-- | sql/core/pom.xml | 6 | ||||
| -rw-r--r-- | sql/hive-thriftserver/pom.xml | 4 | ||||
| -rw-r--r-- | sql/hive/pom.xml | 4 |
4 files changed, 9 insertions, 18 deletions
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 76ca3f3bb1..c2ad9b99f3 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -21,13 +21,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.10</artifactId> + <artifactId>spark-parent_2.11</artifactId> <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-catalyst_2.10</artifactId> + <artifactId>spark-catalyst_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project Catalyst</name> <url>http://spark.apache.org/</url> @@ -127,13 +127,4 @@ </plugin> </plugins> </build> - <profiles> - <!-- Quasiquotes are merged into scala reflect from scala 2.11 onwards. --> - <profile> - <id>scala-2.10</id> - <activation> - <property><name>!scala-2.11</name></property> - </activation> - </profile> - </profiles> </project> diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 4bb55f6b7f..89e01fc015 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -21,13 +21,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.10</artifactId> + <artifactId>spark-parent_2.11</artifactId> <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-sql_2.10</artifactId> + <artifactId>spark-sql_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project SQL</name> <url>http://spark.apache.org/</url> @@ -44,7 +44,7 @@ </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-sketch_2.10</artifactId> + <artifactId>spark-sketch_2.11</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 435e565f63..c8d17bd468 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -21,13 +21,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.10</artifactId> + <artifactId>spark-parent_2.11</artifactId> <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-hive-thriftserver_2.10</artifactId> + <artifactId>spark-hive-thriftserver_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project Hive Thrift Server</name> <url>http://spark.apache.org/</url> diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index cd0c2aeb93..14cf9acf09 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -21,13 +21,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.10</artifactId> + <artifactId>spark-parent_2.11</artifactId> <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-hive_2.10</artifactId> + <artifactId>spark-hive_2.11</artifactId> <packaging>jar</packaging> <name>Spark Project Hive</name> <url>http://spark.apache.org/</url> |