From 8f0dcecdb2cbf51eed6467c679967b555268735b Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Thu, 10 Jul 2014 13:14:41 +0200
Subject: [PATCH] #208 - Prepare 0.15.0.RELEASE.

Build and test dependency updates. Fixed JSON in VndErrors reference file as the order of the properties has changed after Jackson upgrade.
---
 pom.xml                                       | 16 +++++++--------
 src/main/resources/changelog.txt              | 10 ++++++++++
 .../hateoas/support/ChangelogCreator.java     |  2 +-
 src/test/resources/vnderror2.json             | 20 +++++++++----------
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index d9acbf84..8d2a5094 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.version>3.2.9.RELEASE</spring.version>
 		<logback.version>1.1.2</logback.version>
-		<jackson.version>2.3.3</jackson.version>
+		<jackson.version>2.4.1</jackson.version>
 		<jaxrs.version>1.0</jaxrs.version>
 		<minidevjson.version>1.1.1</minidevjson.version>
 		<jsonpath.version>0.9.1</jsonpath.version>
@@ -161,7 +161,7 @@
 			<version>${evo.version}</version>
 			<optional>true</optional>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -227,14 +227,14 @@
 		<dependency>
 			<groupId>xmlunit</groupId>
 			<artifactId>xmlunit</artifactId>
-			<version>1.3</version>
+			<version>1.5</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>net.jadler</groupId>
 			<artifactId>jadler-all</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.1</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -254,7 +254,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5.1</version>
+				<version>3.1</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -281,7 +281,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.1</version>
+				<version>2.5</version>
 				<configuration>
 					<useDefaultManifestFile>true</useDefaultManifestFile>
 				</configuration>
@@ -290,7 +290,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.1.2</version>
+				<version>2.2.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -304,7 +304,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.8</version>
+				<version>2.9.1</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 9e31d680..194d6278 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,16 @@
 Spring HATEOAS Changelog
 ========================
 
+Changes in version 0.15.0.RELEASE (2014-07-10)
+----------------------------------------------
+- #212 - Traversion should be able to return the last link found.
+- #203 - Traverson can now take a customized RestTemplate.
+- #201 - Make RestTemplate of Traverson configurable.
+- #200 - Updated reference documentation to explain CurieProvider API.
+- #185 - Add support for link discovery for other media types than HAL to Traverson.
+- #183 - Curie documentation or example.
+- #141 - Add support for ALPS.
+
 Changes in version 0.14.0.RELEASE (2014-06-30)
 ----------------------------------------------
 - #206 - Set classloader for dummy method proxies.
diff --git a/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java b/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java
index 274e162f..31b99d1e 100644
--- a/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java
+++ b/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java
@@ -30,7 +30,7 @@ import com.jayway.jsonpath.JsonPath;
  */
 class ChangelogCreator {
 
-	private static final int MILESTONE_ID = 14;
+	private static final int MILESTONE_ID = 15;
 	private static final String URI_TEMPLATE = "https://api.github.com/repos/spring-projects/spring-hateoas/issues?milestone={id}&state=closed";
 
 	public static void main(String... args) throws Exception {
diff --git a/src/test/resources/vnderror2.json b/src/test/resources/vnderror2.json
index bd759369..f3faf2d7 100644
--- a/src/test/resources/vnderror2.json
+++ b/src/test/resources/vnderror2.json
@@ -1,4 +1,6 @@
 [ {
+  "logref" : "42",
+  "message" : "Validation failed!",
   "_links" : {
     "describes" : {
       "href" : "http://..."
@@ -6,10 +8,10 @@
     "help" : {
       "href" : "http://..."
     }
-  },
-  "logref" : "42",
-  "message" : "Validation failed!"
+  }
 }, {
+  "logref" : "42",
+  "message" : "Validation failed!",
   "_links" : {
     "describes" : {
       "href" : "http://..."
@@ -17,10 +19,10 @@
     "help" : {
       "href" : "http://..."
     }
-  },
-  "logref" : "42",
-  "message" : "Validation failed!"
+  }
 }, {
+  "logref" : "42",
+  "message" : "Validation failed!",
   "_links" : {
     "describes" : {
       "href" : "http://..."
@@ -28,7 +30,5 @@
     "help" : {
       "href" : "http://..."
     }
-  },
-  "logref" : "42",
-  "message" : "Validation failed!"
-} ]
\ No newline at end of file
+  }
+} ]