[reactivemongo] Update to ReactiveMongo 0.11.11

cchantep · Jul 25, 2016 · 13de2d1 · 13de2d1
1 parent fd7ef0c
commit 13de2d1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,8 @@ jdk:
    - openjdk7
    - oraclejdk8
 env: JAVA_OPTS="-Xms32m -Xmx128m"
-before_install:
-- sudo ./.travis_scripts/beforeInstall.sh $TRAVIS_SCALA_VERSION
+sudo: false
+#before_install:
+#- sudo ./.travis_scripts/beforeInstall.sh $TRAVIS_SCALA_VERSION
 scala:
    - 2.11.7
diff --git a/project/ReactiveMongo.scala b/project/ReactiveMongo.scala
@@ -34,7 +34,7 @@ trait ReactiveMongo { deps: Dependencies ⇒
         },
       resolvers ++= reactiveResolvers,
       libraryDependencies ++= Seq(
-        "org.reactivemongo" %% "reactivemongo" % "0.11.10",
+        "org.reactivemongo" %% "reactivemongo" % "0.11.11",
         "com.jsuereth" %% "scala-arm" % "1.4",
         "org.slf4j" % "slf4j-simple" % "1.7.13" % Test,
         "com.chuusai" % "shapeless" % "2.0.0" % Test cross CrossVersion.

diff --git a/project/deploy.sh b/project/deploy.sh
@@ -34,9 +34,9 @@ SCALA_MODULES="jdbc-scala scalac-plugin reactive-mongo"
 SCALA_VERSIONS="2.10 2.11"
 BASES=""
 
-#for M in $JAVA_MODULES; do
-#  BASES="$BASES $M/target/$M-$VERSION"
-#done
+for M in $JAVA_MODULES; do
+  BASES="$BASES $M/target/$M-$VERSION"
+done
 
 for M in $EXTRA_JAVA_MODULES; do
   B="$M/target/$M-$VERSION"

diff --git a/reactive-mongo/src/main/scala/acolyte/reactivemongo/MongoDB.scala b/reactive-mongo/src/main/scala/acolyte/reactivemongo/MongoDB.scala
@@ -2,7 +2,7 @@ package acolyte.reactivemongo
 
 import java.nio.ByteOrder
 
-import org.jboss.netty.buffer.ChannelBuffers
+import shaded.netty.buffer.ChannelBuffers
 
 import scala.util.Try
 

diff --git a/reactive-mongo/src/main/scala/acolyte/reactivemongo/Request.scala b/reactive-mongo/src/main/scala/acolyte/reactivemongo/Request.scala
@@ -1,6 +1,6 @@
 package acolyte.reactivemongo
 
-import org.jboss.netty.buffer.ChannelBuffer
+import shaded.netty.buffer.ChannelBuffer
 
 import reactivemongo.bson.{ BSONArray, BSONDocument, BSONString, BSONValue }
 import reactivemongo.bson.buffer.{