diff --git a/pom.xml b/pom.xml index ef2b3bd4..4cd7490b 100644 --- a/pom.xml +++ b/pom.xml @@ -16,16 +16,16 @@ 2012 - SpringSource, a division of VMware - http://www.springsource.org + Pivotal, Inc. + http://www.spring.io ogierke Oliver Gierke - ogierke(at)vmware.com - SpringSource, a division of VMware + ogierke(at)gopivotal.com + Pivotal, Inc. Project lead @@ -59,19 +59,38 @@ UTF-8 3.2.6.RELEASE - 1.0.9 - 1.9.10 - 2.2.0 + 1.0.13 + 1.9.13 + 2.3.0 1.0 - 0.8.1 1.1.1 + 0.9.1 1.3 - 1.7.2 + 1.7.5 1.0.1 true + + + org.springframework + spring-aop + ${spring.version} + + + + org.springframework + spring-beans + ${spring.version} + + + + org.springframework + spring-context + ${spring.version} + + org.springframework spring-core @@ -84,6 +103,12 @@ + + org.springframework + spring-web + ${spring.version} + + org.springframework spring-webmvc @@ -97,13 +122,6 @@ true - - cglib - cglib - 2.2.2 - true - - org.objenesis objenesis @@ -189,14 +207,14 @@ org.hamcrest hamcrest-library - 1.2.1 + 1.3 test junit - junit-dep - 4.10 + junit + 4.11 test @@ -210,14 +228,14 @@ org.mockito mockito-all - 1.9.0 + 1.9.5 test joda-time joda-time - 2.1 + 2.3 test @@ -310,21 +328,21 @@ spring-plugins-release - http://repo.springsource.org/plugins-release + http://repo.spring.io/plugins-release - spring-snapshots - http://repo.springsource.org/libs-snapshot + spring-libs-snapshot + http://repo.spring.io/libs-snapshot - https://github.com/SpringSource/spring-hateoas - scm:git:git://github.com/SpringSource/spring-hateoas.git - scm:git:ssh://git@github.com:SpringSource/spring-hateoas.git + https://github.com/spring-projects/spring-hateoas + scm:git:git://github.com/spring-projects/spring-hateoas.git + scm:git:ssh://git@github.com:spring-projects/spring-hateoas.git diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt index a2af3102..a1a88b7b 100644 --- a/src/main/resources/changelog.txt +++ b/src/main/resources/changelog.txt @@ -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 diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt index a653db46..9d715d15 100644 --- a/src/main/resources/notice.txt +++ b/src/main/resources/notice.txt @@ -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. diff --git a/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java b/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java index e72d84f6..39ef42db 100644 --- a/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java @@ -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 diff --git a/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java b/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java index c5351845..6eb77b04 100644 --- a/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java +++ b/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java @@ -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 diff --git a/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java b/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java index 77dda8ca..66999344 100644 --- a/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/hal/Jackson2HalIntegrationTest.java @@ -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 = "{}"; diff --git a/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java b/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java index 166ec3ea..07fedbba 100644 --- a/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java +++ b/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java @@ -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 { diff --git a/src/test/resources/vnderror2.json b/src/test/resources/vnderror2.json new file mode 100644 index 00000000..bd759369 --- /dev/null +++ b/src/test/resources/vnderror2.json @@ -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!" +} ] \ No newline at end of file