Skip to content

Commit

Permalink
Revert SnakeYAML changes (#13335)
Browse files Browse the repository at this point in the history
Revert "Replace deprecated constructor calls (#13271)"
- This reverts commit 213a4a1.

Revert "Add SnakeYAML BOM (#13256)"
- This reverts commit 696d33a.
  • Loading branch information
guillermocalvo authored Jan 8, 2024
1 parent 28cca7f commit 8ff945e
Show file tree
Hide file tree
Showing 14 changed files with 13 additions and 579 deletions.
6 changes: 0 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,6 @@ ext {
names : ['grails-async', 'grails-events'],
modules: ['gpars', 'rxjava', 'rxjava2']
],
snakeyaml : [
version: snakeyamlVersion,
group : 'org.yaml',
names : ['snakeyaml'],
modules: ['']
],
spock : [
version: spockVersion,
group : 'org.spockframework',
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ concurrentlinkedhashmapVersion=1.4.2
springLoadedVersion=1.2.8.RELEASE
jnaVersion=4.2.2
slf4jVersion=1.7.25
snakeyamlVersion=2.2
directoryWatcherVersion=0.5.1
junitVersion=4.12
caffeineVersion=2.6.2
Expand Down
2 changes: 1 addition & 1 deletion grails-bootstrap/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
dependencies {
compile ( "org.codehaus.groovy:groovy-xml:$groovyVersion" )
compile ( "org.codehaus.groovy:groovy-templates:$groovyVersion" )
compile "org.yaml:snakeyaml:$snakeyamlVersion"
compile "org.yaml:snakeyaml:1.14"

compileOnly("io.methvin:directory-watcher:0.3.0")
compileOnly("org.fusesource.jansi:jansi:$jansiVersion")
Expand Down
4 changes: 1 addition & 3 deletions grails-bootstrap/src/main/groovy/grails/util/Metadata.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ import org.grails.config.NavigableMap
import org.grails.io.support.FileSystemResource
import org.grails.io.support.Resource
import org.grails.io.support.UrlResource
import org.yaml.snakeyaml.LoaderOptions
import org.yaml.snakeyaml.Yaml
import org.yaml.snakeyaml.constructor.SafeConstructor

import java.lang.ref.Reference
import java.lang.ref.SoftReference
Expand Down Expand Up @@ -169,7 +167,7 @@ class Metadata extends NavigableMap implements ConfigMap {
}

private Object loadYml(InputStream input) {
Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()))
Yaml yaml = new Yaml()
def loadedYaml = yaml.loadAll(input)
List result = []
for(Object yamlObject : loadedYaml) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
import org.codehaus.groovy.runtime.DefaultGroovyMethods
import org.codehaus.groovy.runtime.typehandling.GroovyCastException
import org.yaml.snakeyaml.LoaderOptions
import org.yaml.snakeyaml.Yaml
import org.yaml.snakeyaml.constructor.SafeConstructor


/**
Expand Down Expand Up @@ -154,7 +152,7 @@ class CodeGenConfig implements Cloneable, ConfigMap {

@CompileDynamic // fails with CompileStatic!
void loadYml(InputStream input) {
Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()))
Yaml yaml = new Yaml()
for(Object yamlObject : yaml.loadAll(input)) {
if(yamlObject instanceof Map) { // problem here with CompileStatic
mergeMap((Map)yamlObject)
Expand Down
Loading

0 comments on commit 8ff945e

Please sign in to comment.