From 6daecbf95a443cf3ab27317fbb3a996fcb4ab3b3 Mon Sep 17 00:00:00 2001
From: Michael Nitschinger <michael@nitschinger.at>
Date: Thu, 13 Mar 2014 10:02:28 +0100
Subject: [PATCH] DATACOUCH-76 - Upgrade to latest spring-data-commons and
 parent

---
 pom.xml                          | 4 ++--
 src/main/resources/changelog.txt | 1 +
 template.mf                      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ec1dd0d..a0f10f42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,13 +14,13 @@
   <parent>
     <groupId>org.springframework.data.build</groupId>
     <artifactId>spring-data-parent</artifactId>
-    <version>1.2.0.RELEASE</version>
+    <version>1.3.1.RELEASE</version>
   </parent>
 
   <properties>
     <couchbase>1.3.2</couchbase>
     <jackson>2.3.2</jackson>
-    <springdata.commons>1.6.5.RELEASE</springdata.commons>
+    <springdata.commons>1.7.1.RELEASE</springdata.commons>
     <validation>1.0.0.GA</validation>
   </properties>
 
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 0a5c5ed9..4f3b0a73 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -10,6 +10,7 @@ Release Notes - Spring Data Couchbase - Version 1.0.0.RELEASE - 2014-03-13
     * [DATACOUCH-55] - Allow support for custom object mapping (like Date objects)
     * [DATACOUCH-72] - Update Couchbase SDK , Jackson and Spring-Data-Commons
     * [DATACOUCH-75] - Trim off find on custom repository finder methods.
+    * [DATACOUCH-76] - Upgrade to latest spring-data-commons and parent
 
 ** New Feature
     * [DATACOUCH-71] - Support for JS303 Validation (& template events)
diff --git a/template.mf b/template.mf
index 3e396567..9ee3f135 100644
--- a/template.mf
+++ b/template.mf
@@ -10,7 +10,7 @@ Import-Template:
  com.couchbase.client.*;version="${couchbase:[=.=.=,+1.0.0)}",
  net.spy.memcached.*;version="[2.8.0,3.0.0)",
  com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}",
- org.springframework.*;version="${spring30:[=.=.=.=,+1.1.0)}",
+ org.springframework.*;version="${spring:[=.=.=.=,+1.1.0)}",
  org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
  org.w3c.*;version="0.0.0",
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,