diff --git a/README.md b/README.md
index 1d7d9bafe..11b7c5a24 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Add the Maven dependency:
org.springframework.data
spring-data-mongodb
- 1.3.2.RELEASE
+ 1.3.3.RELEASE
```
diff --git a/pom.xml b/pom.xml
index 088488300..fea1c32f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
org.springframework.data.build
spring-data-parent
- 1.3.0.BUILD-SNAPSHOT
+ 1.3.0.RC1
../spring-data-build/parent/pom.xml
@@ -29,7 +29,7 @@
multi
spring-data-mongodb
- 1.7.0.BUILD-SNAPSHOT
+ 1.7.0.RC1
2.11.4
@@ -89,6 +89,17 @@
+1
+
+ cstrobl
+ Christoph Strobl
+ cstrobl at gopivotal.com
+ Pivotal
+ http://www.gopivotal.com
+
+ Developer
+
+ +1
+
@@ -105,6 +116,11 @@
spring-libs-snapshot
http://repo.spring.io/libs-snapshot
+
+
+ spring-libs-milestone
+ http://repo.springsource.org/libs-milestone-local
+
diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml
index 71ffaf618..72acfa2c8 100644
--- a/src/docbkx/index.xml
+++ b/src/docbkx/index.xml
@@ -56,7 +56,7 @@
-
+
@@ -76,10 +76,10 @@
Appendix
-
+
-
+
diff --git a/src/docbkx/introduction/getting-started.xml b/src/docbkx/introduction/getting-started.xml
index afb7c9201..1b38ad2a1 100644
--- a/src/docbkx/introduction/getting-started.xml
+++ b/src/docbkx/introduction/getting-started.xml
@@ -40,12 +40,12 @@
For information on the Spring Data Mongo source code repository,
nightly builds and snapshot artifacts please see the Spring Data Mongo
+ url="http://projects.spring.io/spring-data-mongodb/">Spring Data Mongo
homepage.
You can help make Spring Data best serve the needs of the Spring
community by interacting with developers through the Spring Community
- forums. To follow
+ forums. To follow
developer activity look for the mailing list information on the Spring
Data Mongo homepage.
@@ -55,10 +55,10 @@
To stay up to date with the latest news and announcements in the
Spring eco system, subscribe to the Spring Community Portal.
+ url="https://spring.io">Portal.
Lastly, you can follow the SpringSource Data blog or
+ url="https://spring.io/blog">blog or
the project team on Twitter (SpringData)
diff --git a/src/docbkx/introduction/introduction.xml b/src/docbkx/introduction/introduction.xml
index 5d9eb2bca..00c3a108f 100644
--- a/src/docbkx/introduction/introduction.xml
+++ b/src/docbkx/introduction/introduction.xml
@@ -12,17 +12,17 @@
Knowing Spring
Spring Data uses Spring framework's core
+ url="http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/spring-core.html">core
functionality, such as the IoC
+ url="http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/beans.html">IoC
container, type
+ url="http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/validation.html#core-convert">type
conversion system, expression
+ url="http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/expressions.html">expression
language, JMX
+ url="http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/jmx.html">JMX
integration, and portable DAO
+ url="http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/dao.html#dao-exceptions">DAO
exception hierarchy. While it is not important to know the
Spring APIs, understanding the concepts behind them is. At a minimum,
the idea behind IoC should be familiar for whatever IoC container you
@@ -40,7 +40,7 @@
(and sometimes disarming) documentation that explains in detail the
Spring Framework. There are a lot of articles, blog entries and books on
the matter - take a look at the Spring framework home page for
+ url="https://spring.io/docs">home page for
more information.
Knowing NoSQL and Document databases
diff --git a/src/docbkx/introduction/requirements.xml b/src/docbkx/introduction/requirements.xml
index 526164c98..af591655e 100644
--- a/src/docbkx/introduction/requirements.xml
+++ b/src/docbkx/introduction/requirements.xml
@@ -3,7 +3,7 @@
Spring Data Document 1.x binaries requires JDK level 6.0 and above,
and
- Spring Framework
+ Spring Framework
3.0.x and above.
diff --git a/src/docbkx/reference/jmx.xml b/src/docbkx/reference/jmx.xml
index 5535566b4..00e9b75ea 100644
--- a/src/docbkx/reference/jmx.xml
+++ b/src/docbkx/reference/jmx.xml
@@ -10,7 +10,7 @@
you perform administrative operations such as drop or create a database. The
JMX features build upon the JMX feature set available in the Spring
Framework. See here
+ url="http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/jmx.html">here
for more details.
@@ -20,7 +20,7 @@
functionality
- XML schmea to configure MongoDB
+ XML schema to configure MongoDB
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
diff --git a/src/docbkx/reference/mapping.xml b/src/docbkx/reference/mapping.xml
index 3e1cdb653..62d6d369b 100644
--- a/src/docbkx/reference/mapping.xml
+++ b/src/docbkx/reference/mapping.xml
@@ -638,7 +638,7 @@ public class Person {
Spring 3.0 introduced a core.convert package that provides a
general type conversion system. This is described in detail in the
Spring reference documentation section entitled Spring
+ url="http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/validation.html#core-convert">Spring
3 Type Conversion.
diff --git a/src/docbkx/reference/mongodb.xml b/src/docbkx/reference/mongodb.xml
index 2705080db..16e2387c6 100644
--- a/src/docbkx/reference/mongodb.xml
+++ b/src/docbkx/reference/mongodb.xml
@@ -248,7 +248,7 @@ public class MongoApp {
Examples Repository
There is an github
+ url="https://github.com/spring-projects/spring-data-document-examples">github
repository with several examples that you can download and play
around with to get a feel for how the library works.
@@ -264,9 +264,9 @@ public class MongoApp {
For those not familiar with how to configure the Spring
container using Java based bean metadata instead of XML based metadata
see the high level introduction in the reference docs here as well as the detailed documentation
+ url="http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/beans.html#beans-java-instantiating-container">
here.
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 2ac392276..96d85974e 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,53 @@
Spring Data MongoDB Changelog
=============================
+Changes in version 1.4.0.RC1 (2014-01-29)
+---------------------------------------------
+
+** Bug
+ * [DATAMONGO-407] - Collection with generics losing element type after $set update
+ * [DATAMONGO-686] - ClassCastException while reusing Query object
+ * [DATAMONGO-726] - References to non existing classes in namespace XSD
+ * [DATAMONGO-804] - EnableMongoRepositories repositoryImplementationPostfix() default is empty String instead of "Impl"
+ * [DATAMONGO-805] - Excluding DBRef field in a query causes a MappingException
+ * [DATAMONGO-806] - Spring Data MongoDB - Aggregation Framework - No property _id found for type com.entity.User
+ * [DATAMONGO-807] - using findAndModify removes the _class field of encapsulated classes, causing MappingInstantiationException
+ * [DATAMONGO-808] - Spring data mongoDB not working with IPv6 address directly
+ * [DATAMONGO-811] - updateFirst methods do not increment @Version field
+ * [DATAMONGO-816] - Unable to execute query with DocumentCallbackHandler when query contains Criteria with enums.
+** Improvement
+ * [DATAMONGO-778] - Create geospatial index of type other than 2d with @GeoSpatialIndexed
+ * [DATAMONGO-785] - Add support for geospatial 2Dsphere and geohaystack index types
+ * [DATAMONGO-787] - Guard against SpEL issue in Spring 3.2.4
+ * [DATAMONGO-799] - Fix failing test in MongoTemplateTests on Mongo 2.5.x
+ * [DATAMONGO-802] - Change AbstractMongoConfiguration.mongoDbFactory() to return MongoDbFactory
+ * [DATAMONGO-813] - GridFsTemplate.getResource(location) throws NPE if don't find file
+ * [DATAMONGO-822] - Add support for eager CDI repository instantiation
+ * [DATAMONGO-823] - Add bucket attribute to
+ * [DATAMONGO-837] - Upgrade MongoDB Java driver to 2.11.4
+** Task
+ * [DATAMONGO-790] - Ensure compatibility with Spring Framework 4.0
+ * [DATAMONGO-824] - Add contribution guidelines
+ * [DATAMONGO-826] - Release Spring Data MongoDB 1.4.0.RC1
+ * [DATAMONGO-835] - Code cleanups
+
+Changes in version 1.3.3.RELEASE (2013-12-11)
+---------------------------------------------
+** Bug
+ * [DATAMONGO-726] - Fixed classname references in namespace XSDs.
+ * [DATAMONGO-788] - Projection operations do not render synthetic fields properly.
+ * [DATAMONGO-795] - When adding custom converters to the mongo template it is possible to get unpredictable behaviour
+ * [DATAMONGO-804] - Fix default annotation attribute value for repositoryImplementationPostfix().
+ * [DATAMONGO-806] - Fixed invalid rendering of id field references.
+ * [DATAMONGO-768] - Improve documentation of how to use @PersistenceConstructor
+
+** Improvement
+ * [DATAMONGO-791] - Added newAggregation(…) overloads to accept a List.
+ * [DATAMONGO-799] - Fix failing test in MongoTemplateTests on Mongo 2.5.x
+ * [DATAMONGO-800] - Improved AuditingIntegrationTests.
+** Task
+ * [DATAMONGO-810] - Release 1.3.3
+
Changes in version 1.4.0.M1 (2013-11-19)
---------------------------------------------
** Bug
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index dac0e4227..8c9d07ecd 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,5 +1,5 @@
-Spring Data Document 1.4.0 M1
-Copyright (c) [2010-2013] Pivotal Inc.
+Spring Data MongoDB 1.4.0 RC1
+Copyright (c) [2010-2014] Pivotal Inc.
This product is licensed to you under the Apache License, Version 2.0 (the "License").
You may not use this product except in compliance with the License.
diff --git a/src/main/resources/readme.txt b/src/main/resources/readme.txt
index 2ccd716d5..86210102b 100644
--- a/src/main/resources/readme.txt
+++ b/src/main/resources/readme.txt
@@ -1,4 +1,4 @@
-SPRING DATA MongoDB 1.4.0.M1
+SPRING DATA MongoDB 1.4.0.RC1
-----------------------------
Spring Data MongoDB is released under the terms of the Apache Software License Version 2.0 (see license.txt).