Skip to content

Commit 8ff945e

Browse files
Revert SnakeYAML changes (#13335)
Revert "Replace deprecated constructor calls (#13271)" - This reverts commit 213a4a1. Revert "Add SnakeYAML BOM (#13256)" - This reverts commit 696d33a.
1 parent 28cca7f commit 8ff945e

File tree

14 files changed

+13
-579
lines changed

14 files changed

+13
-579
lines changed

build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@ ext {
6868
names : ['grails-async', 'grails-events'],
6969
modules: ['gpars', 'rxjava', 'rxjava2']
7070
],
71-
snakeyaml : [
72-
version: snakeyamlVersion,
73-
group : 'org.yaml',
74-
names : ['snakeyaml'],
75-
modules: ['']
76-
],
7771
spock : [
7872
version: spockVersion,
7973
group : 'org.spockframework',

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ concurrentlinkedhashmapVersion=1.4.2
2121
springLoadedVersion=1.2.8.RELEASE
2222
jnaVersion=4.2.2
2323
slf4jVersion=1.7.25
24-
snakeyamlVersion=2.2
2524
directoryWatcherVersion=0.5.1
2625
junitVersion=4.12
2726
caffeineVersion=2.6.2

grails-bootstrap/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
33
dependencies {
44
compile ( "org.codehaus.groovy:groovy-xml:$groovyVersion" )
55
compile ( "org.codehaus.groovy:groovy-templates:$groovyVersion" )
6-
compile "org.yaml:snakeyaml:$snakeyamlVersion"
6+
compile "org.yaml:snakeyaml:1.14"
77

88
compileOnly("io.methvin:directory-watcher:0.3.0")
99
compileOnly("org.fusesource.jansi:jansi:$jansiVersion")

grails-bootstrap/src/main/groovy/grails/util/Metadata.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ import org.grails.config.NavigableMap
2222
import org.grails.io.support.FileSystemResource
2323
import org.grails.io.support.Resource
2424
import org.grails.io.support.UrlResource
25-
import org.yaml.snakeyaml.LoaderOptions
2625
import org.yaml.snakeyaml.Yaml
27-
import org.yaml.snakeyaml.constructor.SafeConstructor
2826

2927
import java.lang.ref.Reference
3028
import java.lang.ref.SoftReference
@@ -169,7 +167,7 @@ class Metadata extends NavigableMap implements ConfigMap {
169167
}
170168

171169
private Object loadYml(InputStream input) {
172-
Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()))
170+
Yaml yaml = new Yaml()
173171
def loadedYaml = yaml.loadAll(input)
174172
List result = []
175173
for(Object yamlObject : loadedYaml) {

grails-bootstrap/src/main/groovy/org/grails/config/CodeGenConfig.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ import groovy.transform.CompileDynamic
2222
import groovy.transform.CompileStatic
2323
import org.codehaus.groovy.runtime.DefaultGroovyMethods
2424
import org.codehaus.groovy.runtime.typehandling.GroovyCastException
25-
import org.yaml.snakeyaml.LoaderOptions
2625
import org.yaml.snakeyaml.Yaml
27-
import org.yaml.snakeyaml.constructor.SafeConstructor
2826

2927

3028
/**
@@ -154,7 +152,7 @@ class CodeGenConfig implements Cloneable, ConfigMap {
154152

155153
@CompileDynamic // fails with CompileStatic!
156154
void loadYml(InputStream input) {
157-
Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()))
155+
Yaml yaml = new Yaml()
158156
for(Object yamlObject : yaml.loadAll(input)) {
159157
if(yamlObject instanceof Map) { // problem here with CompileStatic
160158
mergeMap((Map)yamlObject)

0 commit comments

Comments
 (0)