Skip to content

Commit

Permalink
update project to present.
Browse files Browse the repository at this point in the history
  • Loading branch information
minyk committed May 21, 2019
1 parent 716a791 commit eb38fa6
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 122 deletions.
61 changes: 59 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,60 @@
net.virtualvoid.sbt.graph.Plugin.graphSettings
//net.virtualvoid.sbt.graph.Plugin.graphSettings

scalaVersion := "2.10.5"
scalaVersion := "2.11.11"

resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
resolvers += "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases/"
resolvers += "Akka Repository" at "http://repo.akka.io/releases/"
resolvers += "Spray Repository" at "http://repo.spray.cc/"
resolvers += "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases"

libraryDependencies ++= Seq(
"org.apache.spark" %% "spark-core" % "2.4.0" % "provided",
"org.apache.hadoop" % "hadoop-client" % "2.9.2" % "provided",
"com.google.guava" % "guava" % "14.0.1",
"org.specs2" %% "specs2" % "3.7" % "test"
)

// lazy val commonSettings = Seq(
// organization := "com.nexr",
// version := "0.2",
// description := "Simple terasort.",
// scalaVersion := "2.11.11",
// scalacOptions := Seq("-deprecation", "-encoding", "utf8"),
// resolvers
// )

// lazy val app = (project in file(".")).
// settings(commonSettings: _*).
// settings(
// assemblyJarName in assembly := {
// name.value + "-" + version.value + ".jar"
// },
//
// // Drop these jars
// //excludedJars in assembly := (fullClasspath in assembly) { (cp) =>
// // val excludes = Set(
// // "jsp-api-2.1-6.1.14.jar",
// // "jsp-2.1-6.1.14.jar",
// // "jasper-compiler-5.5.12.jar",
// // "commons-beanutils-core-1.8.0.jar",
// // "commons-beanutils-1.7.0.jar",
// // "servlet-api-2.5-20081211.jar",
// // "servlet-api-2.5.jar"
// // )
// // cp filter { jar => excludes(jar.data.getName) }
// //},
//
// //mergeStrategy in assembly := (mergeStrategy in assembly) {
// // // case "project.clj" => MergeStrategy.discard // Leiningen build files
// // case x if x.startsWith("META-INF") => MergeStrategy.discard // Bumf
// // case x if x.startsWith("hadoop") && x.contains("2.9.2") => MergeStrategy.discard
// // case x if x.endsWith(".html") => MergeStrategy.discard // More bumf
// // case x if x.endsWith("package-info.class") => MergeStrategy.last
// // case PathList("com", "esotericsoftware", xs @ _*) => MergeStrategy.last // For Log$Logger.class
// // case x =>
// // val oldStrategy = (mergeStrategy in assembly).value
// // oldStrategy(x)
// //}
// )
54 changes: 0 additions & 54 deletions project/BuildSettings.scala

This file was deleted.

26 changes: 0 additions & 26 deletions project/Dependencies.scala

This file was deleted.

27 changes: 0 additions & 27 deletions project/ProjectBuild.scala

This file was deleted.

6 changes: 3 additions & 3 deletions project/build.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#Thu Mar 05 13:54:53 KST 2015
project.name=spark-terasort
project.version=0.1
sbt.version=0.13.5
build.scala.versions=2.10.5
project.version=0.2
sbt.version=1.2.8
build.scala.versions=2.11.11
12 changes: 2 additions & 10 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
logLevel := Level.Warn

resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")

resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"

resolvers += "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases/"

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

addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")

addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
1 change: 1 addition & 0 deletions src/main/resources/parameters.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash
HADOOP_USER=root
HDFS_USER=hdfs
SLEEP_BETWEEN_RUNS=60
Expand Down

0 comments on commit eb38fa6

Please sign in to comment.