Merge branch '1.0.x'

This commit is contained in:
Andy Wilkinson
2015-12-09 21:05:33 +00:00
3 changed files with 5 additions and 5 deletions

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.2.6.RELEASE</version>
<version>1.2.7.RELEASE</version>
<relativePath />
</parent>
@@ -73,7 +73,7 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>1.5.2</version>
<version>1.5.2.1</version>
<executions>
<execution>
<id>generate-docs</id>