SpringCloud/spring-cloud-cloudfoundry
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-08-29 12:29:29 +02:00
parent 98b2a42650 9129d9abad
commit f0fafe545e
39 changed files with 3699 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/pom.xml
View File

@@ -14,7 +14,7 @@
<properties>
<docs.main>spring-cloud-cloudfoundry</docs.main>
<main.basedir>${basedir}/..</main.basedir>
<docs.whitelisted.branches>1.0.x</docs.whitelisted.branches>
<docs.whitelisted.branches>1.0.x,2.0.x</docs.whitelisted.branches>
</properties>
<build>
<plugins>
@@ -36,6 +36,10 @@
<artifactId>asciidoctor-maven-plugin</artifactId>
<inherited>false</inherited>
</plugin>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>