Merge branch 'master' into 2.0.x

2017-08-29 11:59:03 +02:00
parent a905868732 0418f6f34a
commit f1efb9344d
46 changed files with 3736 additions and 8 deletions
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -27,6 +27,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>