Repository: crunch Updated Branches: refs/heads/master ada7e3a64 -> b877dbdfd
CRUNCH-366: Flex between Scala 2.9 and 2.10 using profiles. Contributed by Sean Griffin. Signed-off-by: Josh Wills <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/b877dbdf Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/b877dbdf Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/b877dbdf Branch: refs/heads/master Commit: b877dbdfdab7e365cbab8b5218f5051b5e780a37 Parents: ada7e3a Author: Sean Griffin <[email protected]> Authored: Tue Apr 1 13:22:36 2014 -0500 Committer: Josh Wills <[email protected]> Committed: Tue Apr 1 17:53:55 2014 -0700 ---------------------------------------------------------------------- crunch-scrunch/pom.xml | 46 +++++---------------------------------------- crunch-spark/pom.xml | 4 ++-- pom.xml | 28 +++++++++++++++++++++++---- 3 files changed, 31 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/crunch/blob/b877dbdf/crunch-scrunch/pom.xml ---------------------------------------------------------------------- diff --git a/crunch-scrunch/pom.xml b/crunch-scrunch/pom.xml index b206c3e..de712db 100644 --- a/crunch-scrunch/pom.xml +++ b/crunch-scrunch/pom.xml @@ -25,7 +25,7 @@ under the License. <version>0.10.0-SNAPSHOT</version> </parent> - <artifactId>crunch-scrunch</artifactId> + <artifactId>crunch-scrunch_${scala.base.version}</artifactId> <name>Apache Crunch for Scala</name> <dependencies> @@ -69,6 +69,10 @@ under the License. <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_${scala.base.version}</artifactId> + </dependency> </dependencies> <build> @@ -204,45 +208,5 @@ under the License. </plugins> </build> </profile> - <profile> - <id>scala-2.9.2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <scala.version>2.9.2</scala.version> - <scalatest.version>1.7.2</scalatest.version> - </properties> - <dependencies> - <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.version}</artifactId> - </dependency> - </dependencies> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.version}</artifactId> - <version>${scalatest.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - </profile> - <profile> - <id>scala-2.10</id> - <properties> - <scala.version>2.10.2</scala.version> - <scalatest.version>1.9.2</scalatest.version> - </properties> - <dependencies> - <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> - <version>${scalatest.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/crunch/blob/b877dbdf/crunch-spark/pom.xml ---------------------------------------------------------------------- diff --git a/crunch-spark/pom.xml b/crunch-spark/pom.xml index 4ab3d74..0712f2d 100644 --- a/crunch-spark/pom.xml +++ b/crunch-spark/pom.xml @@ -25,7 +25,7 @@ under the License. <version>0.10.0-SNAPSHOT</version> </parent> - <artifactId>crunch-spark</artifactId> + <artifactId>crunch-spark_${scala.base.version}</artifactId> <name>Apache Crunch for Spark</name> <dependencies> @@ -50,7 +50,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_${scala.version}</artifactId> + <artifactId>spark-core_${scala.base.version}</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/crunch/blob/b877dbdf/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 37a92f7..310026a 100644 --- a/pom.xml +++ b/pom.xml @@ -84,15 +84,18 @@ under the License. <junit.version>4.10</junit.version> <hamcrest.version>1.1</hamcrest.version> <mockito.version>1.9.0</mockito.version> - <scala.version>2.9.3</scala.version> - <scalatest.version>1.9.1</scalatest.version> - <spark.version>0.8.0-incubating</spark.version> <pkg>org.apache.crunch</pkg> <!-- Can be overridden by hadoop-2 profile, but these are the default values --> <hadoop.version>1.1.2</hadoop.version> <hbase.version>0.96.0-hadoop1</hbase.version> <hbase.midfix>hadoop1</hbase.midfix> + + <!-- Can be overridden by the scala-2.10 profile, but these are the default values --> + <scala.base.version>2.9.3</scala.base.version> + <scala.version>2.9.3</scala.version> + <scalatest.version>1.9.1</scalatest.version> + <spark.version>0.8.1-incubating</spark.version> </properties> <scm> @@ -412,7 +415,7 @@ under the License. <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_${scala.version}</artifactId> + <artifactId>spark-core_${scala.base.version}</artifactId> <version>${spark.version}</version> </dependency> @@ -433,6 +436,14 @@ under the License. <artifactId>jline</artifactId> <version>${scala.version}</version> </dependency> + + <dependency> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_${scala.base.version}</artifactId> + <version>${scalatest.version}</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement> @@ -487,6 +498,15 @@ under the License. </dependencies> </dependencyManagement> </profile> + <profile> + <id>scala-2.10</id> + <properties> + <scala.base.version>2.10</scala.base.version> + <scala.version>2.10.3</scala.version> + <scalatest.version>2.1.0</scalatest.version> + <spark.version>0.9.0-incubating</spark.version> + </properties> + </profile> </profiles> <build>
