Permalink
Browse files

Findbugs is not needed as a dependency at runtime. Upgrading Javassis…

…t to the new organization (org.javassist) and the latest GA release.
  • Loading branch information...
1 parent a69d41b commit b9aae3fca1d1699d2d491f08d91e4e4f69e43191 @guillaumebort guillaumebort committed May 1, 2012
Showing with 10 additions and 6 deletions.
  1. +1 −0 .gitignore
  2. +5 −2 framework/project/Build.scala
  3. +4 −4 framework/runtests
View
@@ -20,3 +20,4 @@ RUNNING_PID
.cache
*.iml
documentation/*.pdf
+framework/test/integrationtest-java/conf/evolutions/
@@ -179,7 +179,10 @@ object PlayBuild extends Build {
"com.github.scala-incubator.io" %% "scala-io-file" % "0.2.0",
"com.typesafe.akka" % "akka-actor" % "2.0.1",
"com.typesafe.akka" % "akka-slf4j" % "2.0.1",
- "com.google.guava" % "guava" % "10.0.1",
+
+ ("com.google.guava" % "guava" % "10.0.1" notTransitive())
+ .exclude("com.google.code.findbugs", "jsr305")
+ ,
("org.avaje" % "ebean" % "2.7.3" notTransitive())
.exclude("javax.persistence", "persistence-api")
@@ -216,7 +219,7 @@ object PlayBuild extends Build {
"joda-time" % "joda-time" % "2.0",
"org.joda" % "joda-convert" % "1.1",
- "javassist" % "javassist" % "3.12.1.GA",
+ "org.javassist" % "javassist" % "3.16.1-GA",
"commons-lang" % "commons-lang" % "2.6",
("com.ning" % "async-http-client" % "1.7.0" notTransitive())
View
@@ -25,7 +25,7 @@ echo "[info]"
echo "[info] ---- RUNNING INTEGRATION TEST"
echo "[info]"
-$PLAY "$@" clean test
+$PLAY "$@" clean-all test
cd $CURRENT
cd ./test/integrationtest-java
@@ -34,7 +34,7 @@ echo "[info]"
echo "[info] ---- RUNNING JAVA INTEGRATION TEST"
echo "[info]"
-$PLAY "$@" clean test
+$PLAY "$@" clean-all test
cd $CURRENT
cd ./test/integrationtest-scala
@@ -43,7 +43,7 @@ echo "[info]"
echo "[info] ---- RUNNING SCALA INTEGRATION TEST"
echo "[info]"
-$PLAY "$@" clean test
+$PLAY "$@" clean-all test
cd $CURRENT
@@ -58,7 +58,7 @@ do
echo "[info] ---- TESTING ${i/app/}"
echo "[info]"
cd ${i/app/}
- $PLAY "$@" clean test
+ $PLAY "$@" clean-all test
cd $CURRENT
done

0 comments on commit b9aae3f

Please sign in to comment.