Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-12 08:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #814 from uli-heller/patch-1

Browse Source 
Fixes #748 - duplicate c3p0.war
This commit is contained in:
Naoki Takezoe
2015-07-05 21:33:36 +09:00
parent cb65e790ae b0943c87c8
commit b7380a084e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/build.scala
View File

@@ -65,7 +65,7 @@ object MyBuild extends Build {
"com.mchange" % "c3p0" % "0.9.5", "com.mchange" % "c3p0" % "0.9.5",
"com.typesafe" % "config" % "1.2.1", "com.typesafe" % "config" % "1.2.1",
"com.typesafe.akka" %% "akka-actor" % "2.3.10", "com.typesafe.akka" %% "akka-actor" % "2.3.10",
"com.enragedginger" %% "akka-quartz-scheduler" % "1.3.0-akka-2.3.x" "com.enragedginger" %% "akka-quartz-scheduler" % "1.3.0-akka-2.3.x" exclude("c3p0","c3p0")
), ),
play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._", play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._",
EclipseKeys.withSource := true, EclipseKeys.withSource := true,