|
William Benton |
42acb0c |
From 88286b1bffc4eb65f6a259c71e613fb76667470b Mon Sep 17 00:00:00 2001
|
|
William Benton |
42acb0c |
From: William Benton <willb@redhat.com>
|
|
William Benton |
42acb0c |
Date: Thu, 27 Feb 2014 15:46:41 -0600
|
|
William Benton |
42acb0c |
Subject: [PATCH 3/7] Removed sbt plugins.
|
|
William Benton |
42acb0c |
|
|
William Benton |
42acb0c |
---
|
|
William Benton |
42acb0c |
project/SparkBuild.scala | 38 +++++-----------------------------
|
|
William Benton |
42acb0c |
project/plugins.sbt | 18 ----------------
|
|
William Benton |
42acb0c |
project/project/SparkPluginBuild.scala | 24 ---------------------
|
|
William Benton |
42acb0c |
3 files changed, 5 insertions(+), 75 deletions(-)
|
|
William Benton |
42acb0c |
delete mode 100644 project/plugins.sbt
|
|
William Benton |
42acb0c |
delete mode 100644 project/project/SparkPluginBuild.scala
|
|
William Benton |
42acb0c |
|
|
William Benton |
42acb0c |
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
|
|
William Benton |
42acb0c |
index 398f5ec..d401c71 100644
|
|
William Benton |
42acb0c |
--- a/project/SparkBuild.scala
|
|
William Benton |
42acb0c |
+++ b/project/SparkBuild.scala
|
|
William Benton |
42acb0c |
@@ -18,8 +18,6 @@
|
|
William Benton |
42acb0c |
import sbt._
|
|
William Benton |
42acb0c |
import sbt.Classpaths.publishTask
|
|
William Benton |
42acb0c |
import Keys._
|
|
William Benton |
42acb0c |
-import sbtassembly.Plugin._
|
|
William Benton |
42acb0c |
-import AssemblyKeys._
|
|
William Benton |
42acb0c |
import scala.util.Properties
|
|
William Benton |
42acb0c |
// For Sonatype publishing
|
|
William Benton |
42acb0c |
//import com.jsuereth.pgp.sbtplugin.PgpKeys._
|
|
William Benton |
42acb0c |
@@ -60,11 +58,6 @@ object SparkBuild extends Build {
|
|
William Benton |
42acb0c |
|
|
William Benton |
42acb0c |
lazy val mllib = Project("mllib", file("mllib"), settings = mllibSettings) dependsOn(core)
|
|
William Benton |
42acb0c |
|
|
William Benton |
42acb0c |
- lazy val assemblyProj = Project("assembly", file("assembly"), settings = assemblyProjSettings)
|
|
William Benton |
42acb0c |
- .dependsOn(core, graphx, bagel, mllib, repl, streaming) dependsOn(maybeYarn: _*)
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
- lazy val assembleDeps = TaskKey[Unit]("assemble-deps", "Build assembly of dependencies and packages Spark projects")
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
// A configuration to set an alternative publishLocalConfiguration
|
|
William Benton |
42acb0c |
lazy val MavenCompile = config("m2r") extend(Compile)
|
|
William Benton |
42acb0c |
lazy val publishLocalBoth = TaskKey[Unit]("publish-local", "publish local for m2 and ivy")
|
|
William Benton |
42acb0c |
@@ -116,7 +109,7 @@ object SparkBuild extends Build {
|
|
William Benton |
42acb0c |
// Everything except assembly, tools and examples belong to packageProjects
|
|
William Benton |
42acb0c |
lazy val packageProjects = Seq[ProjectReference](core, repl, bagel, streaming, mllib, graphx) ++ maybeYarnRef
|
|
William Benton |
42acb0c |
|
|
William Benton |
42acb0c |
- lazy val allProjects = packageProjects ++ allExternalRefs ++ Seq[ProjectReference](examples, tools, assemblyProj)
|
|
William Benton |
42acb0c |
+ lazy val allProjects = packageProjects ++ allExternalRefs ++ Seq[ProjectReference](examples, tools)
|
|
William Benton |
42acb0c |
|
|
William Benton |
42acb0c |
def sharedSettings = Defaults.defaultSettings ++ Seq(
|
|
William Benton |
42acb0c |
organization := "org.apache.spark",
|
|
William Benton |
42acb0c |
@@ -129,7 +122,6 @@ object SparkBuild extends Build {
|
|
William Benton |
42acb0c |
retrieveManaged := true,
|
|
William Benton |
42acb0c |
retrievePattern := "[type]s/[artifact](-[revision])(-[classifier]).[ext]",
|
|
William Benton |
42acb0c |
transitiveClassifiers in Scope.GlobalScope := Seq("sources"),
|
|
William Benton |
42acb0c |
- testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath))),
|
|
William Benton |
42acb0c |
|
|
William Benton |
42acb0c |
// Fork new JVMs for tests and set Java options for those
|
|
William Benton |
42acb0c |
fork := true,
|
|
William Benton |
42acb0c |
@@ -230,8 +222,8 @@ object SparkBuild extends Build {
|
|
William Benton |
42acb0c |
publishMavenStyle in MavenCompile := true,
|
|
William Benton |
42acb0c |
publishLocal in MavenCompile <<= publishTask(publishLocalConfiguration in MavenCompile, deliverLocal),
|
|
William Benton |
42acb0c |
publishLocalBoth <<= Seq(publishLocal in MavenCompile, publishLocal).dependOn
|
|
William Benton |
42acb0c |
- ) ++ net.virtualvoid.sbt.graph.Plugin.graphSettings
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
+ )
|
|
William Benton |
42acb0c |
+
|
|
William Benton |
42acb0c |
val slf4jVersion = "1.7.2"
|
|
William Benton |
42acb0c |
|
|
William Benton |
42acb0c |
val excludeCglib = ExclusionRule(organization = "org.sonatype.sisu.inject")
|
|
William Benton |
42acb0c |
@@ -309,11 +301,11 @@ object SparkBuild extends Build {
|
|
William Benton |
42acb0c |
excludeAll(excludeSnappy)
|
|
William Benton |
42acb0c |
excludeAll(excludeCglib)
|
|
William Benton |
42acb0c |
)
|
|
William Benton |
42acb0c |
- ) ++ assemblySettings ++ extraAssemblySettings
|
|
William Benton |
42acb0c |
+ )
|
|
William Benton |
42acb0c |
|
|
William Benton |
42acb0c |
def toolsSettings = sharedSettings ++ Seq(
|
|
William Benton |
42acb0c |
name := "spark-tools"
|
|
William Benton |
42acb0c |
- ) ++ assemblySettings ++ extraAssemblySettings
|
|
William Benton |
42acb0c |
+ )
|
|
William Benton |
42acb0c |
|
|
William Benton |
42acb0c |
def graphxSettings = sharedSettings ++ Seq(
|
|
William Benton |
42acb0c |
name := "spark-graphx",
|
|
William Benton |
42acb0c |
@@ -377,26 +369,6 @@ object SparkBuild extends Build {
|
|
William Benton |
42acb0c |
)
|
|
William Benton |
42acb0c |
)
|
|
William Benton |
42acb0c |
|
|
William Benton |
42acb0c |
- def assemblyProjSettings = sharedSettings ++ Seq(
|
|
William Benton |
42acb0c |
- libraryDependencies += "net.sf.py4j" % "py4j" % "0.8.1",
|
|
William Benton |
42acb0c |
- name := "spark-assembly",
|
|
William Benton |
42acb0c |
- assembleDeps in Compile <<= (packageProjects.map(packageBin in Compile in _) ++ Seq(packageDependency in Compile)).dependOn,
|
|
William Benton |
42acb0c |
- jarName in assembly <<= version map { v => "spark-assembly-" + v + "-hadoop" + hadoopVersion + ".jar" },
|
|
William Benton |
42acb0c |
- jarName in packageDependency <<= version map { v => "spark-assembly-" + v + "-hadoop" + hadoopVersion + "-deps.jar" }
|
|
William Benton |
42acb0c |
- ) ++ assemblySettings ++ extraAssemblySettings
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
- def extraAssemblySettings() = Seq(
|
|
William Benton |
42acb0c |
- test in assembly := {},
|
|
William Benton |
42acb0c |
- mergeStrategy in assembly := {
|
|
William Benton |
42acb0c |
- case m if m.toLowerCase.endsWith("manifest.mf") => MergeStrategy.discard
|
|
William Benton |
42acb0c |
- case m if m.toLowerCase.matches("meta-inf.*\\.sf$") => MergeStrategy.discard
|
|
William Benton |
42acb0c |
- case "log4j.properties" => MergeStrategy.discard
|
|
William Benton |
42acb0c |
- case m if m.toLowerCase.startsWith("meta-inf/services/") => MergeStrategy.filterDistinctLines
|
|
William Benton |
42acb0c |
- case "reference.conf" => MergeStrategy.concat
|
|
William Benton |
42acb0c |
- case _ => MergeStrategy.first
|
|
William Benton |
42acb0c |
- }
|
|
William Benton |
42acb0c |
- )
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
def twitterSettings() = sharedSettings ++ Seq(
|
|
William Benton |
42acb0c |
name := "spark-streaming-twitter",
|
|
William Benton |
42acb0c |
libraryDependencies ++= Seq(
|
|
William Benton |
42acb0c |
diff --git a/project/plugins.sbt b/project/plugins.sbt
|
|
William Benton |
42acb0c |
deleted file mode 100644
|
|
William Benton |
42acb0c |
index 4ba0e42..0000000
|
|
William Benton |
42acb0c |
--- a/project/plugins.sbt
|
|
William Benton |
42acb0c |
+++ /dev/null
|
|
William Benton |
42acb0c |
@@ -1,18 +0,0 @@
|
|
William Benton |
42acb0c |
-resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
-resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
-resolvers += "Spray Repository" at "http://repo.spray.cc/"
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.2")
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
-// For Sonatype publishing
|
|
William Benton |
42acb0c |
-//resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
-//addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
-addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.3")
|
|
William Benton |
42acb0c |
diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala
|
|
William Benton |
42acb0c |
deleted file mode 100644
|
|
William Benton |
42acb0c |
index 6a66bd1..0000000
|
|
William Benton |
42acb0c |
--- a/project/project/SparkPluginBuild.scala
|
|
William Benton |
42acb0c |
+++ /dev/null
|
|
William Benton |
42acb0c |
@@ -1,24 +0,0 @@
|
|
William Benton |
42acb0c |
-/*
|
|
William Benton |
42acb0c |
- * Licensed to the Apache Software Foundation (ASF) under one or more
|
|
William Benton |
42acb0c |
- * contributor license agreements. See the NOTICE file distributed with
|
|
William Benton |
42acb0c |
- * this work for additional information regarding copyright ownership.
|
|
William Benton |
42acb0c |
- * The ASF licenses this file to You under the Apache License, Version 2.0
|
|
William Benton |
42acb0c |
- * (the "License"); you may not use this file except in compliance with
|
|
William Benton |
42acb0c |
- * the License. You may obtain a copy of the License at
|
|
William Benton |
42acb0c |
- *
|
|
William Benton |
42acb0c |
- * http://www.apache.org/licenses/LICENSE-2.0
|
|
William Benton |
42acb0c |
- *
|
|
William Benton |
42acb0c |
- * Unless required by applicable law or agreed to in writing, software
|
|
William Benton |
42acb0c |
- * distributed under the License is distributed on an "AS IS" BASIS,
|
|
William Benton |
42acb0c |
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
William Benton |
42acb0c |
- * See the License for the specific language governing permissions and
|
|
William Benton |
42acb0c |
- * limitations under the License.
|
|
William Benton |
42acb0c |
- */
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
-import sbt._
|
|
William Benton |
42acb0c |
-
|
|
William Benton |
42acb0c |
-object SparkPluginDef extends Build {
|
|
William Benton |
42acb0c |
- lazy val root = Project("plugins", file(".")) dependsOn(junitXmlListener)
|
|
William Benton |
42acb0c |
- /* This is not published in a Maven repository, so we get it from GitHub directly */
|
|
William Benton |
42acb0c |
- lazy val junitXmlListener = uri("git://github.com/ijuma/junit_xml_listener.git#fe434773255b451a38e8d889536ebc260f4225ce")
|
|
William Benton |
42acb0c |
-}
|
|
William Benton |
42acb0c |
--
|
|
William Benton |
42acb0c |
1.8.3.4 (Apple Git-47)
|
|
William Benton |
42acb0c |
|