Merge branch 'master' into 2.0.x

This commit is contained in:
Marcin Grzejszczak
2017-08-29 10:03:57 +02:00
54 changed files with 3352 additions and 54 deletions

View File

@@ -38,13 +38,10 @@
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<inherited>false</inherited>
<dependencies>
<dependency>
<groupId>io.spring.asciidoctor</groupId>
<artifactId>spring-asciidoctor-extensions</artifactId>
<version>0.1.0.RELEASE</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>