From 8fb93e7484f5e6bdf0b1e543f1e8fa135502d133 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Mon, 24 Feb 2014 14:40:59 +0100
Subject: [PATCH] DATAREST-249 - Prepare 2.0.0.RELEASE.

Upgraded to release versions of Spring Data modules. Updated change log and notice.txt.
---
 pom.xml                          | 14 +++++++-------
 src/main/resources/changelog.txt | 21 +++++++++++++++++++++
 src/main/resources/notice.txt    |  4 ++--
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0df307aec..98761b112 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.3.0.BUILD-SNAPSHOT</version>
+		<version>1.3.0.RELEASE</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
 
@@ -27,10 +27,10 @@
 		<project.type>multi</project.type>
 		<dist.id>spring-data-rest</dist.id>
 
-		<springdata.commons>1.7.0.BUILD-SNAPSHOT</springdata.commons>
-		<springdata.jpa>1.5.0.BUILD-SNAPSHOT</springdata.jpa>
-		<springdata.mongodb>1.4.0.BUILD-SNAPSHOT</springdata.mongodb>
-		<springdata.neo4j>3.0.0.BUILD-SNAPSHOT</springdata.neo4j>
+		<springdata.commons>1.7.0.RELEASE</springdata.commons>
+		<springdata.jpa>1.5.0.RELEASE</springdata.jpa>
+		<springdata.mongodb>1.4.0.RELEASE</springdata.mongodb>
+		<springdata.neo4j>3.0.0.RELEASE</springdata.neo4j>
 		<springdata.gemfire>1.3.3.RELEASE</springdata.gemfire>
 
 		<hibernate.version>4.2.0.Final</hibernate.version>
@@ -150,8 +150,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-snapshot</id>
-			<url>http://repo.spring.io/libs-snapshot</url>
+			<id>spring-libs-release</id>
+			<url>http://repo.spring.io/libs-release</url>
 		</repository>
 	</repositories>
 	
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index b640cf4d7..b51742afe 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,27 @@
 Spring Data REST Changelog
 ==========================
 
+Changes in version 2.0.0.RELEASE (2014-02-24)
+---------------------------------------------
+** Bug
+    * [DATAREST-50] - Properties with null values are always omitted from the JSON
+    * [DATAREST-117] - @JsonIgnore and other Jackson annotations are ignored
+    * [DATAREST-143] - PUT of entity with links fails..
+    * [DATAREST-216] - AOP proxying does not work for findOne(ID) method
+    * [DATAREST-217] - Crud or PagingAndSorting based repository entites still listed when findAll method is 'exported = false'
+    * [DATAREST-238] - PUT on entity with self links causes changes to be overwritten with old values
+    * [DATAREST-246] - ValidatingRepositoryEventListener should use Repositories more lenient
+    * [DATAREST-250] - Embedded associations do not get rendered
+
+** Improvement
+    * [DATAREST-95] - Add support for partial updates using PATCH
+    * [DATAREST-228] - Add enforcer plugin to the maven build process
+    * [DATAREST-248] - Creating resources using POST should support providing URIs for non-optional associations
+    * [DATAREST-252] - Documentation overhaul
+
+** Task
+    * [DATAREST-249] - Release 2.0 GA
+
 Changes in version 2.0.0.RC1 (2014-01-29)
 -----------------------------------------
 ** Bug
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index 57c97ba65..c61fc5ba7 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,5 +1,5 @@
-Spring Data REST ${version}
-Copyright (c) 2012-${copyright} SpringSource, a division of VMware, Inc.
+Spring Data REST 2.0 RELEASE
+Copyright (c) 2012-2014 Pivotal Software, 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