From 189ec98b93c25ed9fc6a193950e5c883f90dcbf4 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Thu, 14 Nov 2013 21:12:18 +0000
Subject: [PATCH] DATACOUCH-46 - Final preparations for 1.0 M2.

Upgraded to Spring Data Commons 1.6.2. Added necessary Maven plugins to actually build a distribution ZIP. Polished changelog and notice.txt.
---
 pom.xml                          | 15 ++++++++++++++-
 src/main/resources/changelog.txt |  1 -
 src/main/resources/notice.txt    |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6ae4055a..4a40379b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <properties>
     <couchbase>1.2.2</couchbase>
     <jackson>2.2.3</jackson>
-    <springdata.commons>1.6.1.RELEASE</springdata.commons>
+    <springdata.commons>1.6.2.RELEASE</springdata.commons>
   </properties>
 
   <dependencies>
@@ -110,4 +110,17 @@
     </pluginRepository>
   </pluginRepositories>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>wagon-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 8d2a8bfd..075e2eb4 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,5 @@
 Release Notes - Spring Data Couchbase - Version 1.0 M2 - 2013-11-14
 -------------------------------------------------------------------
-
 ** Bug
     * [DATACOUCH-25] - Cache TTL (Time To Live) property required.
     * [DATACOUCH-27] - MappingCouchbaseConverter skips ID field in read operation
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index 0d9b7a62..3afcb545 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,4 +1,4 @@
-Spring Data Couchbase 1.0 M1
+Spring Data Couchbase 1.0 M2
 Copyright (c) [2013] Couchbase / Pivotal Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").