Skip to content

Commit 77b277a

Browse files
authored
Merge pull request #13192 from grails/snakeyaml
Remove unnecessary version number
2 parents 865a92a + 8eac7e6 commit 77b277a

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

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
api ( "org.codehaus.groovy:groovy-xml:$groovyVersion" )
55
api ( "org.codehaus.groovy:groovy-templates:$groovyVersion" )
6-
api "org.yaml:snakeyaml:1.33"
6+
api "org.yaml:snakeyaml"
77
api "io.micronaut:micronaut-inject:$micronautVersion"
88

99
compileOnly("io.methvin:directory-watcher:$methvinDirectoryWatcherVersion")

grails-docs/src/main/groovy/grails/doc/DocPublisher.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory
2424
import org.radeox.api.engine.WikiRenderEngine
2525
import org.radeox.engine.context.BaseInitialRenderContext
2626
import org.radeox.engine.context.BaseRenderContext
27+
import org.yaml.snakeyaml.LoaderOptions
2728
import org.yaml.snakeyaml.Yaml
2829
import org.yaml.snakeyaml.constructor.SafeConstructor
2930

@@ -265,7 +266,7 @@ class DocPublisher {
265266
def legacyLinks = [:]
266267
if (legacyLinksFile.exists()) {
267268
legacyLinksFile.withInputStream { input ->
268-
legacyLinks = new Yaml(new SafeConstructor()).load(input)
269+
legacyLinks = new Yaml(new SafeConstructor(new LoaderOptions())).load(input)
269270
}
270271
}
271272

@@ -537,7 +538,7 @@ class DocPublisher {
537538
}
538539
else if(propertiesFile.name.endsWith('.yml')) {
539540
propertiesFile.withInputStream { input ->
540-
def ymls = new Yaml(new SafeConstructor()).loadAll(input)
541+
def ymls = new Yaml(new SafeConstructor(new LoaderOptions())).loadAll(input)
541542
for(yml in ymls) {
542543
if(yml instanceof Map) {
543544
def config = yml.grails?.doc

grails-docs/src/main/groovy/grails/doc/internal/YamlTocStrategy.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package grails.doc.internal
22

3+
import org.yaml.snakeyaml.LoaderOptions
34
import org.yaml.snakeyaml.Yaml
45
import org.yaml.snakeyaml.constructor.SafeConstructor
56

67
/**
78
* Class representing a Grails user guide table of contents defined in YAML.
89
*/
910
class YamlTocStrategy {
10-
private final parser = new Yaml(new SafeConstructor())
11+
private final parser = new Yaml(new SafeConstructor(new LoaderOptions()))
1112
private resourceChecker
1213
private String ext = ".gdoc"
1314

0 commit comments

Comments
 (0)