Skip to content

Commit

Permalink
more bintray (apache#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
robert3005 authored and Robert Kruszewski committed Sep 23, 2016
1 parent 0b8e1c2 commit a2e94f6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 17 deletions.
2 changes: 2 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ deployment:
- ./build/sbt -Phadoop-2.7 -Pmesos -Pkinesis-asl -Pyarn -Phive-thriftserver -Phive publish
- ./dev/make-distribution.sh --name hadoop2.7 --tgz "-Phadoop2.7 -Psparkr -Phive -Phive-thriftserver -Pyarn -Pmesos" \
2>&1 > binary-release-hadoop2.7.log
- curl -u $BINTRAY_USER:$BINTRAY_PASSWORD -T "spark-$(git describe --tags)-bin-hadoop2.7.tgz" "https://api.bintray.com/content/palantir/releases/org/apache/spark/dist/$(git describe --tags)/spark-$(git describe --tags)-bin-hadoop2.7.tgz"
- ./build/sbt -Phadoop-2.7 -Pmesos -Pkinesis-asl -Pyarn -Phive-thriftserver -Phive clean
- ./dev/make-distribution.sh --name without-hadoop --tgz "-Psparkr -Phadoop-provided -Pyarn -Pmesos" \
2>&1 > binary-release-without-hadoop.log
- curl -u $BINTRAY_USER:$BINTRAY_PASSWORD -T "spark-$(git describe --tags)-bin-without-hadoop.tgz" "https://api.bintray.com/content/palantir/releases/org/apache/spark/dist/$(git describe --tags)/spark-$(git describe --tags)-bin-without-hadoop.tgz"
23 changes: 8 additions & 15 deletions project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import scala.util.Properties
import scala.collection.JavaConverters._
import scala.collection.mutable.Stack

import bintray.BintrayKeys
import bintray.BintrayPlugin._
import sbt._
import sbt.Classpaths.publishTask
import sbt.Keys._
Expand Down Expand Up @@ -236,16 +234,15 @@ object SparkBuild extends PomBuild {
}
)

lazy val sharedSettings = bintraySettings ++ versionWithGit ++ sparkGenjavadocSettings ++
lazy val sharedSettings = versionWithGit ++ // sparkGenjavadocSettings ++
(if (sys.env.contains("NOLINT_ON_COMPILE")) Nil else enableScalaStyle) ++ Seq(
exportJars in Compile := true,
exportJars in Test := false,
javaHome := sys.env.get("JAVA_HOME")
.orElse(sys.props.get("java.home").map { p => new File(p).getParentFile().getAbsolutePath() })
.map(file),
incOptions := incOptions.value.withNameHashing(true),
publishMavenStyle := true,
unidocGenjavadocVersion := "0.10",
// unidocGenjavadocVersion := "0.10",
git.useGitDescribe := true,
useJGit,
version := {
Expand All @@ -263,13 +260,9 @@ object SparkBuild extends PomBuild {
commitVersion
)) get
},
BintrayKeys.bintrayCredentialsFile := new File(".credentials"),
licenses += ("Apache 2.0", url("https://www.apache.org/licenses/LICENSE-2.0")),
BintrayKeys.bintrayOrganization := Some("palantir"),
BintrayKeys.bintrayRepository := "releases",
BintrayKeys.bintrayVcsUrl := Some("https://github.com/palantir/parquet-mr"),
BintrayKeys.bintrayReleaseOnPublish := true,
concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
credentials += Credentials(new File(".credentials")),
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0")),
publishTo := Some("Bintray API Realm" at s"https://api.bintray.com/content/palantir/releases/spark/${version.value}"),

// Override SBT's default resolvers:
resolvers := Seq(
Expand All @@ -282,10 +275,10 @@ object SparkBuild extends PomBuild {
publishLocalConfiguration in MavenCompile <<= (packagedArtifacts, deliverLocal, ivyLoggingLevel) map {
(arts, _, level) => new PublishConfiguration(None, "dotM2", arts, Seq(), level)
},
publishMavenStyle := true,
publishMavenStyle in MavenCompile := true,
publishLocal in MavenCompile <<= publishTask(publishLocalConfiguration in MavenCompile, deliverLocal),
publishLocalBoth <<= Seq(publishLocal in MavenCompile, publishLocal).dependOn,

javacOptions in (Compile, doc) ++= {
val versionParts = System.getProperty("java.version").split("[+.\\-]+", 3)
var major = versionParts(0).toInt
Expand Down Expand Up @@ -409,8 +402,8 @@ object SparkBuild extends PomBuild {
/* Package pyspark artifacts in a separate zip file for YARN. */
enable(PySparkAssembly.settings)(assembly)

/* Enable unidoc only for the root spark project */
enable(Unidoc.settings)(spark)
// /* Enable unidoc only for the root spark project */
// enable(Unidoc.settings)(spark)

/* Catalyst ANTLR generation settings */
enable(Catalyst.settings)(catalyst)
Expand Down
2 changes: 0 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")

addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2")

addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
Expand Down

0 comments on commit a2e94f6

Please sign in to comment.