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

@@ -32,7 +32,7 @@ sonarRunner {
}
ext {
springVersion = '4.1.7.RELEASE'
springVersion = '4.1.8.RELEASE'
javadocLinks = [
'http://docs.oracle.com/javase/8/docs/api/',
"http://docs.spring.io/spring-framework/docs/$springVersion/javadoc-api/",

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>

View File

@@ -3,12 +3,12 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'org.springframework.boot:spring-boot-gradle-plugin:1.2.6.RELEASE'
classpath 'org.springframework.boot:spring-boot-gradle-plugin:1.2.7.RELEASE'
}
}
plugins {
id "org.asciidoctor.convert" version "1.5.2"
id "org.asciidoctor.convert" version "1.5.3"
}
apply plugin: 'java'