Skip to content

Forward compatibility with SnakeYAML 2.0 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samrocketman merged 1 commit into from
Jun 27, 2023
Merged

Forward compatibility with SnakeYAML 2.0 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</scm>

<properties>
<revision>1.7</revision>
<revision>2.0</revision>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/scm-filter-jervis-plugin</gitHubRepo>
<jenkins.version>2.387.3</jenkins.version>
Expand Down
7 changes: 3 additions & 4 deletions src/main/groovy/net/gleske/scmfilter/impl/trait/JervisFilterTrait.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
*/
package net.gleske.scmfilter.impl.trait;

import static net.gleske.jervis.tools.AutoRelease.getScriptFromTemplate
import net.gleske.jervis.remotes.GitHubGraphQL
import net.gleske.jervis.tools.YamlOperator
import net.gleske.scmfilter.credential.GraphQLTokenCredential
import static net.gleske.jervis.tools.AutoRelease.getScriptFromTemplate

import edu.umd.cs.findbugs.annotations.CheckForNull
import edu.umd.cs.findbugs.annotations.NonNull
Expand All @@ -48,8 +49,6 @@ import groovy.text.SimpleTemplateEngine
import java.util.logging.Level
import java.util.logging.Logger
import java.util.regex.Pattern
import org.yaml.snakeyaml.Yaml
import org.yaml.snakeyaml.constructor.SafeConstructor


public class JervisFilterTrait extends SCMSourceTrait {
Expand Down Expand Up @@ -193,7 +192,7 @@ public class JervisFilterTrait extends SCMSourceTrait {
LOGGER.fine("On target ref ${target_ref}, found ${yamlFile}:\n${['='*80, yamlText, '='*80].join('\n')}\nEND YAML FILE")

// parse the YAML for filtering
Map jervis_yaml = (new Yaml(new SafeConstructor())).load(yamlText)
Map jervis_yaml = YamlOperator.loadYamlFrom(yamlText)
if(head in TagSCMHead) {
// tag
if(!('tags' in jervis_yaml)) {
Expand Down