Revert "Upgrade to Groovy 2.4.6 and remove forked StreamingJsonBuilder"

This reverts commit 695a11c.

Author: graemerocher

build.gradle

@@ -36,7 +36,7 @@ ext {
     datastoreVersion = "5.0.2.BUILD-SNAPSHOT"
     gantVersion = "1.9.6"
     gdocEngineVersion = "1.0.1"
-    groovyVersion = System.getenv('CI_GROOVY_VERSION') ?: "2.4.6"
+    groovyVersion = System.getenv('CI_GROOVY_VERSION') ?: "2.4.5"
     ivyVersion = "2.3.0"
     jansiVersion = "1.11"
     jlineVersion = "2.12"

grails-plugin-rest/src/main/groovy/grails/rest/render/errors/VndErrorJsonRenderer.groovy

@@ -18,9 +18,10 @@ package grails.rest.render.errors
 import grails.rest.render.RenderContext
 import grails.util.GrailsWebUtil
 import groovy.json.JsonOutput
-import groovy.json.StreamingJsonBuilder
 import groovy.transform.CompileStatic
 import grails.web.mime.MimeType
+import org.grails.web.json.StreamingJsonBuilder
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpMethod
 import org.springframework.validation.BeanPropertyBindingResult
 import org.springframework.validation.Errors

grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonCollectionRenderer.groovy

@@ -16,9 +16,11 @@
 package grails.rest.render.hal
 
 import grails.rest.render.ContainerRenderer
+import grails.rest.render.RenderContext
 import grails.util.GrailsNameUtils
 
 import grails.web.mime.MimeType
+import org.grails.web.json.StreamingJsonBuilder
 
 
 /**

grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonRenderer.groovy

@@ -19,7 +19,6 @@ import grails.rest.Link
 import grails.rest.render.RenderContext
 import grails.rest.render.util.AbstractLinkingRenderer
 import groovy.json.JsonOutput
-import groovy.json.StreamingJsonBuilder
 import groovy.transform.CompileStatic
 import org.grails.web.databinding.bindingsource.DataBindingSourceRegistry
 import org.grails.web.databinding.bindingsource.HalJsonDataBindingSourceCreator
@@ -28,6 +27,7 @@ import org.grails.datastore.mapping.model.MappingFactory
 import org.grails.datastore.mapping.model.PersistentEntity
 import org.grails.datastore.mapping.model.types.Association
 import org.grails.datastore.mapping.model.types.ToOne
+import org.grails.web.json.StreamingJsonBuilder
 import org.springframework.beans.PropertyAccessorFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.convert.converter.Converter