From 931055e6fc30232858ba40478d9c326e4f26b18d Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Tue, 4 Aug 2015 18:35:30 +0200
Subject: [PATCH] DATACOUCH-150 - Prepare 2.0.0.M1.

Updated changelog and pom.
---
 pom.xml                          |  8 ++++----
 src/main/resources/changelog.txt | 33 ++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd494a1a..be4f449a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,8 +24,8 @@
 
         <couchbase>2.2.0-dp2</couchbase>
         <couchbase.osgi>2.2.0</couchbase.osgi>
-        <jackson>2.3.2</jackson>
-        <springdata.commons>1.11.0.BUILD-SNAPSHOT</springdata.commons>
+        <jackson>2.6.0</jackson>
+        <springdata.commons>1.11.0.RC1</springdata.commons>
         <validation>1.0.0.GA</validation>
     </properties>
 
@@ -125,8 +125,8 @@
 
     <repositories>
         <repository>
-            <id>spring-libs-snapshot</id>
-            <url>https://repo.spring.io/libs-snapshot</url>
+            <id>spring-libs-milestone</id>
+            <url>https://repo.spring.io/libs-milestone</url>
         </repository>
         <repository>
             <id>couchbase</id>
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index ec6ddab1..422da91a 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,21 +1,26 @@
 Spring Data Couchbase Changelog
 ===============================
 
-New Major Version: 2.0
-----------------------
-This version is a complete rewrite of the Spring Data Couchbase project, using the newer 2.x generation
-of the Couchbase Java SDK.
-
-Changes in version 2.0.0.M1 (2015-07-03)
+Changes in version 2.0.0.M2 (2015-08-04)
 ----------------------------------------
- * DATACOUCH-135 - Migrate to Couchbase SDK 2.2.0-dp, with support for N1QL in template
-
-
-=================================================================================
-| Below are older release notes for the 1st generation of Spring Data Couchbase |
-| (based on the 1.x Couchbase Java SDK)                                         |
-=================================================================================
-
+* DATACOUCH-134 - Support Bucket Shadowing.
+* DATACOUCH-135 - Migrate to Couchbase SDK 2.2.0-dp, with support for N1QL in template.
+* DATACOUCH-136 - Add N1QL query annotation.
+* DATACOUCH-137 - Allow query derivation from @N1QL annotated methods.
+* DATACOUCH-139 - Implement @View as minimalistic query derivation.
+* DATACOUCH-140 - Use Converter on method parameters when deriving query.
+* DATACOUCH-141 - Change query lookup order and make N1QL default.
+* DATACOUCH-142 - Document changes from 1.4 to 2.0 and migration cheat sheet.
+* DATACOUCH-143 - Log repository queries in DEBUG.
+* DATACOUCH-144 - Detect N1QL is unsupported and fail fast.
+* DATACOUCH-145 - Use SDK's Field/Id annotations.
+* DATACOUCH-148 - Allow global configuration of default staleness parameter for view queries.
+* DATACOUCH-149 - Switch from BeanWrapper to PersistentPropertyAccessor.
+* DATACOUCH-150 - Release version 2.0 M1.
+* DATACOUCH-152 - Bump SDK version to 2.2.0-dp2 and make adjustements.
+* DATACOUCH-154 - Use consistent method to guess desing document.
+* DATACOUCH-155 - Escape every field name in N1QL queries.
+* DATACOUCH-156 - Filter on type information in generated N1QL queries.
 
 Changes in version 1.4.0.RC1 (2015-08-04)
 -----------------------------------------