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

#305 - Dependency upgrades.

Browse Source 
Spring Framework 3.2.9 -> 3.2.13
Jackson 2.4.1 -> 2.4.3
JSONPath 0.9.1 -> 1.2.0
Slf4j 1.7.7 -> 1.7.10
Evo Inflector 1.2 -> 1.2.1

Adapted HalLinkDiscoverer to stricter checking of JSONPath expression.
This commit is contained in:
Oliver Gierke
2015-02-26 15:08:05 +01:00
parent 1953e6400b
commit 8d5424a6db
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pom.xml
View File

@@ -58,15 +58,15 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>3.2.9.RELEASE</spring.version>
<spring.version>3.2.13.RELEASE</spring.version>
<logback.version>1.1.2</logback.version>
<jackson.version>2.4.1</jackson.version>
<jackson.version>2.4.3</jackson.version>
<jaxrs.version>1.0</jaxrs.version>
<minidevjson.version>1.1.1</minidevjson.version>
<jsonpath.version>0.9.1</jsonpath.version>
<minidevjson.version>2.1.0</minidevjson.version>
<jsonpath.version>1.2.0</jsonpath.version>
<objenesis.version>2.1</objenesis.version>
<slf4j.version>1.7.7</slf4j.version>
<evo.version>1.2</evo.version>
<slf4j.version>1.7.10</slf4j.version>
<evo.version>1.2.1</evo.version>
<bundlor.failOnWarnings>true</bundlor.failOnWarnings>
</properties>
@@ -310,7 +310,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -346,7 +346,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -360,7 +360,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>2.10.1</version>
<executions>
<execution>
<goals>
@@ -380,8 +380,8 @@
<!-- copies doc-files subdirectory which contains image resources -->
<docfilessubdirs>true</docfilessubdirs>
<links>
<link>http://static.springframework.org/spring/docs/3.1.x/javadoc-api</link>
<link>http://download.oracle.com/javase/1.5.0/docs/api</link>
<link>http://static.springframework.org/spring/docs/3.2.x/javadoc-api</link>
<link>http://docs.oracle.com/javase/6/docs/api</link>
</links>
</configuration>
</plugin>

4
src/main/java/org/springframework/hateoas/hal/HalLinkDiscoverer.java
View File

@@ -15,8 +15,8 @@
*/
package org.springframework.hateoas.hal;
import org.springframework.hateoas.MediaTypes;
import org.springframework.hateoas.LinkDiscoverer;
import org.springframework.hateoas.MediaTypes;
import org.springframework.hateoas.core.JsonPathLinkDiscoverer;
/**
@@ -27,6 +27,6 @@ import org.springframework.hateoas.core.JsonPathLinkDiscoverer;
public class HalLinkDiscoverer extends JsonPathLinkDiscoverer {
public HalLinkDiscoverer() {
super("$_links..%s.href", MediaTypes.HAL_JSON);
super("$._links..%s..href", MediaTypes.HAL_JSON);
}
}