File tree 7 files changed +12
-12
lines changed
7 files changed +12
-12
lines changed Original file line number Diff line number Diff line change @@ -250,11 +250,11 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
250
250
(Interpreter classes (all .scala files in repl/src/main/scala
251
251
except for Main.Scala, SparkHelper.scala and ExecutorClassLoader.scala),
252
252
and for SerializableMapWrapper in JavaUtils.scala)
253
- (BSD-like) Scala Actors library (org.scala-lang:scala-actors:2.10.4 - http://www.scala-lang.org/)
254
- (BSD-like) Scala Compiler (org.scala-lang:scala-compiler:2.10.4 - http://www.scala-lang.org/)
255
- (BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.10.4 - http://www.scala-lang.org/)
256
- (BSD-like) Scala Library (org.scala-lang:scala-library:2.10.4 - http://www.scala-lang.org/)
257
- (BSD-like) Scalap (org.scala-lang:scalap:2.10.4 - http://www.scala-lang.org/)
253
+ (BSD-like) Scala Actors library (org.scala-lang:scala-actors:2.10.5 - http://www.scala-lang.org/)
254
+ (BSD-like) Scala Compiler (org.scala-lang:scala-compiler:2.10.5 - http://www.scala-lang.org/)
255
+ (BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.10.5 - http://www.scala-lang.org/)
256
+ (BSD-like) Scala Library (org.scala-lang:scala-library:2.10.5 - http://www.scala-lang.org/)
257
+ (BSD-like) Scalap (org.scala-lang:scalap:2.10.5 - http://www.scala-lang.org/)
258
258
(BSD-style) scalacheck (org.scalacheck:scalacheck_2.10:1.10.0 - http://www.scalacheck.org)
259
259
(BSD-style) spire (org.spire-math:spire_2.10:0.7.1 - http://spire-math.org)
260
260
(BSD-style) spire-macros (org.spire-math:spire-macros_2.10:0.7.1 - http://spire-math.org)
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ run them locally by setting appropriate environment variables.
4
4
5
5
```
6
6
$ cd sbt_app_core
7
- $ SCALA_VERSION=2.10.4 \
7
+ $ SCALA_VERSION=2.10.5 \
8
8
SPARK_VERSION=1.0.0-SNAPSHOT \
9
9
SPARK_RELEASE_REPOSITORY=file:///home/patrick/.ivy2/local \
10
10
sbt run
Original file line number Diff line number Diff line change 35
35
RELEASE_KEY = "XXXXXXXX" # Your 8-digit hex
36
36
RELEASE_REPOSITORY = "https://repository.apache.org/content/repositories/orgapachespark-1033"
37
37
RELEASE_VERSION = "1.1.1"
38
- SCALA_VERSION = "2.10.4 "
38
+ SCALA_VERSION = "2.10.5 "
39
39
SCALA_BINARY_VERSION = "2.10"
40
40
41
41
# Do not set these
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ RUN apt-get update && \
25
25
apt-get install -y less openjdk-7-jre-headless net-tools vim-tiny sudo openssh-server && \
26
26
rm -rf /var/lib/apt/lists/*
27
27
28
- ENV SCALA_VERSION 2.10.4
28
+ ENV SCALA_VERSION 2.10.5
29
29
ENV CDH_VERSION cdh4
30
30
ENV SCALA_HOME /opt/scala-$SCALA_VERSION
31
31
ENV SPARK_HOME /opt/spark
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ include:
17
17
SPARK_VERSION : 1.6.0-SNAPSHOT
18
18
SPARK_VERSION_SHORT : 1.6.0
19
19
SCALA_BINARY_VERSION : " 2.10"
20
- SCALA_VERSION : " 2.10.4 "
20
+ SCALA_VERSION : " 2.10.5 "
21
21
MESOS_VERSION : 0.21.0
22
22
SPARK_ISSUE_TRACKER_URL : https://issues.apache.org/jira/browse/SPARK
23
23
SPARK_GITHUB_URL : https://github.com/apache/spark
Original file line number Diff line number Diff line change 159
159
<!-- commons-httpclient/commons-httpclient-->
160
160
<httpclient .classic.version>3.1</httpclient .classic.version>
161
161
<commons .math3.version>3.4.1</commons .math3.version>
162
- <scala .version>2.10.4 </scala .version>
162
+ <scala .version>2.10.5 </scala .version>
163
163
<scala .binary.version>2.10</scala .binary.version>
164
164
<jline .version>${scala.version} </jline .version>
165
165
<jline .groupid>org.scala-lang</jline .groupid>
2422
2422
<property ><name >!scala-2.11</name ></property >
2423
2423
</activation >
2424
2424
<properties >
2425
- <scala .version>2.10.4 </scala .version>
2425
+ <scala .version>2.10.5 </scala .version>
2426
2426
<scala .binary.version>2.10</scala .binary.version>
2427
2427
<jline .version>${scala.version} </jline .version>
2428
2428
<jline .groupid>org.scala-lang</jline .groupid>
Original file line number Diff line number Diff line change @@ -316,7 +316,7 @@ object OldDeps {
316
316
317
317
def oldDepsSettings () = Defaults .coreDefaultSettings ++ Seq (
318
318
name := " old-deps" ,
319
- scalaVersion := " 2.10.4 " ,
319
+ scalaVersion := " 2.10.5 " ,
320
320
retrieveManaged := true ,
321
321
retrievePattern := " [type]s/[artifact](-[revision])(-[classifier]).[ext]" ,
322
322
libraryDependencies := Seq (" spark-streaming-mqtt" , " spark-streaming-zeromq" ,
You can’t perform that action at this time.
0 commit comments