This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to annotated tag testng-6.9.5 in repository testng.
commit 3b56bf5c02a8b63dac1382c57abbbb9f0b02cf98 Author: Ryan Schmitt <[email protected]> Date: Sun May 31 14:26:39 2015 -0700 Upgrade to SnakeYAML 1.15 --- build.gradle | 2 +- ivy.xml | 2 +- pom.xml | 2 +- src/main/java/org/testng/internal/Yaml.java | 9 +++------ 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index ba559f3..b5997c8 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ dependencies { compile 'org.beanshell:bsh:2.0b4' compile 'com.google.inject:guice:4.0:no_aop' compile 'com.beust:jcommander:1.48' - compile 'org.yaml:snakeyaml:1.12' + compile 'org.yaml:snakeyaml:1.15' testCompile 'org.assertj:assertj-core:2.0.0' testCompile 'org.testng:testng:6.9.4' diff --git a/ivy.xml b/ivy.xml index cceec5d..c6a5a97 100644 --- a/ivy.xml +++ b/ivy.xml @@ -6,7 +6,7 @@ <dependency org="junit" name="junit" rev="4.10" /> <dependency org="org.beanshell" name="bsh" rev="2.0b4" /> <dependency org="com.google.inject" name="guice" rev="2.0" /> - <dependency org="org.yaml" name="snakeyaml" rev="1.12" /> + <dependency org="org.yaml" name="snakeyaml" rev="1.15" /> <dependency org="com.beust" name="jcommander" rev="1.48" /> </dependencies> </ivy-module> diff --git a/pom.xml b/pom.xml index 6514b8b..c18947f 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.12</version> + <version>1.15</version> <optional>true</optional> </dependency> diff --git a/src/main/java/org/testng/internal/Yaml.java b/src/main/java/org/testng/internal/Yaml.java index 08eab1e..14acc8c 100644 --- a/src/main/java/org/testng/internal/Yaml.java +++ b/src/main/java/org/testng/internal/Yaml.java @@ -7,7 +7,6 @@ import org.testng.xml.XmlPackage; import org.testng.xml.XmlSuite; import org.testng.xml.XmlTest; import org.xml.sax.SAXException; -import org.yaml.snakeyaml.Loader; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.constructor.Constructor; @@ -24,7 +23,7 @@ import java.util.Map; /** * YAML support for TestNG. - * + * * @author Cedric Beust <[email protected]> */ public class Yaml { @@ -49,9 +48,7 @@ public class Yaml { constructor.addTypeDescription(testDescription); } - Loader loader = new Loader(constructor); - - org.yaml.snakeyaml.Yaml y = new org.yaml.snakeyaml.Yaml(loader); + org.yaml.snakeyaml.Yaml y = new org.yaml.snakeyaml.Yaml(constructor); if (is == null) is = new FileInputStream(new File(filePath)); XmlSuite result = (XmlSuite) y.load(is); @@ -172,7 +169,7 @@ public class Yaml { toYaml(result, sp2 + " - ", xp); } } - + if (t.getXmlClasses().size() > 0) { result.append(sp2).append("classes:\n"); for (XmlClass xc : t.getXmlClasses()) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
