From 47bcc45e453553154dbb0a9f525977a2d60b6ec6 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sat, 23 Sep 2017 17:57:54 +0100
Subject: [PATCH] Upgrade dependencies

---
 build.gradle                                  | 21 +++++++------------
 .../headers/AbstractHeadersSnippet.java       |  6 ++++--
 ...dleConstraintDescriptionResolverTests.java |  3 ++-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6b55d694..a03e75fd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,14 +6,9 @@ buildscript {
 	}
 	dependencies {
 		classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
-		classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE'
+		classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
 		classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.2.1'
 	}
-	configurations.classpath.resolutionStrategy.eachDependency {
-		if (it.requested.name == 'dependency-management-plugin') {
-			it.useVersion '1.0.1.RELEASE'
-		}
-	}
 }
 
 allprojects {
@@ -38,7 +33,7 @@ sonarqube {
 }
 
 ext {
-	springVersion = '4.3.6.RELEASE'
+	springVersion = '4.3.11.RELEASE'
 	javadocLinks = [
 		'http://docs.oracle.com/javase/8/docs/api/',
 		"http://docs.spring.io/spring-framework/docs/$springVersion/javadoc-api/",
@@ -71,16 +66,16 @@ subprojects {
 			dependency 'javax.servlet:javax.servlet-api:3.1.0'
 			dependency 'javax.validation:validation-api:1.1.0.Final'
 			dependency 'junit:junit:4.12'
-			dependency 'io.rest-assured:rest-assured:3.0.2'
-			dependency 'org.apache.pdfbox:pdfbox:2.0.6'
-			dependency 'org.asciidoctor:asciidoctorj:1.5.5'
-			dependency 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.15'
+			dependency 'io.rest-assured:rest-assured:3.0.3'
+			dependency 'org.apache.pdfbox:pdfbox:2.0.7'
+			dependency 'org.asciidoctor:asciidoctorj:1.5.6'
+			dependency 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
 			dependency 'org.hamcrest:hamcrest-core:1.3'
 			dependency 'org.hamcrest:hamcrest-library:1.3'
-			dependency 'org.hibernate:hibernate-validator:5.2.2.Final'
+			dependency 'org.hibernate:hibernate-validator:5.2.5.Final'
 			dependency 'org.mockito:mockito-core:1.10.19'
 			dependency 'org.springframework.hateoas:spring-hateoas:0.19.0.RELEASE'
-			dependency 'org.jacoco:org.jacoco.agent:0.7.7.201606060606'
+			dependency 'org.jacoco:org.jacoco.agent:0.7.9'
 		}
 	}
 
diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/headers/AbstractHeadersSnippet.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/headers/AbstractHeadersSnippet.java
index 22391356..6b52f16f 100644
--- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/headers/AbstractHeadersSnippet.java
+++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/headers/AbstractHeadersSnippet.java
@@ -53,8 +53,10 @@ public abstract class AbstractHeadersSnippet extends TemplatedSnippet {
 			Map<String, Object> attributes) {
 		super(type + "-headers", attributes);
 		for (HeaderDescriptor descriptor : descriptors) {
-			Assert.notNull(descriptor.getName());
-			Assert.notNull(descriptor.getDescription());
+			Assert.notNull(descriptor.getName(),
+					"The name of the header must not be null");
+			Assert.notNull(descriptor.getDescription(),
+					"The description of the header must not be null");
 		}
 		this.headerDescriptors = descriptors;
 		this.type = type;
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ResourceBundleConstraintDescriptionResolverTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ResourceBundleConstraintDescriptionResolverTests.java
index ece62ab9..6880c7dc 100644
--- a/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ResourceBundleConstraintDescriptionResolverTests.java
+++ b/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ResourceBundleConstraintDescriptionResolverTests.java
@@ -270,7 +270,8 @@ public class ResourceBundleConstraintDescriptionResolverTests {
 	private Constraint getConstraintFromField(String name) {
 		Annotation[] annotations = ReflectionUtils.findField(Constrained.class, name)
 				.getAnnotations();
-		Assert.isTrue(annotations.length == 1);
+		Assert.isTrue(annotations.length == 1, "The field '" + name + "' must have "
+				+ "exactly one @Constrained annotation");
 		return new Constraint(annotations[0].annotationType().getName(),
 				AnnotationUtils.getAnnotationAttributes(annotations[0]));
 	}