Merge remote-tracking branch 'upstream/3.1.x' into 3.1.x

Author: jameskleeh

build.gradle

@@ -21,7 +21,7 @@ apply plugin: 'idea'
 ext {
     bintrayPublish = false
     // Sets release version
-    grailsVersion = '3.1.2.BUILD-SNAPSHOT'
+    grailsVersion = '3.1.3.BUILD-SNAPSHOT'
     isBuildSnapshot = grailsVersion.endsWith(".BUILD-SNAPSHOT")
     isTravisBuild = System.getenv().get("TRAVIS") == 'true'
 
@@ -44,7 +44,7 @@ ext {
     reactorVersion = '2.0.6.RELEASE'
 
     spockVersion = '1.0-groovy-2.4'
-    springBootVersion = "1.3.2.RELEASE"
+    springBootVersion = "1.3.3.RELEASE"
     springLoadedVersion = "1.2.5.RELEASE"
     springLoadedCommonOptions = "-Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true"
     springVersion = "4.2.4.RELEASE"

grails-bom/plugins.properties

@@ -10,5 +10,5 @@ asset-pipeline=3.0.15
 scaffolding=3.2.1
 fields=2.1.2
 geb=1.0.1
-views-json=1.0.3
-views-markup=1.0.3
+views-json=1.0.4
+views-markup=1.0.4

grails-core/src/test/groovy/grails/util/GrailsUtilTests.java

@@ -35,7 +35,7 @@
 public class GrailsUtilTests extends TestCase {
 
     public void testGrailsVersion() {
-        assertEquals("3.1.2.BUILD-SNAPSHOT", GrailsUtil.getGrailsVersion());
+        assertEquals("3.1.3.BUILD-SNAPSHOT", GrailsUtil.getGrailsVersion());
     }
 
     @Override