Raise the minimum Spring Framework version to 4.3.x

Closes gh-284

build.gradle

@@ -34,7 +34,7 @@ sonarqube {
 }
 
 ext {
-	springVersion = '4.2.5.RELEASE'
+	springVersion = '4.3.1.RELEASE'
 	javadocLinks = [
 		'http://docs.oracle.com/javase/8/docs/api/',
 		"http://docs.spring.io/spring-framework/docs/$springVersion/javadoc-api/",
@@ -60,7 +60,7 @@ subprojects {
 			mavenBom "org.springframework:spring-framework-bom:$springVersion"
 		}
 		dependencies {
-			dependency 'com.fasterxml.jackson.core:jackson-databind:2.4.6.1'
+			dependency 'com.fasterxml.jackson.core:jackson-databind:2.5.5'
 			dependency 'com.jayway.restassured:rest-assured:2.8.0'
 			dependency 'com.samskivert:jmustache:1.12'
 			dependency 'commons-codec:commons-codec:1.10'

docs/src/docs/asciidoc/getting-started.adoc

@@ -68,7 +68,7 @@ If you want to jump straight in, a number of sample applications are available:
 Spring REST Docs has the following minimum requirements:
 
 - Java 7
-- Spring Framework 4.2
+- Spring Framework 4.3
 
 Additionally, the `spring-restdocs-restassured` module has the following minimum
 requirements:

samples/rest-assured/build.gradle

@@ -31,6 +31,7 @@ ext {
 }
 
 ext['spring-restdocs.version'] = '1.2.0.BUILD-SNAPSHOT'
+ext['spring.version']='4.3.1.RELEASE'
 
 dependencies {
 	compile 'org.springframework.boot:spring-boot-starter-web'

samples/rest-notes-grails/build.gradle

@@ -47,6 +47,7 @@ dependencyManagement {
 	}
 	imports {
 		mavenBom "org.grails:grails-bom:$grailsVersion"
+		mavenBom "org.springframework:spring-framework-bom:4.3.1.RELEASE"
 	}
 	applyMavenExclusions false
 }

samples/rest-notes-slate/build.gradle

@@ -27,6 +27,7 @@ ext {
 }
 
 ext['spring-restdocs.version'] = '1.2.0.BUILD-SNAPSHOT'
+ext['spring.version']='4.3.1.RELEASE'
 
 dependencies {
 	compile 'org.springframework.boot:spring-boot-starter-data-jpa'

samples/rest-notes-spring-data-rest/pom.xml

@@ -18,6 +18,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.7</java.version>
+		<spring.version>4.3.1.RELEASE</spring.version>
 		<spring-restdocs.version>1.2.0.BUILD-SNAPSHOT</spring-restdocs.version>
 	</properties>
 

samples/rest-notes-spring-hateoas/build.gradle

@@ -30,6 +30,7 @@ ext {
 	snippetsDir = file('build/generated-snippets')
 }
 
+ext['spring.version']='4.3.1.RELEASE'
 ext['spring-restdocs.version'] = '1.2.0.BUILD-SNAPSHOT'
 
 dependencies {

samples/testng/build.gradle

@@ -29,6 +29,8 @@ targetCompatibility = 1.7
 ext {
 	snippetsDir = file('build/generated-snippets')
 }
+
+ext['spring.version']='4.3.1.RELEASE'
 ext['spring-restdocs.version'] = '1.2.0.BUILD-SNAPSHOT'
 
 dependencies {

spring-restdocs-core/src/main/java/org/springframework/restdocs/operation/AbstractOperationMessage.java

@@ -63,7 +63,7 @@ abstract class AbstractOperationMessage {
 		if (contentType == null) {
 			return null;
 		}
-		return contentType.getCharSet();
+		return contentType.getCharset();
 	}
 
 }

spring-restdocs-core/src/main/java/org/springframework/restdocs/operation/preprocess/PatternReplacingContentModifier.java

@@ -49,8 +49,8 @@ class PatternReplacingContentModifier implements ContentModifier {
 	@Override
 	public byte[] modifyContent(byte[] content, MediaType contentType) {
 		String original;
-		if (contentType != null && contentType.getCharSet() != null) {
-			original = new String(content, contentType.getCharSet());
+		if (contentType != null && contentType.getCharset() != null) {
+			original = new String(content, contentType.getCharset());
 		}
 		else {
 			original = new String(content);

spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured/operation/preprocess/UriModifyingOperationPreprocessor.java

@@ -203,8 +203,8 @@ public final class UriModifyingOperationPreprocessor implements OperationPreproc
 		@Override
 		public byte[] modifyContent(byte[] content, MediaType contentType) {
 			String input;
-			if (contentType != null && contentType.getCharSet() != null) {
-				input = new String(content, contentType.getCharSet());
+			if (contentType != null && contentType.getCharset() != null) {
+				input = new String(content, contentType.getCharset());
 			}
 			else {
 				input = new String(content);