Commit Graph

253 Commits

Author SHA1 Message Date
Andy Wilkinson
c7aaff7e7e Merge branch '1.0.x' 2016-01-27 17:19:19 +00:00
Andy Wilkinson
2b21e8e766 Merge pull request #188 from Grant Hutchins
* gh-188:
  Fix typo
2016-01-27 17:19:12 +00:00
Grant Hutchins
d55b5b7738 Fix typo
Closes gh-188
2016-01-27 17:18:57 +00:00
Andy Wilkinson
5f4541bf69 Collapse Maven and Gradle setup into one section with switchable examples
This commit adds an Asciidoctor extension that post-processes code
blocks, collapsing any secondary blocks into the preceding primary
block. The primary block is then augmented with a switch. This switch
contains one item for each block. Clicking an item causes the associated
block’s content to be displayed. Each item is named using its block’s
title.

The getting started instructions have been updated to take advantage of
this new switching support, with the Maven and Gradle instructions
being collapsed into a single section.

Closes gh-189
2016-01-27 17:02:00 +00:00
Andy Wilkinson
43899143d9 Merge branch '1.0.x' 2016-01-26 12:52:25 +00:00
Andy Wilkinson
97ae7a9ce9 Fix javadoc problem with use of em dash 2016-01-26 12:51:37 +00:00
Andy Wilkinson
4fda123b74 Merge branch '1.0.x' 2016-01-26 12:40:02 +00:00
Andy Wilkinson
d184425216 Polishing 2016-01-26 12:38:34 +00:00
Andy Wilkinson
f63e08e7d4 Merge branch '1.0.x' 2016-01-26 11:14:36 +00:00
Andy Wilkinson
02fa42445f Make consistent use of the diamond operator with generic types 2016-01-26 11:14:29 +00:00
Andy Wilkinson
0a57b9a291 Merge branch '1.0.x' 2016-01-19 13:37:43 +00:00
Andy Wilkinson
08b24e0496 Remove redundant Eclipse metadata 2016-01-19 13:36:20 +00:00
Andy Wilkinson
1823513f4e Merge branch '1.0.x' 2016-01-19 13:29:15 +00:00
Andy Wilkinson
82a5b96b69 Update the default copyright header for 2016 2016-01-19 13:28:19 +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
202b75637e Merge branch '1.0.x' 2015-12-10 09:56:42 +00:00
Andy Wilkinson
99a2e4f0e0 Update the samples to build against 1.0.2 snapshots 2015-12-10 09:55:36 +00:00
Spring Buildmaster
83e56f68ab Next development version 2015-12-10 01:43:58 -08:00
Andy Wilkinson
64b1d0ea8c Merge branch '1.0.x' 2015-12-09 21:16:30 +00:00
Andy Wilkinson
437d2bcbce Uniquely identify the 1.0.x branch in Sonar 2015-12-09 21:15:44 +00:00
Andy Wilkinson
504ba8c29c Merge branch '1.0.x' 2015-12-09 21:05:33 +00:00
Andy Wilkinson
f6f4b77331 Upgrade the samples to use the latest Asciidoctor plugins 2015-12-09 10:52:19 +00:00
Andy Wilkinson
939769db11 Upgrade the samples to Spring Boot 1.2.7.RELEASE 2015-12-09 10:50:20 +00:00
Andy Wilkinson
88d3e72ae9 Upgrade to Spring Framework 4.1.8.RELEASE 2015-12-09 10:48:56 +00:00
Andy Wilkinson
ac058944b8 Merge branch '1.0.x' 2015-12-03 17:54:49 +00:00
Johnny Lim
a3c3bef093 Fix the link in the documentation to the default snippet templates
Closes gh-160
2015-12-03 17:54:43 +00:00
Andy Wilkinson
eab4067673 Merge branch '1.0.x' 2015-12-03 17:51:16 +00:00
Andy Wilkinson
e8cf957f15 Update documentation to mention that you can write custom preprocessors
Closes gh-156
2015-12-03 17:50:34 +00:00
Andy Wilkinson
75646b0e6b Merge branch '1.0.x' 2015-12-03 17:40:05 +00:00
Andy Wilkinson
7a819b15b6 Make it clear that JSON array responses can be documented
Closes gh-163
2015-12-03 17:39:00 +00:00
Andy Wilkinson
416d7b3a36 Merge branch '1.0.x' 2015-12-03 16:02:22 +00:00
Andy Wilkinson
c559efb81b Provide examples for JUnit rule configuration with both Maven and Gradle
Closes gh-162
2015-12-03 16:02:16 +00:00
Andy Wilkinson
09cc71c4b9 Merge branch '1.0.x' 2015-11-16 17:49:00 +00:00
Andy Wilkinson
310639a4cc Merge branch 'gh-167' into 1.0.x 2015-11-16 17:48:51 +00:00
Andy Wilkinson
acb87b98b8 Improve testing of XML attribute handling
Closes gh-166
2015-11-16 17:47:07 +00:00
cschaetzlein
58b992d99e Allow individual attributes in an XML element to be documented
Documenting an XML attribute in the XML payload leads to a
NullPointerException since no parent nodes exists for an XML
attribute. Rather than always trying to remove a node from its parent,
this commit changes the logic to apply special treament to nodes that
are attributes and remove the attribute from its owning element
instead.

Closes gh-167
2015-11-16 17:46:22 +00:00
Andy Wilkinson
739ce3ef25 Merge branch '1.0.x' 2015-10-22 10:06:21 +01:00
Andy Wilkinson
ff75ef153e Merge branch '1.0.x' 2015-10-22 10:05:32 +01:00
Andy Wilkinson
75085477b6 Suppress unwanted output to System.err when pretty printing content
Previously, when the XML pretty printer attempted to pretty print
the content of a request or response it would output an error to
System.err if the content was not valid XML. While, benign, this
output was distracting.

This commit updates the XML pretty printer to suppress its output to
System.err by configuring it with an ErrorHandler and an ErrorListener
that swallow any errors of which they are notified.

Closes gh-153
2015-10-22 10:04:56 +01:00
Andy Wilkinson
9a3e4c5f70 Update the samples to build against 1.0.1 snapshots 2015-10-22 10:04:56 +01:00
Andy Wilkinson
697275f347 Begin development of 1.1.0 2015-10-15 17:51:17 +01:00
Andy Wilkinson
69f6b40e28 Correct the links in the documentation to the samples on GitHub
Closes gh-147
2015-10-09 09:43:34 +01:00
Spring Buildmaster
260ffeebba Next development version 2015-10-07 05:48:20 -07:00
Andy Wilkinson
cfcc43c482 Ensure that generated poms contain <name> and <description> 2015-10-07 11:48:09 +01:00
Andy Wilkinson
6debc593e5 Don't apply to Spring IO Plugin to the docs project 2015-10-07 10:38:50 +01:00
Andy Wilkinson
0213c9e6fd Add the Spring IO plugin to the build 2015-10-07 09:47:21 +01:00
Andy Wilkinson
6443ed177e Fix building Maven sample on Windows 2015-10-06 17:48:30 +01:00
Andy Wilkinson
75e965c782 Correct the name of the mvnw script on Windows 2015-10-06 17:15:47 +01:00
Andy Wilkinson
9a362abe77 Update reference to mvnw.bat when building samples on Windows 2015-10-06 17:07:46 +01:00