Merge branch 'master' into 2.0.x

2017-08-29 15:07:14 +02:00
parent ded32cd66a 4a8913f7ea
commit 9d2964ee7d
41 changed files with 3706 additions and 4 deletions
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -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>