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
ce6b5a3e
Commit
ce6b5a3e
authored
12 years ago
by
Matei Zaharia
Browse files
Options
Downloads
Patches
Plain Diff
Uncomment Maven publishing stuff and set version to 0.6.0
parent
8815aeba
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
project/SparkBuild.scala
+9
-10
9 additions, 10 deletions
project/SparkBuild.scala
project/plugins.sbt
+3
-2
3 additions, 2 deletions
project/plugins.sbt
repl/src/main/scala/spark/repl/SparkILoop.scala
+1
-1
1 addition, 1 deletion
repl/src/main/scala/spark/repl/SparkILoop.scala
with
13 additions
and
13 deletions
project/SparkBuild.scala
+
9
−
10
View file @
ce6b5a3e
...
...
@@ -4,13 +4,13 @@ import Keys._
import
sbtassembly.Plugin._
import
AssemblyKeys._
import
twirl.sbt.TwirlPlugin._
// For Sonatype publishing
//
import com.jsuereth.pgp.sbtplugin.PgpKeys._
// For Sonatype publishing
import
com.jsuereth.pgp.sbtplugin.PgpKeys._
object
SparkBuild
extends
Build
{
// Hadoop version to build against. For example, "0.20.2", "0.20.205.0", or
// "1.0.
1
" for Apache releases, or "0.20.2-cdh3u
3
" for Cloudera Hadoop.
val
HADOOP_VERSION
=
"
0.20.205.0
"
// "1.0.
3
" for Apache releases, or "0.20.2-cdh3u
5
" for Cloudera Hadoop.
val
HADOOP_VERSION
=
"
1.0.3
"
lazy
val
root
=
Project
(
"root"
,
file
(
"."
),
settings
=
rootSettings
)
aggregate
(
core
,
repl
,
examples
,
bagel
)
...
...
@@ -28,7 +28,7 @@ object SparkBuild extends Build {
def
sharedSettings
=
Defaults
.
defaultSettings
++
Seq
(
organization
:=
"org.spark-project"
,
version
:=
"0.6.0
-SNAPSHOT
"
,
version
:=
"0.6.0"
,
scalaVersion
:=
"2.9.2"
,
scalacOptions
:=
Seq
(
/*"-deprecation",*/
"-unchecked"
,
"-optimize"
),
// -deprecation is too noisy due to usage of old Hadoop API, enable it once that's no longer an issue
unmanagedJars
in
Compile
<<=
baseDirectory
map
{
base
=>
(
base
/
"lib"
**
"*.jar"
).
classpath
},
...
...
@@ -36,7 +36,7 @@ object SparkBuild extends Build {
transitiveClassifiers
in
Scope
.
GlobalScope
:=
Seq
(
"sources"
),
testListeners
<<=
target
.
map
(
t
=>
Seq
(
new
eu
.
henkelmann
.
sbt
.
JUnitXmlTestsListener
(
t
.
getAbsolutePath
))),
/
*
For Sonatype publishing
/
/
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/"
),
...
...
@@ -68,17 +68,16 @@ object SparkBuild extends Build {
</developer>
</developers>
),
publishTo
<<=
version
{
(
v
:
String
)
=>
val
nexus
=
"https://oss.sonatype.org/"
if (v.trim.endsWith("SNAPSHOT"))
Some("sonatype-snapshots" at nexus + "content/repositories/snapshots")
if
(
v
.
trim
.
endsWith
(
"SNAPSHOT"
))
Some
(
"sonatype-snapshots"
at
nexus
+
"content/repositories/snapshots"
)
else
Some
(
"sonatype-staging"
at
nexus
+
"service/local/staging/deploy/maven2"
)
},
credentials
+=
Credentials
(
Path
.
userHome
/
".sbt"
/
"sonatype.credentials"
),
*/
libraryDependencies
++=
Seq
(
"org.eclipse.jetty"
%
"jetty-server"
%
"7.5.3.v20111011"
,
...
...
This diff is collapsed.
Click to expand it.
project/plugins.sbt
+
3
−
2
View file @
ce6b5a3e
...
...
@@ -13,5 +13,6 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.0.0")
addSbtPlugin
(
"cc.spray"
%%
"sbt-twirl"
%
"0.5.2"
)
// For Sonatype publishing
// resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)
// addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")
resolvers
+=
Resolver
.
url
(
"sbt-plugin-releases"
,
new
URL
(
"http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"
))(
Resolver
.
ivyStylePatterns
)
addSbtPlugin
(
"com.jsuereth"
%
"xsbt-gpg-plugin"
%
"0.6"
)
This diff is collapsed.
Click to expand it.
repl/src/main/scala/spark/repl/SparkILoop.scala
+
1
−
1
View file @
ce6b5a3e
...
...
@@ -200,7 +200,7 @@ class SparkILoop(in0: Option[BufferedReader], val out: PrintWriter, val master:
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
/___/ .__/\_,_/_/ /_/\_\ version 0.6.0
-SNAPSHOT
/___/ .__/\_,_/_/ /_/\_\ version 0.6.0
/_/
"""
)
import
Properties._
...
...
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