Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#126 - Prepare 0.9 release.

Browse Source 
Updated change log so far. Upgraded to latest dependency versions. Polished porject information in pom.xml. Added Spring dependencies that we directly depend on. Adapted test cases to changes in Jackson 2 output format. Updated ChangelogCreator to latest milestone and repository URI.
This commit is contained in:
Oliver Gierke
2014-01-21 13:11:51 +01:00
parent b0cfaf7a62
commit 4d9373abcb
8 changed files with 108 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
pom.xml
View File

@@ -16,16 +16,16 @@
<inceptionYear>2012</inceptionYear>
<organization>
<name>SpringSource, a division of VMware</name>
<url>http://www.springsource.org</url>
<name>Pivotal, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<developers>
<developer>
<id>ogierke</id>
<name>Oliver Gierke</name>
<email>ogierke(at)vmware.com</email>
<organization>SpringSource, a division of VMware</organization>
<email>ogierke(at)gopivotal.com</email>
<organization>Pivotal, Inc.</organization>
<roles>
<role>Project lead</role>
</roles>
@@ -59,19 +59,38 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>3.2.6.RELEASE</spring.version>
<logback.version>1.0.9</logback.version>
<jackson1.version>1.9.10</jackson1.version>
<jackson2.version>2.2.0</jackson2.version>
<logback.version>1.0.13</logback.version>
<jackson1.version>1.9.13</jackson1.version>
<jackson2.version>2.3.0</jackson2.version>
<jaxrs.version>1.0</jaxrs.version>
<jsonpath.version>0.8.1</jsonpath.version>
<minidevjson.version>1.1.1</minidevjson.version>
<jsonpath.version>0.9.1</jsonpath.version>
<objenesis.version>1.3</objenesis.version>
<slf4j.version>1.7.2</slf4j.version>
<slf4j.version>1.7.5</slf4j.version>
<evo.version>1.0.1</evo.version>
<bundlor.failOnWarnings>true</bundlor.failOnWarnings>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -84,6 +103,12 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
@@ -97,13 +122,6 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.2.2</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
@@ -189,14 +207,14 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.2.1</version>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<version>4.10</version>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
@@ -210,14 +228,14 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.0</version>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.1</version>
<version>2.3</version>
<scope>test</scope>
</dependency>
@@ -310,21 +328,21 @@
<pluginRepositories>
<pluginRepository>
<id>spring-plugins-release</id>
<url>http://repo.springsource.org/plugins-release</url>
<url>http://repo.spring.io/plugins-release</url>
</pluginRepository>
</pluginRepositories>
<repositories>
<repository>
<id>spring-snapshots</id>
<url>http://repo.springsource.org/libs-snapshot</url>
<id>spring-libs-snapshot</id>
<url>http://repo.spring.io/libs-snapshot</url>
</repository>
</repositories>
<scm>
<url>https://github.com/SpringSource/spring-hateoas</url>
<connection>scm:git:git://github.com/SpringSource/spring-hateoas.git</connection>
<developerConnection>scm:git:ssh://git@github.com:SpringSource/spring-hateoas.git</developerConnection>
<url>https://github.com/spring-projects/spring-hateoas</url>
<connection>scm:git:git://github.com/spring-projects/spring-hateoas.git</connection>
<developerConnection>scm:git:ssh://git@github.com:spring-projects/spring-hateoas.git</developerConnection>
</scm>
</project>

21
src/main/resources/changelog.txt
View File

@@ -1,6 +1,25 @@
Spring Hateoas Changelog
Spring HATEOAS Changelog
=========================
Changes in version 0.9.0.RELEASE (2014-01-24)
---------------------------------------------
- #139 - PagedResourcesAssember and URL Variables
- #138 - MethodParameters should be able to return parameters by type
- #137 - Add support for link templates
- #133 - LinkDiscoverer must not throw exceptions if link container is not present
- #132 - Resource should reject collection content
- #130 - Guard @EnableHypermediaSupport against issue in Spring 3.2.x
- #128 - Improve LinkDiscoverer API
- #125 - Add support for HAL curies
- #124 - Fix mapping annotations in ResourceSupport and subclasses
- #123 - Deprecate Jackson 1.9.x support
- #122 - ControllerLinkBuilder creates parameter names for optional request parameters even if they're null.
- #121 - OSGi imports for spring-plugin-core are incorrect
- #112 - Added support for X-Forwarded-Ssl header during link construction
- #110 - HalEmbeddedBuilder fails to properly encode odd number of elements
- #140 - Upgrade to latest Spring 3.2.x
- #126 - Release 0.9
Changes in version 0.8.0.RELEASE (2013-08-09)
---------------------------------------------
- #101 - Enable annotation based parameter name discovery on MethodParameters

4
src/main/resources/notice.txt
View File

@@ -1,5 +1,5 @@
Spring Hateoas 0.6
Copyright (c) [2012-2013] SpringSource, a division of VMware, Inc.
Spring Hateoas 0.9
Copyright (c) [2012-2014] Pivotal, 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 the License.

2
src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java
View File

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect;
*/
public class Jackson2ResourceIntegrationTest extends AbstractJackson2MarshallingIntegrationTest {
static final String REFERENCE = "{\"links\":[{\"rel\":\"self\",\"href\":\"localhost\"}],\"firstname\":\"Dave\",\"lastname\":\"Matthews\"}";
static final String REFERENCE = "{\"firstname\":\"Dave\",\"lastname\":\"Matthews\",\"links\":[{\"rel\":\"self\",\"href\":\"localhost\"}]}";
/**
* @see #27

4
src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java
View File

@@ -60,11 +60,13 @@ public class VndErrorsMarshallingTest {
VndErrors errors;
String jsonReference;
String json2Reference;
String xmlReference;
public VndErrorsMarshallingTest() throws IOException {
jsonReference = readFile(new ClassPathResource("vnderror.json"));
json2Reference = readFile(new ClassPathResource("vnderror2.json"));
xmlReference = readFile(new ClassPathResource("vnderror.xml"));
}
@@ -97,7 +99,7 @@ public class VndErrorsMarshallingTest {
@Test
public void jackson2Marshalling() throws Exception {
assertThat(jackson2Mapper.writeValueAsString(errors), is(jsonReference));
assertThat(jackson2Mapper.writeValueAsString(errors), is(json2Reference));
}
@Test

2
src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java
View File

@@ -60,7 +60,7 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg
static final Links PAGINATION_LINKS = new Links(new Link("foo", Link.REL_NEXT), new Link("bar", Link.REL_PREVIOUS));
static final String CURIED_DOCUMENT = "{\"_links\":{\"self\":{\"href\":\"foo\"},\"foo:myrel\":{\"href\":\"bar\"},\"curies\":[{\"href\":\"http://localhost:8080/rels/{rel}\",\"template\":true,\"name\":\"foo\"}]}}";
static final String CURIED_DOCUMENT = "{\"_links\":{\"self\":{\"href\":\"foo\"},\"foo:myrel\":{\"href\":\"bar\"},\"curies\":[{\"href\":\"http://localhost:8080/rels/{rel}\",\"name\":\"foo\",\"template\":true}]}}";
static final String SINGLE_NON_CURIE_LINK = "{\"_links\":{\"self\":{\"href\":\"foo\"}}}";
static final String EMPTY_DOCUMENT = "{}";

4
src/test/java/org/springframework/hateoas/support/ChangelogCreator.java
View File

@@ -30,8 +30,8 @@ import com.jayway.jsonpath.JsonPath;
*/
class ChangelogCreator {
private static final int MILESTONE_ID = 8;
private static final String URI_TEMPLATE = "https://api.github.com/repos/SpringSource/spring-hateoas/issues?milestone={id}&state=closed";
private static final int MILESTONE_ID = 9;
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 {

34
src/test/resources/vnderror2.json Normal file
View File

@@ -0,0 +1,34 @@
[ {
"_links" : {
"describes" : {
"href" : "http://..."
},
"help" : {
"href" : "http://..."
}
},
"logref" : "42",
"message" : "Validation failed!"
}, {
"_links" : {
"describes" : {
"href" : "http://..."
},
"help" : {
"href" : "http://..."
}
},
"logref" : "42",
"message" : "Validation failed!"
}, {
"_links" : {
"describes" : {
"href" : "http://..."
},
"help" : {
"href" : "http://..."
}
},
"logref" : "42",
"message" : "Validation failed!"
} ]