From 723b7a284f1c4cecffe484f546e3b33a3c44a29b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Oct 2015 10:22:55 +0100 Subject: [PATCH] Use default location for .adoc source in Gradle-based sample MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously both samples supported Maven and Gradle. Due to the different default locations between the two build systems, the Gradle-based sample was configured to use Maven’s default location for its .adoc files. The samples have now been updated so that one sample uses Maven and the other uses Gradle. However, when this change was made, the customization of the Gradle-based sample’s .adoc file location wasn’t removed. This commit updates the Gradle-based sample to use the default location, src/docs/asciidoc, for its .adoc source files. Closes gh-145 --- samples/rest-notes-spring-hateoas/build.gradle | 1 - .../src/{main => docs}/asciidoc/api-guide.adoc | 0 .../src/{main => docs}/asciidoc/getting-started-guide.adoc | 0 3 files changed, 1 deletion(-) rename samples/rest-notes-spring-hateoas/src/{main => docs}/asciidoc/api-guide.adoc (100%) rename samples/rest-notes-spring-hateoas/src/{main => docs}/asciidoc/getting-started-guide.adoc (100%) diff --git a/samples/rest-notes-spring-hateoas/build.gradle b/samples/rest-notes-spring-hateoas/build.gradle index a099b066..f6c8ca4a 100644 --- a/samples/rest-notes-spring-hateoas/build.gradle +++ b/samples/rest-notes-spring-hateoas/build.gradle @@ -48,7 +48,6 @@ test { } asciidoctor { - sourceDir 'src/main/asciidoc' // Align with Maven's default location attributes 'snippets': snippetsDir inputs.dir snippetsDir dependsOn test diff --git a/samples/rest-notes-spring-hateoas/src/main/asciidoc/api-guide.adoc b/samples/rest-notes-spring-hateoas/src/docs/asciidoc/api-guide.adoc similarity index 100% rename from samples/rest-notes-spring-hateoas/src/main/asciidoc/api-guide.adoc rename to samples/rest-notes-spring-hateoas/src/docs/asciidoc/api-guide.adoc diff --git a/samples/rest-notes-spring-hateoas/src/main/asciidoc/getting-started-guide.adoc b/samples/rest-notes-spring-hateoas/src/docs/asciidoc/getting-started-guide.adoc similarity index 100% rename from samples/rest-notes-spring-hateoas/src/main/asciidoc/getting-started-guide.adoc rename to samples/rest-notes-spring-hateoas/src/docs/asciidoc/getting-started-guide.adoc