Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Upgrade to snakeyaml 2.0" 

This reverts commit f82e94c337.  This
break CI due to an unexpected Java version mismatch.
This commit is contained in:
Andrew Gaul 2023-05-10 21:30:27 +09:00
parent f82e94c337
commit cf4a926afe
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/byon/pom.xml
View File

@ -70,7 +70,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
<version>1.32</version>
</dependency>
<dependency>
<groupId>com.google.auto.service</groupId>

3
apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java
View File

@ -25,7 +25,6 @@ import java.util.Map;
import org.jclouds.byon.Node;
import org.jclouds.util.Closeables2;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@ -112,7 +111,7 @@ public class YamlNode {
InputStream in = null;
try {
in = byteSource.openStream();
return (YamlNode) new Yaml(new Constructor(YamlNode.class, new LoaderOptions())).load(in);
return (YamlNode) new Yaml(new Constructor(YamlNode.class)).load(in);
} catch (IOException ioe) {
throw Throwables.propagate(ioe);
} finally {

3
apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java
View File

@ -29,7 +29,6 @@ import javax.inject.Singleton;
import org.jclouds.byon.Node;
import org.jclouds.byon.domain.YamlNode;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@ -81,7 +80,7 @@ public class NodesFromYamlStream implements Function<ByteSource, LoadingCache<St
@Override
public LoadingCache<String, Node> apply(ByteSource source) {
Constructor constructor = new Constructor(Config.class, new LoaderOptions());
Constructor constructor = new Constructor(Config.class);
TypeDescription nodeDesc = new TypeDescription(YamlNode.class);
nodeDesc.putListPropertyType("tags", String.class);