diff --git a/build.gradle b/build.gradle index 32a4ba0e..5b7e1c98 100644 --- a/build.gradle +++ b/build.gradle @@ -194,7 +194,7 @@ configure(rootProject) { destinationDir = new File(buildDir, "apidocs") } - task docsZip(type: Zip, dependsOn: [':docs:asciidoctor']) { + task docsZip(type: Zip, dependsOn: [':spring-cloud-open-service-broker-docs:asciidoctor']) { group = "Distribution" classifier = "docs" description = "Builds -${classifier} archive containing api and reference " + @@ -203,8 +203,8 @@ configure(rootProject) { from(apidocs) { into "apidocs" } - println project.tasks.findByPath(':docs:asciidoctor') - from(project.tasks.findByPath(':docs:asciidoctor')) { + println project.tasks.findByPath(':spring-cloud-open-service-broker-docs:asciidoctor') + from(project.tasks.findByPath(':spring-cloud-open-service-broker-docs:asciidoctor')) { into 'reference' } } diff --git a/docs/build.gradle b/docs/build.gradle deleted file mode 100644 index 336f81dd..00000000 --- a/docs/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - id 'org.asciidoctor.convert' -} - -dependencyManagement { - imports { - mavenBom "org.springframework.boot:spring-boot-dependencies:${springBootVersion}" - } -} - -apply plugin: 'org.asciidoctor.convert' - -dependencies { - compile project(":spring-cloud-open-service-broker-core") - compile("org.springframework.boot:spring-boot-starter") - compile("org.springframework.boot:spring-boot-starter-security") - compile("org.springframework.boot:spring-boot-starter-tomcat") -} - -asciidoctor { - - attributes 'revnumber': project.version, - 'branch-or-tag': project.version.endsWith('SNAPSHOT') ? 'master' : "v${project.version}", - 'nofooter': true, - 'allow-uri-read': '' -} diff --git a/settings.gradle b/settings.gradle index 1823a92b..6167d8a8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,11 +1,11 @@ rootProject.name = "spring-cloud-open-service-broker" +include ":spring-cloud-open-service-broker-docs" include ":spring-cloud-open-service-broker-core" include ":spring-cloud-open-service-broker-autoconfigure" include ":spring-cloud-starter-open-service-broker-webmvc" -include ":docs" +project(":spring-cloud-open-service-broker-docs").projectDir = "$rootDir/spring-cloud-open-service-broker-docs" as File project(":spring-cloud-open-service-broker-core").projectDir = "$rootDir/spring-cloud-open-service-broker-core" as File project(":spring-cloud-open-service-broker-autoconfigure").projectDir = "$rootDir/spring-cloud-open-service-broker-autoconfigure" as File project(":spring-cloud-starter-open-service-broker-webmvc").projectDir = "$rootDir/spring-cloud-starter-open-service-broker-webmvc" as File -project(":docs").projectDir = "$rootDir/docs" as File diff --git a/spring-cloud-open-service-broker-docs/build.gradle b/spring-cloud-open-service-broker-docs/build.gradle new file mode 100644 index 00000000..d1254b63 --- /dev/null +++ b/spring-cloud-open-service-broker-docs/build.gradle @@ -0,0 +1,44 @@ +/* + * Copyright 2016-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +plugins { + id 'org.asciidoctor.convert' +} + +description = "Spring Cloud Open Service Broker Documentation" + +dependencyManagement { + imports { + mavenBom "org.springframework.boot:spring-boot-dependencies:${springBootVersion}" + } +} + +apply plugin: 'org.asciidoctor.convert' + +dependencies { + compile project(":spring-cloud-open-service-broker-core") + compile("org.springframework.boot:spring-boot-starter") + compile("org.springframework.boot:spring-boot-starter-security") + compile("org.springframework.boot:spring-boot-starter-tomcat") +} + +asciidoctor { + + attributes 'revnumber': project.version, + 'branch-or-tag': project.version.endsWith('SNAPSHOT') ? 'master' : "v${project.version}", + 'nofooter': true, + 'allow-uri-read': '' +} diff --git a/docs/src/docs/asciidoc/api-version-verification.adoc b/spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/api-version-verification.adoc similarity index 100% rename from docs/src/docs/asciidoc/api-version-verification.adoc rename to spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/api-version-verification.adoc diff --git a/docs/src/docs/asciidoc/example-service-broker.adoc b/spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/example-service-broker.adoc similarity index 100% rename from docs/src/docs/asciidoc/example-service-broker.adoc rename to spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/example-service-broker.adoc diff --git a/docs/src/docs/asciidoc/getting-started.adoc b/spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/getting-started.adoc similarity index 100% rename from docs/src/docs/asciidoc/getting-started.adoc rename to spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/getting-started.adoc diff --git a/docs/src/docs/asciidoc/index.adoc b/spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/index.adoc similarity index 100% rename from docs/src/docs/asciidoc/index.adoc rename to spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/index.adoc diff --git a/docs/src/docs/asciidoc/introduction.adoc b/spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/introduction.adoc similarity index 100% rename from docs/src/docs/asciidoc/introduction.adoc rename to spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/introduction.adoc diff --git a/docs/src/docs/asciidoc/service-bindings.adoc b/spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/service-bindings.adoc similarity index 100% rename from docs/src/docs/asciidoc/service-bindings.adoc rename to spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/service-bindings.adoc diff --git a/docs/src/docs/asciidoc/service-broker-security.adoc b/spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/service-broker-security.adoc similarity index 100% rename from docs/src/docs/asciidoc/service-broker-security.adoc rename to spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/service-broker-security.adoc diff --git a/docs/src/docs/asciidoc/service-catalog.adoc b/spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/service-catalog.adoc similarity index 100% rename from docs/src/docs/asciidoc/service-catalog.adoc rename to spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/service-catalog.adoc diff --git a/docs/src/docs/asciidoc/service-instances.adoc b/spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/service-instances.adoc similarity index 100% rename from docs/src/docs/asciidoc/service-instances.adoc rename to spring-cloud-open-service-broker-docs/docs/src/docs/asciidoc/service-instances.adoc diff --git a/docs/src/test/java/com/example/servicebroker/ExampleApiVersionConfiguration.java b/spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleApiVersionConfiguration.java similarity index 100% rename from docs/src/test/java/com/example/servicebroker/ExampleApiVersionConfiguration.java rename to spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleApiVersionConfiguration.java diff --git a/docs/src/test/java/com/example/servicebroker/ExampleCatalogConfiguration.java b/spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleCatalogConfiguration.java similarity index 100% rename from docs/src/test/java/com/example/servicebroker/ExampleCatalogConfiguration.java rename to spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleCatalogConfiguration.java diff --git a/docs/src/test/java/com/example/servicebroker/ExampleCatalogService.java b/spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleCatalogService.java similarity index 100% rename from docs/src/test/java/com/example/servicebroker/ExampleCatalogService.java rename to spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleCatalogService.java diff --git a/docs/src/test/java/com/example/servicebroker/ExampleSecurityConfig.java b/spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleSecurityConfig.java similarity index 100% rename from docs/src/test/java/com/example/servicebroker/ExampleSecurityConfig.java rename to spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleSecurityConfig.java diff --git a/docs/src/test/java/com/example/servicebroker/ExampleServiceBindingService.java b/spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleServiceBindingService.java similarity index 100% rename from docs/src/test/java/com/example/servicebroker/ExampleServiceBindingService.java rename to spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleServiceBindingService.java diff --git a/docs/src/test/java/com/example/servicebroker/ExampleServiceInstanceService.java b/spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleServiceInstanceService.java similarity index 100% rename from docs/src/test/java/com/example/servicebroker/ExampleServiceInstanceService.java rename to spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/ExampleServiceInstanceService.java diff --git a/docs/src/test/java/com/example/servicebroker/catalog-minimal.properties b/spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/catalog-minimal.properties similarity index 100% rename from docs/src/test/java/com/example/servicebroker/catalog-minimal.properties rename to spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/catalog-minimal.properties diff --git a/docs/src/test/java/com/example/servicebroker/catalog-minimal.yml b/spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/catalog-minimal.yml similarity index 100% rename from docs/src/test/java/com/example/servicebroker/catalog-minimal.yml rename to spring-cloud-open-service-broker-docs/docs/src/test/java/com/example/servicebroker/catalog-minimal.yml