From 0afd137e7dd2edbc4ea150a7a9b1b7fd2abb80cd Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Mon, 30 Sep 2013 13:40:36 +0200
Subject: [PATCH] DATAMONGO-755 - Prepare 1.2.4.RELEASE.

Upgraded to Spring Data Core 1.5.3. Updated changelog, readme etc.
---
 pom.xml                          |  4 ++--
 src/docbkx/index.xml             |  6 +++---
 src/main/resources/changelog.txt | 10 ++++++++++
 src/main/resources/notice.txt    |  4 ++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index c6b795375..d6cd790d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.0.4.RELEASE</version>
+		<version>1.0.5.RELEASE</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
 	
@@ -29,7 +29,7 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>1.5.2.RELEASE</springdata.commons>
+		<springdata.commons>1.5.3.RELEASE</springdata.commons>
 		<mongo>2.10.1</mongo>
 	</properties>
 	
diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml
index 817fdf93d..a1545a599 100644
--- a/src/docbkx/index.xml
+++ b/src/docbkx/index.xml
@@ -52,7 +52,7 @@
     <xi:include href="introduction/why-sd-doc.xml"/>
     <xi:include href="introduction/requirements.xml"/>
     <xi:include href="introduction/getting-started.xml"/>
-    <xi:include href="https://github.com/SpringSource/spring-data-commons/raw/1.5.2.RELEASE/src/docbkx/repositories.xml">
+    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.5.3.RELEASE/src/docbkx/repositories.xml">
       <xi:fallback href="../../../spring-data-commons/src/docbkx/repositories.xml" />
     </xi:include>
   </part>
@@ -72,10 +72,10 @@
   <part id="appendix">
     <title>Appendix</title>
 
-    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.5.2.RELEASE/src/docbkx/repository-namespace-reference.xml">
+    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.5.3.RELEASE/src/docbkx/repository-namespace-reference.xml">
     	<xi:fallback href="../../../spring-data-commons/src/docbkx/repository-namespace-reference.xml" />
     </xi:include>
-    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.5.2.RELEASE/src/docbkx/repository-query-keywords-reference.xml">
+    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.5.3.RELEASE/src/docbkx/repository-query-keywords-reference.xml">
     	<xi:fallback href="../../../spring-data-commons/src/docbkx/repository-query-keywords-reference.xml" />
     </xi:include>
   </part>
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 694fc5d3d..35af77d6e 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,16 @@
 Spring Data MongoDB Changelog
 =============================
 
+Changes in version 1.2.4.GA (2013-09-30)
+----------------------------------------
+** Bug
+    * [DATAMONGO-445] - GeoNear Query Doesn't Work with Pageable
+    * [DATAMONGO-602] - Querying with $in operator on the id field of type BigInteger returns zero results
+    * [DATAMONGO-737] - Extra MongoSynchronizations cause TransactionSynchronizationManager to throw IllegalStateException on transaction complete
+** Task
+    * [DATAMONGO-742] - Document CDI integration in reference documentation
+    * [DATAMONGO-755] - Release 1.2.4
+
 Changes in version 1.2.3.GA (2013-07-24)
 ----------------------------------------
 ** Task
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index b2a5716ee..f93969073 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,5 +1,5 @@
-Spring Data Document 1.2.3
-Copyright (c) [2010-2013] SpringSource, a division of VMware, Inc.
+Spring Data Document 1.2.4
+Copyright (c) [2010-2013] 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.