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
c7d6f1a6
Commit
c7d6f1a6
authored
13 years ago
by
Matei Zaharia
Browse files
Options
Downloads
Patches
Plain Diff
Really upgrade to SBT 0.11.1 (through build.properties and plugin changes)
parent
9e4c79a4
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
project/SparkBuild.scala
+3
-2
3 additions, 2 deletions
project/SparkBuild.scala
project/build.properties
+1
-1
1 addition, 1 deletion
project/build.properties
project/plugins.sbt
+1
-1
1 addition, 1 deletion
project/plugins.sbt
with
5 additions
and
4 deletions
project/SparkBuild.scala
+
3
−
2
View file @
c7d6f1a6
import
sbt._
import
Keys._
import
sbtassembly.Plugin.
{
assemblySettings
,
Assembly
}
import
sbtassembly.Plugin._
import
AssemblyKeys._
object
SparkBuild
extends
Build
{
...
...
@@ -49,7 +50,7 @@ object SparkBuild extends Build {
"com.google.protobuf"
%
"protobuf-java"
%
"2.3.0"
,
"de.javakaffee"
%
"kryo-serializers"
%
"0.9"
)
)
++
assemblySettings
++
Seq
(
test
in
A
ssembly
:=
{})
)
++
assemblySettings
++
Seq
(
test
in
a
ssembly
:=
{})
def
replSettings
=
sharedSettings
++
Seq
(
name
:=
"spark-repl"
,
...
...
This diff is collapsed.
Click to expand it.
project/build.properties
+
1
−
1
View file @
c7d6f1a6
sbt.version
=
0.11.
0
sbt.version
=
0.11.
1
This diff is collapsed.
Click to expand it.
project/plugins.sbt
+
1
−
1
View file @
c7d6f1a6
...
...
@@ -7,4 +7,4 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "0.11.0")
addSbtPlugin
(
"com.typesafe.sbteclipse"
%
"sbteclipse"
%
"1.4.0"
)
addSbtPlugin
(
"com.eed3si9n"
%%
"sbt-assembly"
%
"0.
6
"
)
addSbtPlugin
(
"com.eed3si9n"
%%
"sbt-assembly"
%
"0.
7.2
"
)
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