Raise the minimum version of REST Assured to 4.4

Closes gh-752

Author: wilkinsona

build.gradle

@@ -7,6 +7,7 @@ plugins {
 allprojects {
 	group = "org.springframework.restdocs"
 	repositories {
+		mavenLocal()
 		mavenCentral()
 		maven { url "https://repo.spring.io/snapshot" }
 	}

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

@@ -79,7 +79,7 @@ Spring REST Docs has the following minimum requirements:
 * Java 8
 * Spring Framework 5 (5.0.2 or later)
 
-Additionally, the `spring-restdocs-restassured` module requires REST Assured 3.0.
+Additionally, the `spring-restdocs-restassured` module requires REST Assured 4 (4.4 or later).
 
 [[getting-started-build-configuration]]
 === Build configuration
@@ -345,7 +345,7 @@ include::{examples-dir}/com/example/restassured/ExampleApplicationTests.java[tag
 <1> REST Assured is configured by adding a `RestAssuredRestDocumentationConfigurer` as a
 `Filter`. You can obtain an instance of this class from the static
 `documentationConfiguration()` method on `RestAssuredRestDocumentation` in the
-`org.springframework.restdocs.restassured3` package.
+`org.springframework.restdocs.restassured` package.
 ====
 
 The configurer applies sensible defaults and also provides an API for customizing the
@@ -438,7 +438,7 @@ include::{examples-dir}/com/example/restassured/ExampleApplicationJUnit5Tests.ja
 <1> REST Assured is configured by adding a `RestAssuredRestDocumentationConfigurer` as a
 `Filter`. You can obtain an instance of this class from the static
 `documentationConfiguration()` method on `RestAssuredRestDocumentation` in the
-`org.springframework.restdocs.restassured3` package.
+`org.springframework.restdocs.restassured` package.
 ====
 
 The configurer applies sensible defaults and also provides an API for customizing the
@@ -545,7 +545,7 @@ include::{examples-dir}/com/example/restassured/InvokeService.java[tags=invoke-s
 (which is located beneath the configured output directory). The snippets are written by
 a `RestDocumentationFilter`. You can obtain an instance of this class from the static
 `document` method on `RestAssuredRestDocumentation`  in the
-`org.springframework.restdocs.restassured3` package.
+`org.springframework.restdocs.restassured` package.
 <4> Invoke the root (`/`) of the service.
 <5> Assert that the service produce the expected response.
 ====

docs/src/docs/asciidoc/introduction.adoc

@@ -13,7 +13,7 @@ configure Spring REST Docs to use Markdown.
 Spring REST Docs uses snippets produced by tests written with Spring MVC's
 {spring-framework-docs}/testing.html#spring-mvc-test-framework[test framework], Spring
 WebFlux's {spring-framework-docs}/testing.html#webtestclient[`WebTestClient`] or
-http://rest-assured.io[REST Assured 3]. This test-driven approach helps to guarantee
+http://rest-assured.io[REST Assured 4]. This test-driven approach helps to guarantee
 the accuracy of your service's documentation. If a snippet is incorrect, the test that
 produces it fails.
 

docs/src/test/java/com/example/restassured/CustomDefaultOperationPreprocessors.java

@@ -25,7 +25,7 @@
 
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
 public class CustomDefaultOperationPreprocessors {
 

docs/src/test/java/com/example/restassured/CustomDefaultSnippets.java

@@ -24,7 +24,7 @@
 import org.springframework.restdocs.JUnitRestDocumentation;
 
 import static org.springframework.restdocs.cli.CliDocumentation.curlRequest;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
 public class CustomDefaultSnippets {
 

docs/src/test/java/com/example/restassured/CustomEncoding.java

@@ -23,7 +23,7 @@
 
 import org.springframework.restdocs.JUnitRestDocumentation;
 
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
 public class CustomEncoding {
 

docs/src/test/java/com/example/restassured/CustomFormat.java

@@ -24,7 +24,7 @@
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.restdocs.templates.TemplateFormats;
 
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
 public class CustomFormat {
 

docs/src/test/java/com/example/restassured/EveryTestPreprocessing.java

@@ -29,8 +29,8 @@
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.links;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
 public class EveryTestPreprocessing {
 

docs/src/test/java/com/example/restassured/ExampleApplicationJUnit5Tests.java

@@ -24,7 +24,7 @@
 import org.springframework.restdocs.RestDocumentationContextProvider;
 import org.springframework.restdocs.RestDocumentationExtension;
 
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
 @ExtendWith(RestDocumentationExtension.class)
 public class ExampleApplicationJUnit5Tests {

docs/src/test/java/com/example/restassured/ExampleApplicationTestNgTests.java

@@ -25,7 +25,7 @@
 
 import org.springframework.restdocs.ManualRestDocumentation;
 
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
 public class ExampleApplicationTestNgTests {
 

docs/src/test/java/com/example/restassured/ExampleApplicationTests.java

@@ -23,7 +23,7 @@
 
 import org.springframework.restdocs.JUnitRestDocumentation;
 
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
 public class ExampleApplicationTests {
 

docs/src/test/java/com/example/restassured/HttpHeaders.java

@@ -23,7 +23,7 @@
 import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
 import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
 import static org.springframework.restdocs.headers.HeaderDocumentation.responseHeaders;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 
 public class HttpHeaders {
 

docs/src/test/java/com/example/restassured/Hypermedia.java

@@ -23,7 +23,7 @@
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.halLinks;
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.linkWithRel;
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.links;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 
 public class Hypermedia {
 

docs/src/test/java/com/example/restassured/InvokeService.java

@@ -20,7 +20,7 @@
 import io.restassured.specification.RequestSpecification;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 
 public class InvokeService {
 

docs/src/test/java/com/example/restassured/ParameterizedOutput.java

@@ -23,8 +23,8 @@
 
 import org.springframework.restdocs.JUnitRestDocumentation;
 
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
 public class ParameterizedOutput {
 

docs/src/test/java/com/example/restassured/PathParameters.java

@@ -22,7 +22,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
 import static org.springframework.restdocs.request.RequestDocumentation.pathParameters;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 
 public class PathParameters {
 

docs/src/test/java/com/example/restassured/Payload.java

@@ -29,7 +29,7 @@
 import static org.springframework.restdocs.payload.PayloadDocumentation.responseBody;
 import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
 import static org.springframework.restdocs.payload.PayloadDocumentation.subsectionWithPath;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 import static org.springframework.restdocs.snippet.Attributes.attributes;
 import static org.springframework.restdocs.snippet.Attributes.key;
 

docs/src/test/java/com/example/restassured/PerTestPreprocessing.java

@@ -24,7 +24,7 @@
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 
 public class PerTestPreprocessing {
 

docs/src/test/java/com/example/restassured/RequestParameters.java

@@ -22,7 +22,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
 import static org.springframework.restdocs.request.RequestDocumentation.requestParameters;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 
 public class RequestParameters {
 

docs/src/test/java/com/example/restassured/RequestPartPayload.java

@@ -27,7 +27,7 @@
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestPartBody;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestPartFields;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 
 public class RequestPartPayload {
 

docs/src/test/java/com/example/restassured/RequestParts.java

@@ -22,7 +22,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.springframework.restdocs.request.RequestDocumentation.partWithName;
 import static org.springframework.restdocs.request.RequestDocumentation.requestParts;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 
 public class RequestParts {
 

docs/src/test/java/com/example/restassured/RestAssuredSnippetReuse.java

@@ -22,7 +22,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.linkWithRel;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
 
 public class RestAssuredSnippetReuse extends SnippetReuse {
 

samples/rest-assured/build.gradle

@@ -24,6 +24,8 @@ ext {
 }
 
 ext['spring-restdocs.version'] = '3.0.0-SNAPSHOT'
+ext['rest-assured.version'] = '4.4.0'
+ext['groovy.version'] = '3.0.8'
 
 configurations {
 	asciidoctorExtensions
@@ -34,7 +36,7 @@ dependencies {
 
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 
-	testImplementation 'io.rest-assured:rest-assured:3.0.2'
+	testImplementation 'io.rest-assured:rest-assured:4.4.0'
 	testImplementation('org.junit.vintage:junit-vintage-engine') {
 		exclude group: 'org.hamcrest', module: 'hamcrest-core'
 	}

samples/rest-assured/src/test/java/com/example/restassured/SampleRestAssuredApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyUris;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.document;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
 
 import org.junit.Before;
 import org.junit.Rule;

settings.gradle

@@ -1,9 +1,18 @@
 pluginManagement {
 	repositories {
+		mavenLocal()
 		mavenCentral()
 		maven { url "https://repo.spring.io/plugins-release-local" }
+		maven { url "https://repo.spring.io/snapshot" }
 		gradlePluginPortal()
 	}
+	resolutionStrategy {
+		eachPlugin {
+			if (requested.id.id == "io.spring.javaformat") {
+				useModule "io.spring.javaformat:spring-javaformat-gradle-plugin:${requested.version}"
+			}
+		}
+	}
 }
 
 plugins {

spring-restdocs-platform/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 		api("javax.servlet:javax.servlet-api:3.1.0")
 		api("javax.validation:validation-api:2.0.0.Final")
 		api("junit:junit:4.12")
-		api("io.rest-assured:rest-assured:3.0.7")
+		api("io.rest-assured:rest-assured:4.4.0")
 		api("org.apache.pdfbox:pdfbox:2.0.7")
 		api("org.assertj:assertj-core:3.11.1")
 		api("org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.18")

spring-restdocs-restassured/build.gradle

@@ -1,5 +1,4 @@
 plugins {
-	id "io.spring.compatibility-test" version "0.0.1"
 	id "java-library"
 	id "maven-publish"
 }
@@ -22,10 +21,3 @@ dependencies {
 	testImplementation("org.hamcrest:hamcrest-library")
 	testImplementation("org.mockito:mockito-core")
 }
-
-compatibilityTest {
-	dependency("REST Assured") { restAssured ->
-		restAssured.groupId = "io.rest-assured"
-		restAssured.versions = ["4.0.0", "4.1.2", "4.2.0", "4.3.1"]
-	}
-}

spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured3/RestAssuredOperationPreprocessorsConfigurer.java renamed to spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured/RestAssuredOperationPreprocessorsConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.restdocs.restassured3;
+package org.springframework.restdocs.restassured;
 
 import io.restassured.filter.Filter;
 import io.restassured.filter.FilterContext;

spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured3/RestAssuredRequestConverter.java renamed to spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured/RestAssuredRequestConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.restdocs.restassured3;
+package org.springframework.restdocs.restassured;
 
 import java.io.File;
 import java.io.IOException;

spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured3/RestAssuredResponseConverter.java renamed to spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured/RestAssuredResponseConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.restdocs.restassured3;
+package org.springframework.restdocs.restassured;
 
 import io.restassured.http.Header;
 import io.restassured.response.Response;

spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured3/RestAssuredRestDocumentation.java renamed to spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured/RestAssuredRestDocumentation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.restdocs.restassured3;
+package org.springframework.restdocs.restassured;
 
 import org.springframework.restdocs.RestDocumentationContextProvider;
 import org.springframework.restdocs.generate.RestDocumentationGenerator;

spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured3/RestAssuredRestDocumentationConfigurer.java renamed to spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured/RestAssuredRestDocumentationConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.restdocs.restassured3;
+package org.springframework.restdocs.restassured;
 
 import java.util.HashMap;
 import java.util.Map;