82 Commits

Author SHA1 Message Date
Andy Wilkinson
508b3d6593 Upgrade to Spring Java Format 0.0.15 2019-08-30 11:07:04 +01:00
Andy Wilkinson
f7bd5faecf Remove Spring IO plugin from the build
Closes gh-623
2019-06-18 13:41:06 +01:00
Andy Wilkinson
3fa64a1b2c Upgrade to AsciidoctorJ PDF 1.5.0-alpha.18
Closes gh-622
2019-06-18 12:57:40 +01:00
Andy Wilkinson
76a89cf658 Upgrade to AsciidoctorJ 1.5.8.1
Closes gh-621
2019-06-18 12:14:15 +01:00
Andy Wilkinson
f1eaf0c91a Add NoHTTP to the build 2019-06-10 10:38:22 +01:00
Andy Wilkinson
b9367a10c8 Merge branch '1.1.x' into 1.2.x 2019-03-19 10:58:58 +00:00
Andy Wilkinson
c0fb578f84 Merge branch '1.0.x' into 1.1.x 2019-03-19 10:57:43 +00:00
Spring Operator
1572be5b29 Update build configuration to prefer HTTPS
See gh-596
2019-03-19 10:54:24 +00:00
Andy Wilkinson
91653a300a Set Javadoc and JavaCompile encoding to UTF-8
Closes gh-593
2019-03-13 09:24:54 +00:00
Andy Wilkinson
57905d2c1f Remove redundant mavenLocal repository declarations 2018-08-08 16:47:04 +01:00
Andy Wilkinson
244a734232 Adopt Spring Java Format for code formatting and style 2018-08-08 14:08:15 +01:00
Andy Wilkinson
7431426cf3 Update tests to use AssertJ
Closes gh-537
2018-08-08 11:22:57 +01:00
Andy Wilkinson
81ef9f8a38 Upgrade to Gradle 4.9
Closes gh-541
2018-08-08 10:45:04 +01:00
Andy Wilkinson
4c6cccac24 Upgrade to REST Assured 3.0.7
Closes gh-500
2018-04-04 09:13:17 +01:00
Andy Wilkinson
39733893c1 Upgrade to Spring Framework 4.3.15
Closes gh-499
2018-04-04 09:08:05 +01:00
Andy Wilkinson
9e3a3c0536 Upgrade to latest version of JRuby to avoid problems on Windows
See https://github.com/jruby/jruby/issues/4745
2017-09-23 19:45:59 +01:00
Andy Wilkinson
47bcc45e45 Upgrade dependencies 2017-09-23 18:00:17 +01:00
Andy Wilkinson
ba327f1e9a Ensure that all nodes for a snippet refer to main document
Previously, when the operation block macro rendered the fragment
for a snippet, every top-level block in the fragment had its parent
set. Setting the parent has the side-effect of also setting the
block's document to be that of its parent. This meant that every
top-level block's document referred to the main document, but any
descendents were left with their document referring to the fragment
document. This did not cause a problem with the HTML backend (which
does not consider a block's document) but the PDF backend does
consider a block's document resulting in the descendents being
omitted from the generated PDF.

This commit updates the operation block macro to set the parent of
every block in the fragment to its correct value. This has the
side-effect of causing the block to update its document reference to
point to the main document.

Closes gh-396
2017-05-30 13:11:01 +01:00
Andy Wilkinson
6a3535c559 Exclude spring-restdocs-asciidoctor from Spring IO checks 2017-04-26 12:12:43 +01:00
Andy Wilkinson
a5e3e153ad Do not include spring-restdocs-asciidoctor in API documentation
Closes gh-391
2017-04-26 12:10:16 +01:00
Andy Wilkinson
9f67eaab70 List REST Assured dependencies as optional in pom
Previously, the use of compileOnly meant that the REST Assured
dependencies were omitted from pom for spring-restdocs-restassured.
This commit correct thr problem by using the propdeps' plugin's
optional configuration instead.

Closes gh-372
2017-04-07 17:03:32 +01:00
Andy Wilkinson
78982cf515 Add support for REST Assured 3
Closes gh-262
2017-03-20 21:39:25 +00:00
Andy Wilkinson
b6f986556e Upgrade to Gradle 3.4
Closes gh-283
2017-03-03 21:03:39 +00:00
Andy Wilkinson
677a23647f Compile and test against Spring Framework 4.3.6.RELEASE
This commit upgrade to Spring Framework 4.3.6.RELEASE. A side-effect
of this change is that the Content-Type header is now always the first
header when building a request with MockMvc. One test has been updated
to reflect this change in ordering.

Closes gh-342
2017-01-25 20:00:36 +00:00
Andy Wilkinson
2f568c2121 Install spring-restdocs-asciidoctor before building samples 2016-10-21 23:12:11 +01:00
Andy Wilkinson
319bd139fc Polish contribution and rework to use default attribute rather than macro
Rather than introducing a custom macro, this commit opts to implicitly
configure the snippets attribute instead. The attribute is configured
will the path into which snippets are generated, relative to the
directory that contains the Asciidoctor document that is being
rendered.

The samples and documentation have been updated to use the new
spring-restdocs-asciidoctor module and the implicitly configured
snippets attribute.

Closes gh-297
2016-10-21 22:42:11 +01:00
Andy Wilkinson
f2717363f0 Raise the minimum Spring Framework version to 4.3.x
Closes gh-284
2016-07-26 12:09:20 +01:00
Andy Wilkinson
110fa23958 Configure sonar.branch 2016-07-25 14:53:54 +01:00
Andy Wilkinson
67d31fd7d9 Upgrade to Jacoco 0.7.7.201606060606
Closes gh-282
2016-07-25 14:29:52 +01:00
Andy Wilkinson
4f87f55aaa Fix link to Spring Framework javadoc 2016-05-31 10:04:30 +01:00
Andy Wilkinson
34ec9d523d Polish "Add Grails sample app" (1338df9)
The sole structural change is to rearrange the build slightly so that,
like the other samples, the version of the Grails sample's REST Docs
dependency is automatically updated.

See gh-250
2016-05-31 10:00:52 +01:00
Andy Wilkinson
6935f603f2 Polish ResourceBundleConstraintDescriptionResolver and related tests
Closes gh-234
2016-05-24 16:27:37 +01:00
Andy Wilkinson
7f02cdf725 Upgrade to JMustache 1.12
Closes gh-246
2016-05-24 11:04:30 +01:00
Andy Wilkinson
75ea210187 Build against Spring Framework 4.2.x 2016-05-05 14:29:20 +01:00
Andy Wilkinson
873159cec8 Merge branch '1.0.x' 2016-05-05 11:36:25 +01:00
Andy Wilkinson
e37d0ff560 Use Maven Central rather than JCenter 2016-05-05 11:35:07 +01:00
Andy Wilkinson
feb2f352f6 Fix compiler warnings 2016-04-04 13:26:41 +01:00
Andy Wilkinson
67920dd9f6 Merge branch '1.0.x' 2016-02-16 11:12:54 +00:00
Andy Wilkinson
36bacb470b Move to the offical SonarQube plugin 2016-02-16 11:11:53 +00:00
Andy Wilkinson
d84fca4d63 Ensure that version updates are applied to Slate sample 2016-02-16 10:47:07 +00:00
Andy Wilkinson
4c5095589a Ensure that REST Assured module is installed before sample is built 2016-02-15 17:57:51 +00:00
Andy Wilkinson
ba76c2f843 Add a sample showing how to use Spring REST Docs with Slate
Closes gh-124
2016-02-15 17:52:08 +00:00
Andy Wilkinson
c8ecd25591 Add a sample demonstrating how to use REST Assured
Closes gh-198
2016-02-15 17:12:16 +00:00
Andy Wilkinson
0ef9307481 Add support for manually managing the RestDocumentationContext
In 1.0, the reliance on JUnit was more widespread than it should have
been. It should have been isolated to the JUnit TestRule implementation,
RestDocumentation. Unfortunately, RestDocumentation was also an argument
to MockMvcRestDocumentation.documentationConfiguration which made it
impossible to use Spring REST Docs without having JUnit on the
classpath.

This commit introduces JUnitRestDocumentation and
ManualRestDocumentation. The format is a direct replacement for
RestDocumentation which has been reworked to delegate to
JUnitRestDocumentation. The latter allows manual management of the
RestDocumentationContext, primarily for use with TestNG.

A new interface, RestDocumentationContextProvider, has been introduced.
It is implemented by RestDocumentation, JUnitRestDocumentation and
ManualRestDocumentation.
MockMvcRestDocumentation.documentationConfiguration has been overridden
to also accept a RestDocumentationContextProvider. The method that
accepts a RestDocumentation has been deprecated, as has
RestDocumentation itself.

The documentation has been updated to encourage the use of
JUnitRestDocumentation and a sample illustrating the use of Spring REST
Docs with TestNG has been added.

Closes gh-171
2016-02-09 17:31:32 +00:00
Andy Wilkinson
27f919748b Upgrade to the latest version of the Spring IO Plugin 2016-02-03 17:18:44 +00:00
Andy Wilkinson
130b411e2a Add support for using REST Assured to generate documentation snippets
This commit adds a new module, spring-restdocs-restassured, that
can be used to generate documentation snippets when testing a service
with REST Assured.

Please refer to the updated reference documentation for details.

Thanks to Johan Haleby for making a change to REST Assured so that
path parameters could be documented.

Closes gh-102
2016-01-29 12:31:37 +00:00
Andy Wilkinson
8914ab5767 Merge branch '1.0.x' 2016-01-17 20:26:40 +00:00
Andy Wilkinson
194e62bde3 Remove assumption that working directory will be the project’s root
The plugin for building the samples assumed that the current working
directory would be the directory containing the project’s build.gradle.
While this is generally true on the command line (it isn’t if
-project-dir is used), it isn’t true in Gradle’s IDE integration. This
was leading to an NPE as the sampleBuild task was being configured
to depend on a null task as a result of not finding the sample’s pom.xml
or build.grade file.

This commit corrects the main build.gradle to configure each sample’s
working directory relative to the root project’s directory, rather
than relying on the working directory. It also improves
SampleBuildConfigurer so that it will throw an exception if it fails to
find a sample’s build.gradle or pom.xml rather than continuing
and triggering an NPE inside Gradle.

Closes gh-185
2016-01-17 20:25:21 +00:00
Andy Wilkinson
437d2bcbce Uniquely identify the 1.0.x branch in Sonar 2015-12-09 21:15:44 +00:00
Andy Wilkinson
88d3e72ae9 Upgrade to Spring Framework 4.1.8.RELEASE 2015-12-09 10:48:56 +00:00