Skip to content
Snippets Groups Projects
Commit 09ed7ddf authored by Mark Hamstra's avatar Mark Hamstra
Browse files

Use scala.binary.version in POMs

parent 7db91659
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
assembly/pom.xml
+ 7
− 7
View file @ 09ed7ddf
...@@ -41,27 +41,27 @@ ...@@ -41,27 +41,27 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId> <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-bagel_2.10</artifactId> <artifactId>spark-bagel_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-mllib_2.10</artifactId> <artifactId>spark-mllib_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-repl_2.10</artifactId> <artifactId>spark-repl_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-streaming_2.10</artifactId> <artifactId>spark-streaming_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<configuration> <configuration>
<shadedArtifactAttached>false</shadedArtifactAttached> <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> <artifactSet>
<includes> <includes>
<include>*:*</include> <include>*:*</include>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-yarn_2.10</artifactId> <artifactId>spark-yarn_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
bagel/pom.xml
+ 5
− 5
View file @ 09ed7ddf
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId> <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -43,18 +43,18 @@ ...@@ -43,18 +43,18 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId> <artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalacheck</groupId> <groupId>org.scalacheck</groupId>
<artifactId>scalacheck_2.10</artifactId> <artifactId>scalacheck_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<outputDirectory>target/scala-2.10/classes</outputDirectory> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
......
core/pom.xml
+ 9
− 9
View file @ 09ed7ddf
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twitter</groupId> <groupId>com.twitter</groupId>
<artifactId>chill_2.10</artifactId> <artifactId>chill_${scala.binary.version}</artifactId>
<version>0.3.1</version> <version>0.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -96,15 +96,15 @@ ...@@ -96,15 +96,15 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>${akka.group}</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-actor_2.10</artifactId> <artifactId>akka-actor_${scala.binary.version}</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${akka.group}</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-remote_2.10</artifactId> <artifactId>akka-remote_${scala.binary.version}</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${akka.group}</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-slf4j_2.10</artifactId> <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scala-lang</groupId> <groupId>org.scala-lang</groupId>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.liftweb</groupId> <groupId>net.liftweb</groupId>
<artifactId>lift-json_2.10</artifactId> <artifactId>lift-json_${scala.binary.version}</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>it.unimi.dsi</groupId> <groupId>it.unimi.dsi</groupId>
...@@ -166,12 +166,12 @@ ...@@ -166,12 +166,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId> <artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalacheck</groupId> <groupId>org.scalacheck</groupId>
<artifactId>scalacheck_2.10</artifactId> <artifactId>scalacheck_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -191,8 +191,8 @@ ...@@ -191,8 +191,8 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<outputDirectory>target/scala-2.10/classes</outputDirectory> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
......
examples/pom.xml
+ 10
− 10
View file @ 09ed7ddf
...@@ -49,25 +49,25 @@ ...@@ -49,25 +49,25 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId> <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-streaming_2.10</artifactId> <artifactId>spark-streaming_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-mllib_2.10</artifactId> <artifactId>spark-mllib_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-bagel_2.10</artifactId> <artifactId>spark-bagel_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sksamuel.kafka</groupId> <groupId>com.sksamuel.kafka</groupId>
<artifactId>kafka_2.10</artifactId> <artifactId>kafka_${scala.binary.version}</artifactId>
<version>0.8.0-beta1</version> <version>0.8.0-beta1</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
...@@ -107,17 +107,17 @@ ...@@ -107,17 +107,17 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twitter</groupId> <groupId>com.twitter</groupId>
<artifactId>algebird-core_2.10</artifactId> <artifactId>algebird-core_${scala.binary.version}</artifactId>
<version>0.1.11</version> <version>0.1.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId> <artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalacheck</groupId> <groupId>org.scalacheck</groupId>
<artifactId>scalacheck_2.10</artifactId> <artifactId>scalacheck_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -166,8 +166,8 @@ ...@@ -166,8 +166,8 @@
</dependencies> </dependencies>
<build> <build>
<outputDirectory>target/scala-2.10/classes</outputDirectory> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
......
mllib/pom.xml
+ 5
− 5
View file @ 09ed7ddf
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId> <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId> <artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalacheck</groupId> <groupId>org.scalacheck</groupId>
<artifactId>scalacheck_2.10</artifactId> <artifactId>scalacheck_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<outputDirectory>target/scala-2.10/classes</outputDirectory> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
......
pom.xml
+ 9
− 8
View file @ 09ed7ddf
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
<java.version>1.6</java.version> <java.version>1.6</java.version>
<scala.version>2.10.3</scala.version> <scala.version>2.10.3</scala.version>
<scala.binary.version>2.10</scala.binary.version>
<mesos.version>0.13.0</mesos.version> <mesos.version>0.13.0</mesos.version>
<akka.version>2.2.3</akka.version> <akka.version>2.2.3</akka.version>
<akka.group>com.typesafe.akka</akka.group> <akka.group>com.typesafe.akka</akka.group>
...@@ -206,7 +207,7 @@ ...@@ -206,7 +207,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twitter</groupId> <groupId>com.twitter</groupId>
<artifactId>chill_2.10</artifactId> <artifactId>chill_${scala.binary.version}</artifactId>
<version>0.3.1</version> <version>0.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -216,7 +217,7 @@ ...@@ -216,7 +217,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>${akka.group}</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-actor_2.10</artifactId> <artifactId>akka-actor_${scala.binary.version}</artifactId>
<version>${akka.version}</version> <version>${akka.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
...@@ -227,7 +228,7 @@ ...@@ -227,7 +228,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>${akka.group}</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-remote_2.10</artifactId> <artifactId>akka-remote_${scala.binary.version}</artifactId>
<version>${akka.version}</version> <version>${akka.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
...@@ -238,7 +239,7 @@ ...@@ -238,7 +239,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>${akka.group}</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-slf4j_2.10</artifactId> <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
<version>${akka.version}</version> <version>${akka.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
...@@ -249,7 +250,7 @@ ...@@ -249,7 +250,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>${akka.group}</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-zeromq_2.10</artifactId> <artifactId>akka-zeromq_${scala.binary.version}</artifactId>
<version>${akka.version}</version> <version>${akka.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
...@@ -286,7 +287,7 @@ ...@@ -286,7 +287,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.liftweb</groupId> <groupId>net.liftweb</groupId>
<artifactId>lift-json_2.10</artifactId> <artifactId>lift-json_${scala.binary.version}</artifactId>
<version>2.5.1</version> <version>2.5.1</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
...@@ -342,7 +343,7 @@ ...@@ -342,7 +343,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId> <artifactId>scalatest_${scala.binary.version}</artifactId>
<version>1.9.1</version> <version>1.9.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
...@@ -365,7 +366,7 @@ ...@@ -365,7 +366,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalacheck</groupId> <groupId>org.scalacheck</groupId>
<artifactId>scalacheck_2.10</artifactId> <artifactId>scalacheck_${scala.binary.version}</artifactId>
<version>1.10.0</version> <version>1.10.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
......
repl-bin/pom.xml
+ 3
− 3
View file @ 09ed7ddf
...@@ -40,18 +40,18 @@ ...@@ -40,18 +40,18 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId> <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-bagel_2.10</artifactId> <artifactId>spark-bagel_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-repl_2.10</artifactId> <artifactId>spark-repl_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
......
repl/pom.xml
+ 7
− 7
View file @ 09ed7ddf
...@@ -39,18 +39,18 @@ ...@@ -39,18 +39,18 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId> <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-bagel_2.10</artifactId> <artifactId>spark-bagel_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-mllib_2.10</artifactId> <artifactId>spark-mllib_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
...@@ -78,18 +78,18 @@ ...@@ -78,18 +78,18 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId> <artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalacheck</groupId> <groupId>org.scalacheck</groupId>
<artifactId>scalacheck_2.10</artifactId> <artifactId>scalacheck_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<outputDirectory>target/scala-2.10/classes</outputDirectory> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
......
streaming/pom.xml
+ 7
− 7
View file @ 09ed7ddf
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId> <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sksamuel.kafka</groupId> <groupId>com.sksamuel.kafka</groupId>
<artifactId>kafka_2.10</artifactId> <artifactId>kafka_${scala.binary.version}</artifactId>
<version>0.8.0-beta1</version> <version>0.8.0-beta1</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
...@@ -111,16 +111,16 @@ ...@@ -111,16 +111,16 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>${akka.group}</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-zeromq_2.10</artifactId> <artifactId>akka-zeromq_${scala.binary.version}</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId> <artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalacheck</groupId> <groupId>org.scalacheck</groupId>
<artifactId>scalacheck_2.10</artifactId> <artifactId>scalacheck_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -144,8 +144,8 @@ ...@@ -144,8 +144,8 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<outputDirectory>target/scala-2.10/classes</outputDirectory> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
......
tools/pom.xml
+ 5
− 5
View file @ 09ed7ddf
...@@ -33,24 +33,24 @@ ...@@ -33,24 +33,24 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId> <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-streaming_2.10</artifactId> <artifactId>spark-streaming_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId> <artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<outputDirectory>target/scala-2.10/classes</outputDirectory> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
......
yarn/pom.xml
+ 4
− 4
View file @ 09ed7ddf
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId> <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId> <artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -74,8 +74,8 @@ ...@@ -74,8 +74,8 @@
</dependencies> </dependencies>
<build> <build>
<outputDirectory>target/scala-2.10/classes</outputDirectory> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-2.10/test-classes</testOutputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment