Merge branch '3.0.x'

Author: graemerocher

README.md

@@ -62,8 +62,6 @@ After pushing these changes to the repository you must wait for [the build](http
 
 The [Travis CI](https://travis-ci.org/grails/grails-core) build will automatically upload the tagged release to Github and be available of the [Releases page](https://github.com/grails/grails-core/releases).
 
-Note: Although by default Grails uses Artefactory to resolve dependencies, it is useful to have them in Maven Central too. To ensure they go to Maven Central login to [Sonatype OSS Nexus](https://oss.sonatype.org) with your account details then "Close" and "Release" the staged JAR files.
-
 License
 ---
 

build.gradle

@@ -12,12 +12,14 @@ buildscript {
         classpath "com.netflix.nebula:gradle-extra-configurations-plugin:2.2.0"
         classpath "com.github.adrianbk:gradle-travisci-trigger-plugin:1.0.0"
         classpath 'com.bmuschko:gradle-nexus-plugin:2.3'
+        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3"
         classpath 'net.gvmtool:gradle-sdkvendor-plugin:0.3.1'
     }
 }
 
 apply plugin: 'idea'
 
+
 ext {
     bintrayPublish = false
     // Sets release version
@@ -65,6 +67,8 @@ ext {
 }
 
 version = grailsVersion
+group = "org.grails"
+apply plugin: 'io.codearte.nexus-staging'
 
 // directories created during the build which are related
 // to turning the workspace root into a GRAILS_HOME

gradle/assemble.gradle

@@ -6,10 +6,13 @@ def libsConfigurations = []
 subprojects { subproject ->
     if(subproject.name == 'grails-dependencies') return
     if(subproject.name == 'grails-bom') return
-    configurations {
-        libsConfigurations << libs {
-            extendsFrom compile, runtime
-            ["jsp21", "uaa"].collect { configurations.findByName(it) }.findAll { it != null }.each { extendsFrom it }
+    if(subproject.name == 'grails-shell') {
+
+        configurations {
+            libsConfigurations << libs {
+                extendsFrom compile, runtime
+                ["jsp21", "uaa"].collect { configurations.findByName(it) }.findAll { it != null }.each { extendsFrom it }
+            }
         }
     }
 }

grails-plugin-converters/src/main/groovy/grails/converters/JSON.java

@@ -116,12 +116,8 @@ private void finalizeRender(Writer out) {
      */
     public void render(Writer out) throws ConverterException {
         prepareRender(out);
-        try {
-            value(target);
-        }
-        finally {
-            finalizeRender(out);
-        }
+        value(target);
+        finalizeRender(out);
     }
 
     /**

grails-plugin-converters/src/main/groovy/grails/converters/XML.java

@@ -128,12 +128,12 @@ public void render(Writer out) throws ConverterException {
             writer.startNode(getElementName(target));
             convertAnother(target);
             writer.end();
+            finalizeRender(out);
         }
         catch (Exception e) {
             throw new ConverterException(e);
         }
         finally {
-            finalizeRender(out);
             isRendering = false;
         }
     }

grails-web-taglib/src/main/groovy/org/grails/web/taglib/encoder/WebOutputContextLookup.java

@@ -26,6 +26,7 @@
 import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.grails.web.taglib.WebRequestTemplateVariableBinding;
 import org.grails.web.util.GrailsApplicationAttributes;
+import org.grails.web.util.WebUtils;
 import org.springframework.core.Ordered;
 import org.springframework.web.context.request.RequestAttributes;
 
@@ -105,8 +106,9 @@ public void setContentType(String contentType) {
 
         @Override
         public boolean isContentTypeAlreadySet() {
-            HttpServletResponse response = lookupResponse();
-            return response.isCommitted() || response.getContentType() != null;
+            GrailsWebRequest webRequest = lookupWebRequest();
+            HttpServletResponse response = webRequest.getResponse();
+            return response.isCommitted() || (response.getContentType() != null && webRequest.getRequest().getAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE) == null);
         }
 
         protected GrailsWebRequest lookupWebRequest() {

travis-build.sh

@@ -58,7 +58,7 @@ if [[ $TRAVIS_PULL_REQUEST == 'false' && $EXIT_STATUS -eq 0
     echo "Running Gradle publish for branch $TRAVIS_BRANCH"
 
     if [[ $TRAVIS_TAG =~ ^v[[:digit:]] ]]; then
-        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/secring.gpg" publish uploadArchives || EXIT_STATUS=$?
+        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/secring.gpg" publish uploadArchives closeAndPromoteRepository || EXIT_STATUS=$?
         ./gradlew assemble || EXIT_STATUS=$?
 
         # Configure GIT