Commit Graph

876 Commits

Author SHA1 Message Date
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
Andy Wilkinson
820115b1f8 Merge pull request #614 from Kevin Fan
* gh-614:
  Fix minor mistake made from last merge for `README.md`

Closes gh-614
2019-04-15 10:53:01 +01:00
kevinjom
2f5bc50b84 Fix minor mistake made from last merge for README.md
See commit 6069d2864f

See gh-614
2019-04-15 10:51:48 +01:00
Andy Wilkinson
0edd61ec35 Merge pull request #602 from Spring Operator
Closes gh-602

* gh-602:
  Use HTTPS for external links where possible
2019-03-26 12:22:40 +00:00
Spring Operator
1d0ffa7ac4 Use HTTPS for external links where possible
See gh-602
2019-03-26 12:22:13 +00:00
Andy Wilkinson
32c92bf885 Merge branch '1.2.x' 2019-03-26 12:11:10 +00:00
Andy Wilkinson
590b024d70 Merge pull request #611 from Spring Operator
* gh-611:
  Polish "Use HTTPS for externals links where possible"
  Use HTTPS for externals links where possible
2019-03-26 12:01:04 +00:00
Andy Wilkinson
2dda908c7e Polish "Use HTTPS for externals links where possible"
See gh-611
2019-03-26 12:00:27 +00:00
Spring Operator
cb5d7c2220 Use HTTPS for externals links where possible
See gh-611
2019-03-26 11:59:53 +00:00
Andy Wilkinson
c2c4ed7752 Merge branch '1.1.x' into 1.2.x 2019-03-26 11:45:06 +00:00
Andy Wilkinson
d94c1c75a9 Merge pull request #610 from Spring Operator
* gh-610:
  Polish "Use HTTPS for external links where possible"
  Use HTTPS for external links where possible
2019-03-26 11:29:32 +00:00
Andy Wilkinson
9444083b81 Polish "Use HTTPS for external links where possible"
See gh-610
2019-03-26 11:28:57 +00:00
Spring Operator
1fa4c293c6 Use HTTPS for external links where possible
See gh-610
2019-03-26 11:28:26 +00:00
Andy Wilkinson
2cfe47a330 Merge branch '1.0.x' into 1.1.x 2019-03-26 10:53:52 +00:00
Andy Wilkinson
957f3bfa30 Merge pull request #609 from Spring Operator
* gh-609:
  Polish "Use HTTPS for external links where possible"
  Use HTTPS for external links where possible
2019-03-26 10:49:36 +00:00
Andy Wilkinson
447cc4940e Polish "Use HTTPS for external links where possible"
See gh-609
2019-03-26 10:49:19 +00:00
Spring Operator
f2e60ea347 Use HTTPS for external links where possible
See gh-609
2019-03-26 10:28:47 +00:00
Andy Wilkinson
4c172f44d3 Merge branch '1.2.x' 2019-03-26 10:10:55 +00:00
Andy Wilkinson
e8e813c41e Merge branch '1.1.x' into 1.2.x 2019-03-26 10:08:46 +00:00
Andy Wilkinson
9320399acb Merge pull request #607 from Spring Operator
* gh-607:
  Use HTTPS where possible for external links in XML files

Closes gh-607
2019-03-26 10:06:02 +00:00
Spring Operator
c3890f9312 Use HTTPS where possible for external links in XML files
See gh-607
2019-03-26 10:05:27 +00:00
Andy Wilkinson
957f352e76 Merge branch '1.2.x' 2019-03-20 14:45:39 +00:00
Andy Wilkinson
eb560514da Merge branch '1.1.x' into 1.2.x 2019-03-20 14:45:31 +00:00
Andy Wilkinson
44eda27eb7 Merge branch '1.0.x' into 1.1.x 2019-03-20 14:45:14 +00:00
Andy Wilkinson
4fdb1f5361 Drop Travis CI configuration 2019-03-20 14:44:46 +00:00
Andy Wilkinson
13a3a60c4a Merge branch '1.2.x' 2019-03-20 14:40:59 +00:00
Andy Wilkinson
68348c48ca Merge branch '1.1.x' into 1.2.x 2019-03-20 14:40:50 +00:00
Andy Wilkinson
34131d111e Merge branch '1.0.x' into 1.1.x 2019-03-20 14:38:24 +00:00
Andy Wilkinson
62e6c9cd3d Switch to checkstyle.org for Checkstyle DTDs 2019-03-20 14:38:05 +00:00
Andy Wilkinson
6069d2864f Merge branch '1.2.x' 2019-03-19 11:51:27 +00:00
Andy Wilkinson
a07e7442af Merge branch '1.1.x' into 1.2.x 2019-03-19 11:50:13 +00:00