diff --git a/casbah-core/src/test/scala/QueryIntegrationSpec.scala b/casbah-core/src/test/scala/QueryIntegrationSpec.scala index 5ad4d82d..f02ab8c9 100644 --- a/casbah-core/src/test/scala/QueryIntegrationSpec.scala +++ b/casbah-core/src/test/scala/QueryIntegrationSpec.scala @@ -153,6 +153,8 @@ class QueryIntegrationSpec extends CasbahDBTestSpecification { "$max" should { "Work with a single pair" in { + serverIsAtLeastVersion(2, 46) must beTrue.orSkip("Needs server >= 2.6") + collection.drop() collection += MongoDBObject("hello" -> "world", "foo" -> 5.0) @@ -160,6 +162,8 @@ class QueryIntegrationSpec extends CasbahDBTestSpecification { collection.findOne().get("foo") must beEqualTo(6) } "Work with multiple pairs" in { + serverIsAtLeastVersion(2, 46) must beTrue.orSkip("Needs server >= 2.6") + collection.drop() collection += MongoDBObject("hello" -> "world", "foo" -> 5.0, "bar" -> 5.0) diff --git a/casbah-query/src/main/scala/BarewordOperators.scala b/casbah-query/src/main/scala/BarewordOperators.scala index 8484113c..6814a4d6 100644 --- a/casbah-query/src/main/scala/BarewordOperators.scala +++ b/casbah-query/src/main/scala/BarewordOperators.scala @@ -173,7 +173,7 @@ trait IncOp extends BarewordQueryOperator { * * {{{ \$max ("foo" -> 5.0, "bar" -> 1.6) }}} * - * @since 2.7 + * @since 2.8 * @see http://docs.mongodb.org/manual/reference/operator/update/max/ */ trait MaxOp extends BarewordQueryOperator { diff --git a/project/CasbahBuild.scala b/project/CasbahBuild.scala index 80a5d950..58c64b10 100644 --- a/project/CasbahBuild.scala +++ b/project/CasbahBuild.scala @@ -15,7 +15,7 @@ object CasbahBuild extends Build { lazy val buildSettings = Seq( organization := "org.mongodb", organizationHomepage := Some(url("http://www.mongodb.org")), - version := "2.8.0-RC2", + version := "2.8.0", scalaVersion := "2.10.4", crossScalaVersions := Seq("2.11.5", "2.10.4", "2.9.3") ) @@ -139,7 +139,7 @@ object CasbahBuild extends Build { object Dependencies { //val mongoJavaDriver = "org.mongodb" % "mongo-java-driver" % "3.0.0-SNAPSHOT" - val mongoJavaDriver = "org.mongodb" % "mongo-java-driver" % "2.13.0-rc2" + val mongoJavaDriver = "org.mongodb" % "mongo-java-driver" % "2.13.0" val slf4j = "org.slf4j" % "slf4j-api" % "1.6.0" val junit = "junit" % "junit" % "4.10" % "test" val slf4jJCL = "org.slf4j" % "slf4j-jcl" % "1.6.0" % "test" diff --git a/src/sphinx/changelog.rst b/src/sphinx/changelog.rst index ebf72e0f..234a4e02 100644 --- a/src/sphinx/changelog.rst +++ b/src/sphinx/changelog.rst @@ -5,6 +5,11 @@ Changelog Casbah jira project is here: https://jira.mongodb.org/browse/CASBAH +Changes in Version 2.8.0 +------------------------ +- Updated Mongo Java Driver to 2.13.0 (https://github.com/mongodb/mongo-java-driver/releases/tag/r2.13.0) (CASBAH-156) +- Added support for $max in DSL (https://github.com/mongodb/casbah/pull/69) (CASBAH-163) + Changes in Version 2.8.0-rc2 ---------------------------- - Updated Mongo Java Driver to 2.13.0-rc2 (https://github.com/mongodb/mongo-java-driver/releases/tag/r2.13.0-rc2) (CASBAH-156) diff --git a/src/sphinx/conf.py b/src/sphinx/conf.py index 0d4e31c7..6e783457 100644 --- a/src/sphinx/conf.py +++ b/src/sphinx/conf.py @@ -49,9 +49,9 @@ # built documents. # # The short X.Y version. -version = '2.7' +version = '2.8' # The full version, including alpha/beta/rc tags. -release = '2.7.5' +release = '2.8.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/src/sphinx/guide/installation_alt.rst b/src/sphinx/guide/installation_alt.rst index 548dcba1..6c970f31 100644 --- a/src/sphinx/guide/installation_alt.rst +++ b/src/sphinx/guide/installation_alt.rst @@ -72,7 +72,7 @@ releases and should be considered (and kept) stable. .. |scala_versions| replace:: 2.9.3, 2.10.x, 2.11.x .. |all_dep_urls| replace:: - http://oss.sonatype.org/content/repositories/releases/org/mongodb/casbah_2.11/2.7.5/casbah-alldep_2.11-2.7.5.jar - http://oss.sonatype.org/content/repositories/releases/org/mongodb/casbah_2.10/2.7.5/casbah-alldep_2.10-2.7.5.jar - http://oss.sonatype.org/content/repositories/releases/org/mongodb/casbah_2.9.3/2.7.5/casbah-alldep_2.9.3-2.7.5.jar + http://oss.sonatype.org/content/repositories/releases/org/mongodb/casbah_2.11/2.8.0/casbah-alldep_2.11-2.8.0.jar + http://oss.sonatype.org/content/repositories/releases/org/mongodb/casbah_2.10/2.8.0/casbah-alldep_2.10-2.8.0.jar + http://oss.sonatype.org/content/repositories/releases/org/mongodb/casbah_2.9.3/2.8.0/casbah-alldep_2.9.3-2.8.0.jar