Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
spark
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs525-sp18-g07
spark
Commits
4041a268
Commit
4041a268
authored
11 years ago
by
Prashant Sharma
Browse files
Options
Downloads
Patches
Plain Diff
Updated to latest stable scala 2.10.1 and akka 2.1.2
parent
e8a9d1cd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
project/SparkBuild.scala
+8
-11
8 additions, 11 deletions
project/SparkBuild.scala
streaming/pom.xml
+2
-12
2 additions, 12 deletions
streaming/pom.xml
with
11 additions
and
24 deletions
pom.xml
+
1
−
1
View file @
4041a268
...
...
@@ -53,7 +53,7 @@
<java.version>
1.5
</java.version>
<scala.version>
2.10
</scala.version>
<mesos.version>
0.9.0-incubating
</mesos.version>
<akka.version>
2.1.
0
</akka.version>
<akka.version>
2.1.
2
</akka.version>
<spray.version>
1.1-M7
</spray.version>
<spray.json.version>
1.2.3
</spray.json.version>
<slf4j.version>
1.6.1
</slf4j.version>
...
...
This diff is collapsed.
Click to expand it.
project/SparkBuild.scala
+
8
−
11
View file @
4041a268
...
...
@@ -36,7 +36,7 @@ object SparkBuild extends Build {
def
sharedSettings
=
Defaults
.
defaultSettings
++
Seq
(
organization
:=
"org.spark-project"
,
version
:=
"0.8.0-SNAPSHOT"
,
scalaVersion
:=
"2.10.
0
"
,
scalaVersion
:=
"2.10.
1
"
,
scalacOptions
:=
Seq
(
"-unchecked"
,
"-optimize"
,
"-deprecation"
),
unmanagedJars
in
Compile
<<=
baseDirectory
map
{
base
=>
(
base
/
"lib"
**
"*.jar"
).
classpath
},
retrieveManaged
:=
true
,
...
...
@@ -51,9 +51,6 @@ object SparkBuild extends Build {
// Only allow one test at a time, even across projects, since they run in the same JVM
concurrentRestrictions
in
Global
+=
Tags
.
limit
(
Tags
.
Test
,
1
),
// Shared between both core and streaming.
resolvers
++=
Seq
(
"Akka Repository"
at
"http://repo.akka.io/releases/"
),
// For Sonatype publishing
resolvers
++=
Seq
(
"sonatype-snapshots"
at
"https://oss.sonatype.org/content/repositories/snapshots"
,
"sonatype-staging"
at
"https://oss.sonatype.org/service/local/staging/deploy/maven2/"
),
...
...
@@ -141,8 +138,8 @@ object SparkBuild extends Build {
"asm"
%
"asm-all"
%
"3.3.1"
,
"com.google.protobuf"
%
"protobuf-java"
%
"2.4.1"
,
"de.javakaffee"
%
"kryo-serializers"
%
"0.20"
,
"com.typesafe.akka"
%%
"akka-remote"
%
"2.1.
0
"
,
"com.typesafe.akka"
%%
"akka-slf4j"
%
"2.1.
0
"
,
"com.typesafe.akka"
%%
"akka-remote"
%
"2.1.
2
"
,
"com.typesafe.akka"
%%
"akka-slf4j"
%
"2.1.
2
"
,
"it.unimi.dsi"
%
"fastutil"
%
"6.4.4"
,
"io.spray"
%
"spray-can"
%
"1.1-M7"
,
"io.spray"
%
"spray-io"
%
"1.1-M7"
,
...
...
@@ -150,9 +147,9 @@ object SparkBuild extends Build {
"io.spray"
%%
"spray-json"
%
"1.2.3"
,
"colt"
%
"colt"
%
"1.2.0"
,
"org.apache.mesos"
%
"mesos"
%
"0.9.0-incubating"
,
"org.scala-lang"
%
"scala-actors"
%
"2.10.
0
"
,
"org.scala-lang"
%
"jline"
%
"2.10.
0
"
,
"org.scala-lang"
%
"scala-reflect"
%
"2.10.
0
"
"org.scala-lang"
%
"scala-actors"
%
"2.10.
1
"
,
"org.scala-lang"
%
"jline"
%
"2.10.
1
"
,
"org.scala-lang"
%
"scala-reflect"
%
"2.10.
1
"
)
++
(
if
(
HADOOP_MAJOR_VERSION
==
"2"
)
Some
(
"org.apache.hadoop"
%
"hadoop-client"
%
HADOOP_VERSION
)
else
None
).
toSeq
,
unmanagedSourceDirectories
in
Compile
<+=
baseDirectory
{
_
/
(
"src/hadoop"
+
HADOOP_MAJOR_VERSION
+
"/scala"
)
}
...
...
@@ -165,7 +162,7 @@ object SparkBuild extends Build {
def
replSettings
=
sharedSettings
++
Seq
(
name
:=
"spark-repl"
,
// libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _)
libraryDependencies
++=
Seq
(
"org.scala-lang"
%
"scala-compiler"
%
"2.10.
0
"
)
libraryDependencies
++=
Seq
(
"org.scala-lang"
%
"scala-compiler"
%
"2.10.
1
"
)
)
def
examplesSettings
=
sharedSettings
++
Seq
(
...
...
@@ -181,7 +178,7 @@ object SparkBuild extends Build {
"org.apache.flume"
%
"flume-ng-sdk"
%
"1.2.0"
%
"compile"
,
"com.github.sgroschupf"
%
"zkclient"
%
"0.1"
,
"org.twitter4j"
%
"twitter4j-stream"
%
"3.0.3"
,
"com.typesafe.akka"
%
"akka-zeromq"
%
"2.1
-M1"
excludeAll
(
ExclusionRule
(
name
=
"akka-actor"
),
ExclusionRule
(
organization
=
"org.scala-lang"
))
"com.typesafe.akka"
%
%
"akka-zeromq"
%
"2.1
.2"
)
)
++
assemblySettings
++
extraAssemblySettings
...
...
This diff is collapsed.
Click to expand it.
streaming/pom.xml
+
2
−
12
View file @
4041a268
...
...
@@ -54,18 +54,8 @@
</dependency>
<dependency>
<groupId>
com.typesafe.akka
</groupId>
<artifactId>
akka-zeromq
</artifactId>
<version>
2.1-M1
</version>
<exclusions>
<exclusion>
<groupId>
org.scala-lang
</groupId>
<artifactId>
scala-library
</artifactId>
</exclusion>
<exclusion>
<groupId>
com.typesafe.akka
</groupId>
<artifactId>
akka-actor
</artifactId>
</exclusion>
</exclusions>
<artifactId>
akka-zeromq_${scala.version}
</artifactId>
<version>
${akka.version}
</version>
</dependency>
<dependency>
<groupId>
org.scalatest
</groupId>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment