Skip to content
Snippets Groups Projects
Commit 7ff4c2d3 authored by Prashant Sharma's avatar Prashant Sharma
Browse files

fixed maven build for scala 2.10

parent 276c37a5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
assembly/pom.xml
+ 1
− 1
View file @ 7ff4c2d3
......@@ -79,7 +79,7 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<shadedArtifactAttached>false</shadedArtifactAttached>
<outputFile>${project.build.directory}/scala-${scala.version}/${project.artifactId}-${project.version}-hadoop${hadoop.version}.jar</outputFile>
<outputFile>${project.build.directory}/scala-${scala-short.version}/${project.artifactId}-${project.version}-hadoop${hadoop.version}.jar</outputFile>
<artifactSet>
<includes>
<include>*:*</include>
......
bagel/pom.xml
+ 4
− 4
View file @ 7ff4c2d3
......@@ -43,18 +43,18 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
<artifactId>scalatest_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.version}</artifactId>
<artifactId>scalacheck_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<outputDirectory>target/scala-${scala.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.version}/test-classes</testOutputDirectory>
<outputDirectory>target/scala-${scala-short.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala-short.version}/test-classes</testOutputDirectory>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
......
core/pom.xml
+ 14
− 17
View file @ 7ff4c2d3
......@@ -83,7 +83,7 @@
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>chill_2.10</artifactId>
<artifactId>chill_${scala-short.version}</artifactId>
<version>0.3.1</version>
</dependency>
<dependency>
......@@ -91,21 +91,13 @@
<artifactId>chill-java</artifactId>
<version>0.3.1</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-actors</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote_${scala.version}</artifactId>
<artifactId>akka-remote_${scala-short.version}</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-slf4j_${scala.version}</artifactId>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
<artifactId>akka-slf4j_${scala-short.version}</artifactId>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
......@@ -113,7 +105,7 @@
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-json_2.10</artifactId>
<artifactId>lift-json_${scala-short.version}</artifactId>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
......@@ -125,7 +117,7 @@
</dependency>
<dependency>
<groupId>com.github.scala-incubator.io</groupId>
<artifactId>scala-io-file_2.10</artifactId>
<artifactId>scala-io-file_${scala-short.version}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.mesos</groupId>
......@@ -160,14 +152,19 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
<artifactId>scalatest_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.version}</artifactId>
<artifactId>scalacheck_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
......@@ -187,8 +184,8 @@
</dependency>
</dependencies>
<build>
<outputDirectory>target/scala-${scala.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.version}/test-classes</testOutputDirectory>
<outputDirectory>target/scala-${scala-short.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala-short.version}/test-classes</testOutputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......
examples/pom.xml
+ 5
− 5
View file @ 7ff4c2d3
......@@ -77,17 +77,17 @@
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>algebird-core_2.10</artifactId>
<artifactId>algebird-core_${scala-short.version}</artifactId>
<version>0.1.11</version>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
<artifactId>scalatest_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.version}</artifactId>
<artifactId>scalacheck_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
......@@ -128,8 +128,8 @@
</dependencies>
<build>
<outputDirectory>target/scala-${scala.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.version}/test-classes</testOutputDirectory>
<outputDirectory>target/scala-${scala-short.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala-short.version}/test-classes</testOutputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......
mllib/pom.xml
+ 4
− 4
View file @ 7ff4c2d3
......@@ -48,12 +48,12 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
<artifactId>scalatest_2.10</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.version}</artifactId>
<artifactId>scalacheck_2.10</artifactId>
<scope>test</scope>
</dependency>
<dependency>
......@@ -63,8 +63,8 @@
</dependency>
</dependencies>
<build>
<outputDirectory>target/scala-${scala.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.version}/test-classes</testOutputDirectory>
<outputDirectory>target/scala-${scala-short.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala-short.version}/test-classes</testOutputDirectory>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
......
pom.xml
+ 18
− 24
View file @ 7ff4c2d3
......@@ -76,9 +76,10 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.5</java.version>
<scala.version>2.10</scala.version>
<mesos.version>0.9.0-incubating</mesos.version>
<akka.version>2.1.4</akka.version>
<scala-short.version>2.10</scala-short.version>
<scala.version>2.10.2</scala.version>
<mesos.version>0.12.1</mesos.version>
<akka.version>2.2.1</akka.version>
<slf4j.version>1.7.2</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<hadoop.version>1.0.4</hadoop.version>
......@@ -214,7 +215,7 @@
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>chill_2.9.3</artifactId>
<artifactId>chill_${scala-short.version}</artifactId>
<version>0.3.1</version>
</dependency>
<dependency>
......@@ -222,19 +223,14 @@
<artifactId>chill-java</artifactId>
<version>0.3.1</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-actors</artifactId>
<version>2.10.0</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote_${scala.version}</artifactId>
<artifactId>akka-remote_${scala-short.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-slf4j_${scala.version}</artifactId>
<artifactId>akka-slf4j_${scala-short.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
......@@ -249,7 +245,7 @@
</dependency>
<dependency>
<groupId>com.github.scala-incubator.io</groupId>
<artifactId>scala-io-file_2.10</artifactId>
<artifactId>scala-io-file_${scala-short.version}</artifactId>
<version>0.4.1</version>
</dependency>
<dependency>
......@@ -270,7 +266,7 @@
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-json_2.10</artifactId>
<artifactId>lift-json_${scala-short.version}</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
......@@ -296,36 +292,34 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
<version>2.10.0</version>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>jline</artifactId>
<version>2.10.0</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
<artifactId>scalatest_${scala-short.version}</artifactId>
<version>1.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
......@@ -334,7 +328,7 @@
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.version}</artifactId>
<artifactId>scalacheck_${scala-short.version}</artifactId>
<version>1.10.0</version>
<scope>test</scope>
</dependency>
......
project/SparkBuild.scala
+ 1
− 2
View file @ 7ff4c2d3
......@@ -183,8 +183,7 @@ object SparkBuild extends Build {
def coreSettings = sharedSettings ++ Seq(
name := "spark-core",
resolvers ++= Seq(
// "JBoss Repository" at "http://repository.jboss.org/nexus/content/repositories/releases/",
// "Spray Repository" at "http://repo.spray.cc/",
"JBoss Repository" at "http://repository.jboss.org/nexus/content/repositories/releases/",
"Cloudera Repository" at "https://repository.cloudera.com/artifactory/cloudera-repos/"
),
......
repl/pom.xml
+ 6
− 6
View file @ 7ff4c2d3
......@@ -61,12 +61,12 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
<version>2.10.0</version>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>jline</artifactId>
<version>2.10.0</version>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
......@@ -78,18 +78,18 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
<artifactId>scalatest_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.version}</artifactId>
<artifactId>scalacheck_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<outputDirectory>target/scala-${scala.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.version}/test-classes</testOutputDirectory>
<outputDirectory>target/scala-${scala-short.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala-short.version}/test-classes</testOutputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......
streaming/pom.xml
+ 9
− 5
View file @ 7ff4c2d3
......@@ -86,17 +86,17 @@
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-zeromq_${scala.version}</artifactId>
<artifactId>akka-zeromq_${scala-short.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
<artifactId>scalatest_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.version}</artifactId>
<artifactId>scalacheck_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
......@@ -109,10 +109,14 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
</dependencies>
<build>
<outputDirectory>target/scala-${scala.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.version}/test-classes</testOutputDirectory>
<outputDirectory>target/scala-${scala-short.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala-short.version}/test-classes</testOutputDirectory>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
......
tools/pom.xml
+ 3
− 3
View file @ 7ff4c2d3
......@@ -43,14 +43,14 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
<artifactId>scalatest_${scala-short.version}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<outputDirectory>target/scala-${scala.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.version}/test-classes</testOutputDirectory>
<outputDirectory>target/scala-${scala-short.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala-short.version}/test-classes</testOutputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......
yarn/pom.xml
+ 2
− 2
View file @ 7ff4c2d3
......@@ -64,8 +64,8 @@
</dependencies>
<build>
<outputDirectory>target/scala-${scala.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.version}/test-classes</testOutputDirectory>
<outputDirectory>target/scala-${scala-short.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala-short.version}/test-classes</testOutputDirectory>
<plugins>
<plugin>
<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