Commit Graph

906 Commits

Author SHA1 Message Date
Andy Wilkinson
ce9d0c985f Upgrade the Spring Boot-based samples to 2.1.8.RELEASE
Closes gh-645
2019-09-29 18:24:01 +01:00
Andy Wilkinson
733039d12f Upgrade to Spring Framework 5.0.15.RELEASE
Closes gh-636
2019-09-29 18:10:19 +01:00
Andy Wilkinson
5f6f7680cd Upgrade to org.asciidoctor.convert 1.5.9.2
Closes gh-642
2019-09-19 12:08:12 +01:00
Andy Wilkinson
c2521de8f1 Merge pull request #638 from ahus1
* gh-638:
  Polish "Prevent unwanted incrementing of section number in operation macro"
  Prevent unwanted incrementing of section number in operation macro

Closes gh-638
2019-09-19 11:11:22 +01:00
Andy Wilkinson
8624a33ff5 Polish "Prevent unwanted incrementing of section number in operation macro"
See gh-638
2019-09-19 11:10:57 +01:00
Alexander Schwartz
1d911367d6 Prevent unwanted incrementing of section number in operation macro
See gh-638
2019-09-19 10:45:43 +01:00
Andy Wilkinson
ae59baf38c Remove invalid and empty part from samples' getting started guides
Fixes gh-641
2019-09-19 10:37:51 +01:00
Andy Wilkinson
93a43dfd0a Consider optionality when finding uncommon fields in subsection extraction
Fixes gh-573
2019-09-18 14:26:40 +01:00
Andy Wilkinson
3f66b066f7 Improve field type resolution for fields with optional ancestors
Fixes gh-567
2019-09-18 11:53:42 +01:00
Andy Wilkinson
3a5cc58fab Test against Spring Framework 5.2 2019-09-15 15:03:50 +01:00
Andy Wilkinson
ef0973c548 Test against latest Framework 5.1 snapshot
This updates REST Docs to test against Framework's latest 5.1
snapshot. Due to a bug in the behaviour of HttpHeaders' key set [1],
HeaderRemovingOperationPreprocessor has been updated to no longer use
it when removing headers from a request or response prior to it being
documented.

[1] https://github.com/spring-projects/spring-framework/issues/22821
2019-09-14 17:38:29 +01:00
Andy Wilkinson
4bbc5b37b5 Perform compatibility testing against REST Assured 4.0 and 4.1
Closes gh-640
2019-09-13 13:02:51 +01:00
Andy Wilkinson
66787cd3a5 Broaden compatibility testing for Asciidoctor 2.x
Closes gh-630
2019-09-13 12:58:11 +01:00
Andy Wilkinson
3597ebc35a Allow responses with non-standard status codes to be documented
Fixes gh-639
2019-09-12 17:03:21 +01:00
Andy Wilkinson
d586d9f15b Drop the Grails 3 sample as it is incompatible with Framework 5
Closes gh-637
2019-08-31 07:59:43 +01:00
Andy Wilkinson
015468685e Upgrade the Grails sample to Grails 3.3.9 2019-08-30 17:59:28 +01:00
Andy Wilkinson
340b842fd4 Merge pull request #583 from nosan
* gh-583:
  Polish "Improve diagnostics for null configuration"
  Improve diagnostics for null configuration

Closes gh-583
2019-08-30 17:14:55 +01:00
Andy Wilkinson
fce255695e Polish "Improve diagnostics for null configuration"
See gh-583
2019-08-30 17:14:42 +01:00
Dmytro Nosan
b5f2454c00 Improve diagnostics for null configuration
See gh-583
2019-08-30 17:09:27 +01:00
Andy Wilkinson
c4d664c3a2 Upgrade to AssertJ 3.11.1 2019-08-30 17:08:30 +01:00
Andy Wilkinson
412c03def2 Upgrade to Spring Framework 5.0.9.RELEASE
Closes gh-636
2019-08-30 14:17:17 +01:00
Andy Wilkinson
1b87af13be Improve diagnostics when extracting a non-existent subsection
Closes gh-568
2019-08-30 14:05:50 +01:00
Andy Wilkinson
1727b4e3c8 Merge pull request #628 from ahus1
* gh-628:
  Polish "Avoid warnings when parsing AsciiDoc sub-content in Asciidoctor.load"
  Avoid warnings when parsing AsciiDoc sub-content in Asciidoctor.load

Closes gh-628
2019-08-30 12:31:01 +01:00
Andy Wilkinson
9de06a36d2 Polish "Avoid warnings when parsing AsciiDoc sub-content in Asciidoctor.load"
See gh-628
2019-08-30 12:30:45 +01:00
Alexander Schwartz
b66c8b4594 Avoid warnings when parsing AsciiDoc sub-content in Asciidoctor.load
Renderings with standard section depth first to avoid warnings that
document starts with level 3 headings. Adjust block level when
adding the content to the parent.

See gh-628
2019-08-30 12:30:36 +01:00
Andy Wilkinson
0e9f9fdf0e Merge pull request #633 from nt-jj
* gh-633:
  Polish "Allow custom snippets directory via JUnit 5"
  Allow custom snippets directory via JUnit 5

Closes gh-633
2019-08-30 11:43:45 +01:00
Andy Wilkinson
bc66fe5643 Polish "Allow custom snippets directory via JUnit 5"
See gh-633
2019-08-30 11:43:35 +01:00
Jochen Just
43ec46fcc1 Allow custom snippets directory via JUnit 5
See gh-633
2019-08-30 11:23:19 +01:00
Andy Wilkinson
cc22dbfe26 Merge branch '1.2.x' 2019-08-30 11:20:34 +01:00
Andy Wilkinson
508b3d6593 Upgrade to Spring Java Format 0.0.15 2019-08-30 11:07:04 +01:00
Andy Wilkinson
0801564321 Merge pull request #629 from ahus1
* gh-629:
  Fix IDs of sections in examples

Closes gh-629
2019-08-13 10:16:53 +01:00
Alexander Schwartz
4a084b52d0 Fix IDs of sections in examples
See gh-629
2019-08-13 10:16:16 +01:00
Andy Wilkinson
619847582a Reuse document's attributes when loading snippet content
Previously, when adding blocks for the snippets' content, the
operation macro would call Asciidoctor to load the content with
attributes that only included the projectdir. This resulted in a
failure in environments that did not set the projectdir and instead
relied on another attribute, such as gradle-projectdir as used by
the latest versions of the Asciidoctor Gradle plugin.

This commit updates the macro to reuse all of the main document's
attributes when loading the snippets' content, thereby ensuring that
any attributes available in the main document are also available
during snipppet processing.

Closes gh-624
2019-06-20 10:35:33 +01:00
Andy Wilkinson
3dabf8e53f Reinstate javadoc and sources jars for spring-restdocs-asciidoctor
See gh-581
2019-06-18 14:09:05 +01:00
Andy Wilkinson
1df2d16825 Merge branch '1.2.x' 2019-06-18 13:42:13 +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
4fee4f67cb Merge branch '1.2.x' 2019-06-18 12:58:20 +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
9c221bfb3c Polish 2019-06-18 12:55:21 +01:00
Andy Wilkinson
136df15fad Ensure that jars to be merged are built before merging them
See gh-581
2019-06-18 12:51:34 +01:00
Andy Wilkinson
ff18f8034d Add AsciidoctorJ 1.6 and 2.0 compatibility
AsciidoctorJ 1.6 is not backwards compatible with AsciidoctorJ 1.5
and AsciidoctorJ 2.0 is not backwards compatible with AsciidoctorJ 1.6
or 1.5. The backwards incompatibilities are such that they cannot be
worked around using reflection so code needs to be compiled against
each of the three versions. To this end, this commit splits
spring-restdocs-asciidoctor into several separate modules:

1. spring-restdocs-asciidoctor-support
2. spring-restdocs-asciidoctor-1.5
3. spring-restdocs-asciidoctor-1.6
4. spring-restdocs-asciidoctor-2.0

spring-restdocs-asciidoctor-support contains support code that is not
tied to a specific version of AsciidoctorJ and can be used with
1.5, 1.6 and 2.0. The other three modules contain code that is
specific to a particular version of AsciidoctorJ. Each
version-specific module uses class names that are unique across all
three modules and is written in such a way that they will back off
when used in an environment with a different version of AsciidoctorJ.
The existing spring-restdocs-asciidoctor module has been modified to
merge the version specific jars and the support jar together into a
single jar that supports AsciidoctorJ 1.5, 1.6, and 2.0.

The above-described changes should allow users to depend upon
spring-restdocs-asciidoctor as before and to now be able to use
AsciidoctorJ 1.5, 1.6, or 2.0.

Closes gh-581
2019-06-18 12:28:36 +01:00
Andy Wilkinson
00da0834df Merge branch '1.2.x' 2019-06-18 12:15:56 +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
82f3b250e8 Fix matrix testing with single selector that has multiple versions 2019-06-18 12:06:20 +01:00
Andy Wilkinson
aee49b8511 Allow Matrix tests to select single artifact in a group 2019-06-18 12:05:58 +01:00
Andy Wilkinson
6da597b0fd Merge branch '1.2.x' 2019-06-12 10:28:01 +01:00
Andy Wilkinson
8044444aac Merge pull request #620 from gavvvr
* gh-620:
  Fix lack of syntax highlighting when using Maven

Closes gh-620
2019-06-12 10:27:33 +01:00
Kirill Gavrilov
c9837c645f Fix lack of syntax highlighting when using Maven
See gh-620
2019-06-12 10:16:58 +01:00
Andy Wilkinson
d9fe25b6ec Merge branch '1.2.x' 2019-06-10 10:39:31 +01:00
Andy Wilkinson
f1eaf0c91a Add NoHTTP to the build 2019-06-10 10:38:22 +01:00