diff --git a/project/build.scala b/project/build.scala index b7ff453..5668beb 100644 --- a/project/build.scala +++ b/project/build.scala @@ -1,7 +1,6 @@ import sbt._ import Keys._ import org.scalatra.sbt._ -import com.typesafe.sbteclipse.plugin.EclipsePlugin.EclipseKeys import play.twirl.sbt.SbtTwirl import play.twirl.sbt.Import.TwirlKeys._ import sbtassembly._ @@ -60,7 +59,7 @@ "com.typesafe.slick" %% "slick" % "2.1.0", "com.novell.ldap" % "jldap" % "2009-10-07", "com.h2database" % "h2" % "1.4.180", -// "ch.qos.logback" % "logback-classic" % "1.0.13" % "runtime", + "ch.qos.logback" % "logback-classic" % "1.1.1" % "container", "org.eclipse.jetty" % "jetty-webapp" % "8.1.16.v20140903" % "container;provided", "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts Artifact("javax.servlet", "jar", "jar"), "junit" % "junit" % "4.12" % "test", @@ -70,7 +69,6 @@ "com.enragedginger" %% "akka-quartz-scheduler" % "1.3.0-akka-2.3.x" exclude("c3p0","c3p0") ), play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._", - EclipseKeys.withSource := true, javacOptions in compile ++= Seq("-target", "7", "-source", "7"), testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console"), javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test", diff --git a/project/plugins.sbt b/project/plugins.sbt index e19dd70..7eee39e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,5 @@ scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature") -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0") -addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0") addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.5") addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.4") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.8")