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
4cc8d890
Unverified
Commit
4cc8d890
authored
8 years ago
by
Sean Owen
Browse files
Options
Downloads
Patches
Plain Diff
Revert "[SPARK-18697][BUILD] Upgrade sbt plugins"
This reverts commit
7f31d378
.
parent
81e5619c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
project/SparkBuild.scala
+9
-6
9 additions, 6 deletions
project/SparkBuild.scala
project/plugins.sbt
+5
-5
5 additions, 5 deletions
project/plugins.sbt
with
14 additions
and
11 deletions
project/SparkBuild.scala
+
9
−
6
View file @
4cc8d890
...
...
@@ -596,17 +596,19 @@ object Hive {
}
object
Assembly
{
import
sbtassembly.AssemblyPlugin.autoImport._
import
sbtassembly.AssemblyUtils._
import
sbtassembly.Plugin._
import
AssemblyKeys._
val
hadoopVersion
=
taskKey
[
String
](
"The version of hadoop that spark is compiled against."
)
lazy
val
settings
=
Seq
(
lazy
val
settings
=
assemblySettings
++
Seq
(
test
in
assembly
:=
{},
hadoopVersion
:=
{
sys
.
props
.
get
(
"hadoop.version"
)
.
getOrElse
(
SbtPomKeys
.
effectivePom
.
value
.
getProperties
.
get
(
"hadoop.version"
).
asInstanceOf
[
String
])
},
assemblyJ
arName
in
assembly
:=
{
j
arName
in
assembly
:=
{
if
(
moduleName
.
value
.
contains
(
"streaming-flume-assembly"
)
||
moduleName
.
value
.
contains
(
"streaming-kafka-0-8-assembly"
)
||
moduleName
.
value
.
contains
(
"streaming-kafka-0-10-assembly"
)
...
...
@@ -617,8 +619,8 @@ object Assembly {
s
"${moduleName.value}-${version.value}-hadoop${hadoopVersion.value}.jar"
}
},
assemblyJ
arName
in
(
Test
,
assembly
)
:=
s
"${moduleName.value}-test-${version.value}.jar"
,
assemblyM
ergeStrategy
in
assembly
:=
{
j
arName
in
(
Test
,
assembly
)
:=
s
"${moduleName.value}-test-${version.value}.jar"
,
m
ergeStrategy
in
assembly
:=
{
case
m
if
m
.
toLowerCase
.
endsWith
(
"manifest.mf"
)
=>
MergeStrategy
.
discard
case
m
if
m
.
toLowerCase
.
matches
(
"meta-inf.*\\.sf$"
)
=>
MergeStrategy
.
discard
case
"log4j.properties"
=>
MergeStrategy
.
discard
...
...
@@ -630,7 +632,8 @@ object Assembly {
}
object
PySparkAssembly
{
import
sbtassembly.AssemblyPlugin.autoImport._
import
sbtassembly.Plugin._
import
AssemblyKeys._
import
java.util.zip.
{
ZipOutputStream
,
ZipEntry
}
lazy
val
settings
=
Seq
(
...
...
This diff is collapsed.
Click to expand it.
project/plugins.sbt
+
5
−
5
View file @
4cc8d890
addSbtPlugin
(
"com.eed3si9n"
%
"sbt-assembly"
%
"0.1
4.3
"
)
addSbtPlugin
(
"com.eed3si9n"
%
"sbt-assembly"
%
"0.1
1.2
"
)
addSbtPlugin
(
"com.typesafe.sbteclipse"
%
"sbteclipse-plugin"
%
"
5
.0.
1
"
)
addSbtPlugin
(
"com.typesafe.sbteclipse"
%
"sbteclipse-plugin"
%
"
4
.0.
0
"
)
addSbtPlugin
(
"net.virtual-void"
%
"sbt-dependency-graph"
%
"0.8.2"
)
addSbtPlugin
(
"org.scalastyle"
%%
"scalastyle-sbt-plugin"
%
"0.8.0"
)
addSbtPlugin
(
"com.typesafe"
%
"sbt-mima-plugin"
%
"0.1.1
2
"
)
addSbtPlugin
(
"com.typesafe"
%
"sbt-mima-plugin"
%
"0.1.1
1
"
)
addSbtPlugin
(
"com.alpinenow"
%
"junit_xml_listener"
%
"0.5.1"
)
...
...
@@ -16,9 +16,9 @@ addSbtPlugin("com.cavorite" % "sbt-avro" % "0.3.2")
addSbtPlugin
(
"io.spray"
%
"sbt-revolver"
%
"0.8.0"
)
libraryDependencies
+=
"org.ow2.asm"
%
"asm"
%
"5.
1
"
libraryDependencies
+=
"org.ow2.asm"
%
"asm"
%
"5.
0.3
"
libraryDependencies
+=
"org.ow2.asm"
%
"asm-commons"
%
"5.
1
"
libraryDependencies
+=
"org.ow2.asm"
%
"asm-commons"
%
"5.
0.3
"
addSbtPlugin
(
"com.simplytyped"
%
"sbt-antlr4"
%
"0.7.11"
)
...
...
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