Release 2.0.0-m2

otto-de · May 2, 2018 · a8b1ab2 · a8b1ab2
1 parent 2af0c6c
commit a8b1ab2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -816,6 +816,10 @@ in different ways.
 
 ### 2.0.0-m2
 
+*Bugfixes*
+
+* Issue 22: Duplicate curies are now removed from embedded objects, if they are specified in the embedding `HalRepresentation`.
+
 *Breaking Changes*
 
 * The API to create Links instances has changed: the former `Links.linkingTo(List<Link>)`, 
@@ -828,9 +832,11 @@ link object, or an array of link objects. The `Links.Builder` has now methods fo
 * Because the `Links.Builder` is now able to create single link objects as well as arrays of link objects, the 
 corresponding functionality to register link-relation types to be rendered as arrays has been removed from 
 `RelRegistry`.
+* Issue 21: Similar to the links, it is now possible to specify whether or not embedded resources are embedded as 
+single resource objects, or arrays of resources objects.
 * Renamed `RelRegistry` to `Curies`     
-* HalRepresentation was previously annotated with @JsonInclude(NON_NULL). This was changed so that only _links and
-  _embedded are now annotated this way. This might change the behaviour / structure of existing applications.
+* Issue 20: HalRepresentation was previously annotated with @JsonInclude(NON_NULL). This was changed so that only 
+_links and _embedded are now annotated this way. This might change the behaviour / structure of existing applications.
   You should now annotate classes extending HalRepresentation, or attributes of such classes appropriately.
 
 ### 2.0.0-m1

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'maven'
 apply plugin: 'jacoco'
 apply from: 'dependencies.gradle'
 
-version='2.0.0-m2-SNAPSHOT'
+version='2.0.0-m2'
 group='de.otto.edison'
 
 repositories {

diff --git a/src/main/java/de/otto/edison/hal/Links.java b/src/main/java/de/otto/edison/hal/Links.java
@@ -615,6 +615,7 @@ public Builder array(final List<Link> links) {
          *     rendered as an array of Link Objects, even if there are only single links for a given Link-Relation Type.
          * </p>
          *
+         * @param rel the Link-Relation Type that is replaced by the links
          * @param links the list of links.
          * @return this
          *