diff options
| -rw-r--r-- | assembly/pom.xml | 14 | ||||
| -rw-r--r-- | bagel/pom.xml | 10 | ||||
| -rw-r--r-- | core/pom.xml | 18 | ||||
| -rw-r--r-- | examples/pom.xml | 20 | ||||
| -rw-r--r-- | mllib/pom.xml | 10 | ||||
| -rw-r--r-- | pom.xml | 17 | ||||
| -rw-r--r-- | repl-bin/pom.xml | 6 | ||||
| -rw-r--r-- | repl/pom.xml | 14 | ||||
| -rw-r--r-- | streaming/pom.xml | 14 | ||||
| -rw-r--r-- | tools/pom.xml | 10 | ||||
| -rw-r--r-- | yarn/pom.xml | 8 |
11 files changed, 71 insertions, 70 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index c2cda41c6d..fc2adc1fbb 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -41,27 +41,27 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-bagel_2.10</artifactId> + <artifactId>spark-bagel_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-mllib_2.10</artifactId> + <artifactId>spark-mllib_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-repl_2.10</artifactId> + <artifactId>spark-repl_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming_2.10</artifactId> + <artifactId>spark-streaming_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -79,7 +79,7 @@ <artifactId>maven-shade-plugin</artifactId> <configuration> <shadedArtifactAttached>false</shadedArtifactAttached> - <outputFile>${project.build.directory}/scala-2.10/${project.artifactId}-${project.version}-hadoop${hadoop.version}.jar</outputFile> + <outputFile>${project.build.directory}/scala-${scala.binary.version}/${project.artifactId}-${project.version}-hadoop${hadoop.version}.jar</outputFile> <artifactSet> <includes> <include>*:*</include> @@ -128,7 +128,7 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn_2.10</artifactId> + <artifactId>spark-yarn_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/bagel/pom.xml b/bagel/pom.xml index 0f550d70d6..cb8e79f225 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -34,7 +34,7 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -43,18 +43,18 @@ </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> + <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.scalacheck</groupId> - <artifactId>scalacheck_2.10</artifactId> + <artifactId>scalacheck_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> </dependencies> <build> - <outputDirectory>target/scala-2.10/classes</outputDirectory> - <testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> + <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> + <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> <plugin> <groupId>org.scalatest</groupId> diff --git a/core/pom.xml b/core/pom.xml index 3fe48fd2af..cdbaa52731 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -86,7 +86,7 @@ </dependency> <dependency> <groupId>com.twitter</groupId> - <artifactId>chill_2.10</artifactId> + <artifactId>chill_${scala.binary.version}</artifactId> <version>0.3.1</version> </dependency> <dependency> @@ -96,15 +96,15 @@ </dependency> <dependency> <groupId>${akka.group}</groupId> - <artifactId>akka-actor_2.10</artifactId> + <artifactId>akka-actor_${scala.binary.version}</artifactId> </dependency> <dependency> <groupId>${akka.group}</groupId> - <artifactId>akka-remote_2.10</artifactId> + <artifactId>akka-remote_${scala.binary.version}</artifactId> </dependency> <dependency> <groupId>${akka.group}</groupId> - <artifactId>akka-slf4j_2.10</artifactId> + <artifactId>akka-slf4j_${scala.binary.version}</artifactId> </dependency> <dependency> <groupId>org.scala-lang</groupId> @@ -112,7 +112,7 @@ </dependency> <dependency> <groupId>net.liftweb</groupId> - <artifactId>lift-json_2.10</artifactId> + <artifactId>lift-json_${scala.binary.version}</artifactId> </dependency> <dependency> <groupId>it.unimi.dsi</groupId> @@ -166,12 +166,12 @@ </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> + <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.scalacheck</groupId> - <artifactId>scalacheck_2.10</artifactId> + <artifactId>scalacheck_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> <dependency> @@ -191,8 +191,8 @@ </dependency> </dependencies> <build> - <outputDirectory>target/scala-2.10/classes</outputDirectory> - <testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> + <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> + <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/examples/pom.xml b/examples/pom.xml index e16b1c80aa..7a7032c319 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -49,25 +49,25 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming_2.10</artifactId> + <artifactId>spark-streaming_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-mllib_2.10</artifactId> + <artifactId>spark-mllib_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-bagel_2.10</artifactId> + <artifactId>spark-bagel_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -88,7 +88,7 @@ </dependency> <dependency> <groupId>com.sksamuel.kafka</groupId> - <artifactId>kafka_2.10</artifactId> + <artifactId>kafka_${scala.binary.version}</artifactId> <version>0.8.0-beta1</version> <exclusions> <exclusion> @@ -107,17 +107,17 @@ </dependency> <dependency> <groupId>com.twitter</groupId> - <artifactId>algebird-core_2.10</artifactId> + <artifactId>algebird-core_${scala.binary.version}</artifactId> <version>0.1.11</version> </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> + <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.scalacheck</groupId> - <artifactId>scalacheck_2.10</artifactId> + <artifactId>scalacheck_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> <dependency> @@ -166,8 +166,8 @@ </dependencies> <build> - <outputDirectory>target/scala-2.10/classes</outputDirectory> - <testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> + <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> + <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/mllib/pom.xml b/mllib/pom.xml index 228f8c029b..dda3900afe 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -34,7 +34,7 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -48,12 +48,12 @@ </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> + <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.scalacheck</groupId> - <artifactId>scalacheck_2.10</artifactId> + <artifactId>scalacheck_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> <dependency> @@ -63,8 +63,8 @@ </dependency> </dependencies> <build> - <outputDirectory>target/scala-2.10/classes</outputDirectory> - <testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> + <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> + <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> <plugin> <groupId>org.scalatest</groupId> @@ -102,6 +102,7 @@ <java.version>1.6</java.version> <scala.version>2.10.3</scala.version> + <scala.binary.version>2.10</scala.binary.version> <mesos.version>0.13.0</mesos.version> <akka.version>2.2.3</akka.version> <akka.group>com.typesafe.akka</akka.group> @@ -206,7 +207,7 @@ </dependency> <dependency> <groupId>com.twitter</groupId> - <artifactId>chill_2.10</artifactId> + <artifactId>chill_${scala.binary.version}</artifactId> <version>0.3.1</version> </dependency> <dependency> @@ -216,7 +217,7 @@ </dependency> <dependency> <groupId>${akka.group}</groupId> - <artifactId>akka-actor_2.10</artifactId> + <artifactId>akka-actor_${scala.binary.version}</artifactId> <version>${akka.version}</version> <exclusions> <exclusion> @@ -227,7 +228,7 @@ </dependency> <dependency> <groupId>${akka.group}</groupId> - <artifactId>akka-remote_2.10</artifactId> + <artifactId>akka-remote_${scala.binary.version}</artifactId> <version>${akka.version}</version> <exclusions> <exclusion> @@ -238,7 +239,7 @@ </dependency> <dependency> <groupId>${akka.group}</groupId> - <artifactId>akka-slf4j_2.10</artifactId> + <artifactId>akka-slf4j_${scala.binary.version}</artifactId> <version>${akka.version}</version> <exclusions> <exclusion> @@ -249,7 +250,7 @@ </dependency> <dependency> <groupId>${akka.group}</groupId> - <artifactId>akka-zeromq_2.10</artifactId> + <artifactId>akka-zeromq_${scala.binary.version}</artifactId> <version>${akka.version}</version> <exclusions> <exclusion> @@ -286,7 +287,7 @@ </dependency> <dependency> <groupId>net.liftweb</groupId> - <artifactId>lift-json_2.10</artifactId> + <artifactId>lift-json_${scala.binary.version}</artifactId> <version>2.5.1</version> <exclusions> <exclusion> @@ -342,7 +343,7 @@ </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> + <artifactId>scalatest_${scala.binary.version}</artifactId> <version>1.9.1</version> <scope>test</scope> </dependency> @@ -365,7 +366,7 @@ </dependency> <dependency> <groupId>org.scalacheck</groupId> - <artifactId>scalacheck_2.10</artifactId> + <artifactId>scalacheck_${scala.binary.version}</artifactId> <version>1.10.0</version> <scope>test</scope> </dependency> diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index c2a4efa36c..869dbdb9b0 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -40,18 +40,18 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-bagel_2.10</artifactId> + <artifactId>spark-bagel_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-repl_2.10</artifactId> + <artifactId>spark-repl_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> diff --git a/repl/pom.xml b/repl/pom.xml index bf06d730d4..b0e7877bbb 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -39,18 +39,18 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-bagel_2.10</artifactId> + <artifactId>spark-bagel_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-mllib_2.10</artifactId> + <artifactId>spark-mllib_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> @@ -78,18 +78,18 @@ </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> + <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.scalacheck</groupId> - <artifactId>scalacheck_2.10</artifactId> + <artifactId>scalacheck_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> </dependencies> <build> - <outputDirectory>target/scala-2.10/classes</outputDirectory> - <testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> + <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> + <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/streaming/pom.xml b/streaming/pom.xml index e27b437aae..e3b6fee9b2 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -48,7 +48,7 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -62,7 +62,7 @@ </dependency> <dependency> <groupId>com.sksamuel.kafka</groupId> - <artifactId>kafka_2.10</artifactId> + <artifactId>kafka_${scala.binary.version}</artifactId> <version>0.8.0-beta1</version> <exclusions> <exclusion> @@ -111,16 +111,16 @@ </dependency> <dependency> <groupId>${akka.group}</groupId> - <artifactId>akka-zeromq_2.10</artifactId> + <artifactId>akka-zeromq_${scala.binary.version}</artifactId> </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> + <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.scalacheck</groupId> - <artifactId>scalacheck_2.10</artifactId> + <artifactId>scalacheck_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> <dependency> @@ -144,8 +144,8 @@ </dependency> </dependencies> <build> - <outputDirectory>target/scala-2.10/classes</outputDirectory> - <testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> + <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> + <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> <plugin> <groupId>org.scalatest</groupId> diff --git a/tools/pom.xml b/tools/pom.xml index 2bad494fc5..28f5ef14b1 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -33,24 +33,24 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming_2.10</artifactId> + <artifactId>spark-streaming_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> + <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> </dependencies> <build> - <outputDirectory>target/scala-2.10/classes</outputDirectory> - <testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> + <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> + <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/yarn/pom.xml b/yarn/pom.xml index d18ac3736d..bc64a190fd 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -33,7 +33,7 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -63,7 +63,7 @@ </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> + <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> </dependency> <dependency> @@ -74,8 +74,8 @@ </dependencies> <build> - <outputDirectory>target/scala-2.10/classes</outputDirectory> - <testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> + <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> + <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> |