Merge branch 'master' into master

Author: ghoonch4

.travis.yml

@@ -42,5 +42,5 @@ with regard to the reporter of an incident.
 This Code of Conduct is adapted from the [Contributor Covenant][1], version 1.3.0, available
 at [contributor-covenant.org/version/1/3/0/][2].
 
-[1]: http://contributor-covenant.org
-[2]: http://contributor-covenant.org/version/1/3/0/
+[1]: https://contributor-covenant.org
+[2]: https://contributor-covenant.org/version/1/3/0/

CODE_OF_CONDUCT.md

@@ -61,4 +61,4 @@ The project can then be imported into Eclipse using `File -> Import…` and then
 
 [1]: CODE_OF_CONDUCT.md
 [2]: https://cla.pivotal.io/sign/spring
-[3]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[3]: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

CONTRIBUTING.md

@@ -37,36 +37,35 @@ There are several that you can contribute to Spring REST Docs:
 
 | Name | Description |
 | ---- | ----------- |
-| [restdocs-wiremock][17] | Auto-generate [WireMock][18] stubs as part of documenting your RESTful API |
-| [restdocsext-jersey][19] | Enables Spring REST Docs to be used with [Jersey's test framework][20] |
-| [spring-auto-restdocs][21] | Uses introspection and Javadoc to automatically document request and response parameters |
-| [restdocs-api-spec][22] | A Spring REST Docs extension that adds API specification support. It currently supports [OpenAPI 2][23] and [OpenAPI 3][24] |
+| [restdocs-wiremock][17] | Auto-generate WireMock stubs as part of documenting your RESTful API |
+| [restdocsext-jersey][18] | Enables Spring REST Docs to be used with [Jersey's test framework][19] |
+| [spring-auto-restdocs][20] | Uses introspection and Javadoc to automatically document request and response parameters |
+| [restdocs-api-spec][21] | A Spring REST Docs extension that adds API specification support. It currently supports [OpenAPI 2][22] and [OpenAPI 3][23] |
 
 ## Licence
 
 Spring REST Docs is open source software released under the [Apache 2.0 license][14].
 
 [1]: https://build.spring.io/plugins/servlet/wittified/build-status/SRD-PUB (Build status)
 [2]: https://build.spring.io/browse/SRD-PUB
-[3]: http://asciidoctor.org
-[4]: http://docs.spring.io/spring-framework/docs/4.1.x/spring-framework-reference/htmlsingle/#spring-mvc-test-framework
+[3]: https://asciidoctor.org
+[4]: https://docs.spring.io/spring-framework/docs/4.1.x/spring-framework-reference/htmlsingle/#spring-mvc-test-framework
 [5]: https://developer.github.com/v3/
-[6]: http://swagger.io
+[6]: https://swagger.io
 [7]: https://speakerdeck.com/ankinson/documenting-restful-apis-webinar
 [8]: https://www.youtube.com/watch?v=knH5ihPNiUs&feature=youtu.be
-[9]: http://docs.spring.io/spring-restdocs/docs/
-[10]: http://gradle.org
+[9]: https://docs.spring.io/spring-restdocs/docs/
+[10]: https://gradle.org
 [11]: CODE_OF_CONDUCT.md
 [12]: https://help.github.com/articles/using-pull-requests/
 [13]: CONTRIBUTING.md
-[14]: http://www.apache.org/licenses/LICENSE-2.0.html
-[15]: http://stackoverflow.com/tags/spring-restdocs
+[14]: https://www.apache.org/licenses/LICENSE-2.0.html
+[15]: https://stackoverflow.com/tags/spring-restdocs
 [16]: https://gitter.im/spring-projects/spring-restdocs
 [17]: https://github.com/ePages-de/restdocs-wiremock
-[18]: http://wiremock.org/
-[19]: https://github.com/RESTDocsEXT/restdocsext-jersey
-[20]: https://jersey.java.net/documentation/latest/test-framework.html
-[21]: https://github.com/ScaCap/spring-auto-restdocs
-[22]: https://github.com/ePages-de/restdocs-api-spec
-[23]: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md
-[24]: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md
+[18]: https://github.com/RESTDocsEXT/restdocsext-jersey
+[19]: https://jersey.java.net/documentation/latest/test-framework.html
+[20]: https://github.com/ScaCap/spring-auto-restdocs
+[21]: https://github.com/ePages-de/restdocs-api-spec
+[22]: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md
+[23]: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md

README.md

@@ -8,9 +8,10 @@ buildscript {
 	}
 	dependencies {
 		classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
-		classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
 		classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2'
+		classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE'
 		classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$javaFormatVersion"
+		classpath 'io.spring.nohttp:nohttp-gradle:0.0.2.RELEASE'
 	}
 }
 
@@ -24,6 +25,7 @@ allprojects {
 
 apply plugin: 'samples'
 apply plugin: 'org.sonarqube'
+apply plugin: 'io.spring.nohttp'
 
 sonarqube {
 	properties {
@@ -36,11 +38,19 @@ sonarqube {
 	}
 }
 
+nohttp {
+	source.exclude 'samples/rest-notes-slate/slate/source/javascripts/lib/_jquery*.js'
+	source.exclude 'buildSrc/.gradle/**'
+	source.exclude '**/build/**'
+	source.exclude '**/target/**'
+	whitelistFile = project.file('config/nohttp/whitelist.lines')
+}
+
 ext {
-	springVersion = '5.0.5.RELEASE'
+	springVersion = '5.0.15.RELEASE'
 	javadocLinks = [
-		'http://docs.oracle.com/javase/8/docs/api/',
-		"http://docs.spring.io/spring-framework/docs/$springVersion/javadoc-api/",
+		'https://docs.oracle.com/javase/8/docs/api/',
+		"https://docs.spring.io/spring-framework/docs/$springVersion/javadoc-api/",
 		'https://docs.jboss.org/hibernate/stable/beanvalidation/api/',
 		'https://docs.jboss.org/hibernate/stable/validator/api/'
 	] as String[]
@@ -72,9 +82,8 @@ subprojects {
 			dependency 'junit:junit:4.12'
 			dependency 'io.rest-assured:rest-assured:3.0.7'
 			dependency 'org.apache.pdfbox:pdfbox:2.0.7'
-			dependency 'org.assertj:assertj-core:2.9.1'
-			dependency 'org.asciidoctor:asciidoctorj:1.5.6'
-			dependency 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
+			dependency 'org.assertj:assertj-core:3.11.1'
+			dependency 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.18'
 			dependency 'org.hamcrest:hamcrest-core:1.3'
 			dependency 'org.hamcrest:hamcrest-library:1.3'
 			dependency 'org.hibernate.validator:hibernate-validator:6.0.9.Final'
@@ -107,33 +116,22 @@ subprojects {
 		options.compilerArgs = [ '-Xlint:deprecation', '-Xlint:-options', '-Werror' ]
 	}
 
+	tasks.withType(JavaCompile) {
+		options.encoding = 'UTF-8'
+	}
+
 }
 
-configure(subprojects - project(":docs")) { subproject ->
+def codeProjects = subprojects - project(":docs")
+configure(codeProjects) {
 	apply plugin: 'io.spring.javaformat'
 	apply plugin: 'checkstyle'
 	apply from: "${rootProject.projectDir}/gradle/publish-maven.gradle"
 
-	if (project.hasProperty('platformVersion') && subproject.path != ':spring-restdocs-asciidoctor') {
-		apply plugin: 'spring-io'
-
-		repositories {
-			maven { url "https://repo.spring.io/libs-snapshot" }
-		}
-
-		dependencyManagement {
-			springIoTestRuntime {
-				imports {
-					mavenBom "io.spring.platform:platform-bom:${platformVersion}"
-				}
-			}
-		}
-	}
-
 	checkstyle {
 		configFile = rootProject.file('config/checkstyle/checkstyle.xml')
 		configProperties = [ 'checkstyle.config.dir' : rootProject.file('config/checkstyle') ]
-		toolVersion = '6.10.1'
+		toolVersion = '8.22'
 	}
 
 	configurations {
@@ -144,7 +142,10 @@ configure(subprojects - project(":docs")) { subproject ->
 		checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:$javaFormatVersion"
 		jacoco 'org.jacoco:org.jacoco.agent::runtime'
 	}
+}
 
+def publishedCodeProjects = codeProjects.findAll { codeProject -> !codeProject.name.contains('spring-restdocs-asciidoctor-')}
+configure(publishedCodeProjects) { subproject ->
 	javadoc {
 		description = "Generates project-level javadoc for use in -javadoc jar"
 		options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
@@ -153,6 +154,8 @@ configure(subprojects - project(":docs")) { subproject ->
 		options.docTitle = "${options.header} API"
 		options.links = javadocLinks
 		options.addStringOption '-quiet'
+		options.encoding = 'UTF-8'
+		options.source = '1.8'
 	}
 
 	task sourcesJar(type: Jar) {
@@ -178,10 +181,6 @@ samples {
 	dependOn 'spring-restdocs-webtestclient:install'
 	dependOn 'spring-restdocs-asciidoctor:install'
 
-	restNotesGrails {
-		workingDir "$projectDir/samples/rest-notes-grails"
-	}
-
 	restNotesSpringHateoas {
 		workingDir "$projectDir/samples/rest-notes-spring-hateoas"
 	}
@@ -228,8 +227,8 @@ task api (type: Javadoc) {
 	options.links = javadocLinks
 	options.addStringOption '-quiet'
 
-	source subprojects.findAll { project -> project.path != ":spring-restdocs-asciidoctor" }
-			.collect { project -> project.sourceSets.main.allJava }
+	source publishedCodeProjects.findAll { it.name != 'spring-restdocs-asciidoctor' }
+			.collect { it.sourceSets.main.allJava }
 
 	destinationDir = new File(buildDir, "api")
 
@@ -268,4 +267,4 @@ configurations {
 
 artifacts {
 	archives docsZip
-}
+}

build.gradle

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 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.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -43,7 +43,7 @@ public class MatrixTestExtension {
 	void configureTestTasks(Project project) {
 		if (!entries.empty) {
 			cartesianProduct(entries.collect { entry ->
-				entry.versions.collect { ['group': entry.group, 'version': it] }
+				entry.versions.collect { ['group': entry.group, 'artifact': entry.artifact, 'version': it] }
 			}).forEach { configureTestTask(project, it) }
 		}
 	}
@@ -64,6 +64,7 @@ public class MatrixTestExtension {
 				resolutionStrategy.eachDependency { dependency ->
 					versionSelectors
 							.findAll{ it.group == dependency.requested.group }
+							.findAll { !it.artifact || it.artifact == dependency.requested.name }
 							.each { dependency.useVersion it.version }
 				}
 			}
@@ -73,9 +74,6 @@ public class MatrixTestExtension {
 	}
 
 	List<List<Map<String, String>>> cartesianProduct(List<List<Map<String, String>>> lists) {
-		if (lists.size() == 1) {
-			return lists
-		}
 		return cartesianProduct(lists, 0)
 	}
 
@@ -98,6 +96,8 @@ public class MatrixTestExtension {
 
 		String group
 
+		String artifact
+
 		List<String> versions
 
 	}

buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestExtension.groovy

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

buildSrc/src/main/groovy/org/springframework/restdocs/build/matrix/MatrixTestPlugin.groovy

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SampleBuildConfigurer.groovy

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesExtension.groovy

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

buildSrc/src/main/groovy/org/springframework/restdocs/build/samples/SamplesPlugin.groovy

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <module name="com.puppycrawl.tools.checkstyle.Checker">
 	<module name="io.spring.javaformat.checkstyle.SpringChecks" />
 </module>