From 6f4c4b4d18a35737e1f94c382cc1ed6043ccd2ff Mon Sep 17 00:00:00 2001 From: Mo Morsi Date: Mon, 13 Feb 2012 14:35:55 -0500 Subject: [PATCH] update to latest upstream release, various fixes --- .gitignore | 1 + snakeyaml-add-osgi-metadata.patch | 26 -- snakeyaml-issue121-file-handle-leaks.patch | 406 --------------------- snakeyaml.spec | 23 +- sources | 2 +- 5 files changed, 11 insertions(+), 447 deletions(-) delete mode 100644 snakeyaml-add-osgi-metadata.patch delete mode 100644 snakeyaml-issue121-file-handle-leaks.patch diff --git a/.gitignore b/.gitignore index 4e3996b..2d5b540 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /SnakeYAML-all-1.8.zip +/SnakeYAML-all-1.9.zip diff --git a/snakeyaml-add-osgi-metadata.patch b/snakeyaml-add-osgi-metadata.patch deleted file mode 100644 index 0993191..0000000 --- a/snakeyaml-add-osgi-metadata.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 4bf5a5e..8bc6e54 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -3,7 +3,7 @@ - org.yaml - snakeyaml - 1.8 -- jar -+ bundle - - UTF-8 - -@@ -226,6 +226,12 @@ - - - -+ -+ org.apache.felix -+ maven-bundle-plugin -+ 2.3.4 -+ true -+ - - - diff --git a/snakeyaml-issue121-file-handle-leaks.patch b/snakeyaml-issue121-file-handle-leaks.patch deleted file mode 100644 index c93e1b7..0000000 --- a/snakeyaml-issue121-file-handle-leaks.patch +++ /dev/null @@ -1,406 +0,0 @@ -diff -Naur snakeyaml.orig/src/test/java/examples/LoadExampleTest.java snakeyaml/src/test/java/examples/LoadExampleTest.java ---- snakeyaml.orig/src/test/java/examples/LoadExampleTest.java 2011-01-16 14:39:08.000000000 +0100 -+++ snakeyaml/src/test/java/examples/LoadExampleTest.java 2011-06-09 14:07:02.000000000 +0200 -@@ -19,7 +19,7 @@ - import java.io.ByteArrayInputStream; - import java.io.File; - import java.io.FileInputStream; --import java.io.FileNotFoundException; -+import java.io.IOException; - import java.io.InputStream; - import java.util.List; - import java.util.Map; -@@ -40,12 +40,13 @@ - public void testLoadFromString() { - Yaml yaml = new Yaml(); - String document = "hello: 25"; -- Map map = (Map) yaml.load(document); -+ @SuppressWarnings("unchecked") -+ Map map = (Map) yaml.load(document); - assertEquals("{hello=25}", map.toString()); - assertEquals(new Integer(25), map.get("hello")); - } - -- public void testLoadFromStream() throws FileNotFoundException { -+ public void testLoadFromStream() throws IOException { - InputStream input = new FileInputStream(new File("src/test/resources/reader/utf-8.txt")); - Yaml yaml = new Yaml(); - Object data = yaml.load(input); -@@ -53,9 +54,10 @@ - // - data = yaml.load(new ByteArrayInputStream("test2".getBytes())); - assertEquals("test2", data); -+ input.close(); - } - -- public void testLoadManyDocuments() throws FileNotFoundException { -+ public void testLoadManyDocuments() throws IOException { - InputStream input = new FileInputStream(new File( - "src/test/resources/specification/example2_28.yaml")); - Yaml yaml = new Yaml(); -@@ -66,5 +68,6 @@ - counter++; - } - assertEquals(3, counter); -+ input.close(); - } - } -diff -Naur snakeyaml.orig/src/test/java/org/pyyaml/AnInstance.java snakeyaml/src/test/java/org/pyyaml/AnInstance.java ---- snakeyaml.orig/src/test/java/org/pyyaml/AnInstance.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/org/pyyaml/AnInstance.java 2011-06-09 14:07:02.000000000 +0200 -@@ -43,5 +43,4 @@ - public void setBar(Object bar) { - this.bar = bar; - } -- - } -\ Chybí znak konce řádku na konci souboru -diff -Naur snakeyaml.orig/src/test/java/org/pyyaml/PyCanonicalTest.java snakeyaml/src/test/java/org/pyyaml/PyCanonicalTest.java ---- snakeyaml.orig/src/test/java/org/pyyaml/PyCanonicalTest.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/org/pyyaml/PyCanonicalTest.java 2011-06-09 14:07:02.000000000 +0200 -@@ -35,7 +35,9 @@ - File[] files = getStreamsByExtension(".canonical"); - assertTrue("No test files found.", files.length > 0); - for (int i = 0; i < files.length; i++) { -- List tokens = canonicalScan(new FileInputStream(files[i])); -+ InputStream input = new FileInputStream(files[i]); -+ List tokens = canonicalScan(input); -+ input.close(); - assertFalse(tokens.isEmpty()); - } - } -@@ -59,7 +61,9 @@ - File[] files = getStreamsByExtension(".canonical"); - assertTrue("No test files found.", files.length > 0); - for (int i = 0; i < files.length; i++) { -- List tokens = canonicalParse(new FileInputStream(files[i])); -+ InputStream input = new FileInputStream(files[i]); -+ List tokens = canonicalParse(input); -+ input.close(); - assertFalse(tokens.isEmpty()); - } - } -diff -Naur snakeyaml.orig/src/test/java/org/pyyaml/PyEmitterTest.java snakeyaml/src/test/java/org/pyyaml/PyEmitterTest.java ---- snakeyaml.orig/src/test/java/org/pyyaml/PyEmitterTest.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/org/pyyaml/PyEmitterTest.java 2011-06-09 14:07:02.000000000 +0200 -@@ -19,6 +19,7 @@ - import java.io.File; - import java.io.FileInputStream; - import java.io.IOException; -+import java.io.InputStream; - import java.io.StringWriter; - import java.util.ArrayList; - import java.util.Arrays; -@@ -63,7 +64,9 @@ - // continue; - // } - try { -- List events = parse(new FileInputStream(file)); -+ InputStream input = new FileInputStream(file); -+ List events = parse(input); -+ input.close(); - // - StringWriter stream = new StringWriter(); - DumperOptions options = new DumperOptions(); -@@ -116,23 +119,24 @@ - } - } - -- @SuppressWarnings("unchecked") - public void testEmitterStyles() throws IOException { - File[] canonicalFiles = getStreamsByExtension(".canonical", false); - assertTrue("No test files found.", canonicalFiles.length > 0); - File[] dataFiles = getStreamsByExtension(".data", true); - assertTrue("No test files found.", dataFiles.length > 0); -- List allFiles = new ArrayList(Arrays.asList(canonicalFiles)); -+ List allFiles = new ArrayList(Arrays.asList(canonicalFiles)); - allFiles.addAll(Arrays.asList(dataFiles)); - for (File file : allFiles) { - try { - List events = new ArrayList(); -- StreamReader reader = new StreamReader(new UnicodeReader(new FileInputStream(file))); -+ InputStream input = new FileInputStream(file); -+ StreamReader reader = new StreamReader(new UnicodeReader(input)); - Parser parser = new ParserImpl(reader); - while (parser.peekEvent() != null) { - Event event = parser.getEvent(); - events.add(event); - } -+ input.close(); - // - for (Boolean flowStyle : new Boolean[] { Boolean.FALSE, Boolean.TRUE }) { - for (DumperOptions.ScalarStyle style : DumperOptions.ScalarStyle.values()) { -@@ -140,19 +144,19 @@ - for (Event event : events) { - if (event instanceof ScalarEvent) { - ScalarEvent scalar = (ScalarEvent) event; -- event = new ScalarEvent(scalar.getAnchor(), scalar.getTag(), scalar -- .getImplicit(), scalar.getValue(), scalar.getStartMark(), -- scalar.getEndMark(), style.getChar()); -+ event = new ScalarEvent(scalar.getAnchor(), scalar.getTag(), -+ scalar.getImplicit(), scalar.getValue(), -+ scalar.getStartMark(), scalar.getEndMark(), style.getChar()); - } else if (event instanceof SequenceStartEvent) { - SequenceStartEvent seqStart = (SequenceStartEvent) event; -- event = new SequenceStartEvent(seqStart.getAnchor(), seqStart -- .getTag(), seqStart.getImplicit(), seqStart.getStartMark(), -- seqStart.getEndMark(), flowStyle); -+ event = new SequenceStartEvent(seqStart.getAnchor(), -+ seqStart.getTag(), seqStart.getImplicit(), -+ seqStart.getStartMark(), seqStart.getEndMark(), flowStyle); - } else if (event instanceof MappingStartEvent) { - MappingStartEvent mapStart = (MappingStartEvent) event; -- event = new MappingStartEvent(mapStart.getAnchor(), mapStart -- .getTag(), mapStart.getImplicit(), mapStart.getStartMark(), -- mapStart.getEndMark(), flowStyle); -+ event = new MappingStartEvent(mapStart.getAnchor(), -+ mapStart.getTag(), mapStart.getImplicit(), -+ mapStart.getStartMark(), mapStart.getEndMark(), flowStyle); - } - styledEvents.add(event); - } -diff -Naur snakeyaml.orig/src/test/java/org/pyyaml/PyErrorsTest.java snakeyaml/src/test/java/org/pyyaml/PyErrorsTest.java ---- snakeyaml.orig/src/test/java/org/pyyaml/PyErrorsTest.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/org/pyyaml/PyErrorsTest.java 2011-06-09 14:07:02.000000000 +0200 -@@ -19,6 +19,7 @@ - import java.io.File; - import java.io.FileInputStream; - import java.io.FileNotFoundException; -+import java.io.InputStream; - import java.io.StringWriter; - import java.io.Writer; - import java.util.ArrayList; -@@ -54,9 +55,11 @@ - continue; - } - try { -- for (Object document : loadAll(new FileInputStream(files[i]))) { -+ InputStream input = new FileInputStream(files[i]); -+ for (Object document : loadAll(input)) { - assertNotNull("File " + files[i], document); - } -+ input.close(); - fail("Loading must fail for " + files[i].getAbsolutePath()); - // System.err.println("Loading must fail for " + - // files[i].getAbsolutePath()); -diff -Naur snakeyaml.orig/src/test/java/org/pyyaml/PyImportTest.java snakeyaml/src/test/java/org/pyyaml/PyImportTest.java ---- snakeyaml.orig/src/test/java/org/pyyaml/PyImportTest.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/org/pyyaml/PyImportTest.java 2011-06-09 14:07:02.000000000 +0200 -@@ -98,6 +98,7 @@ - while (parser.peekEvent() != null) { - result.add(parser.getEvent()); - } -+ input2.close(); - return result; - } - -@@ -108,6 +109,7 @@ - while (parser.peekEvent() != null) { - result.add(parser.getEvent()); - } -+ input.close(); - return result; - } - -diff -Naur snakeyaml.orig/src/test/java/org/pyyaml/PyReaderTest.java snakeyaml/src/test/java/org/pyyaml/PyReaderTest.java ---- snakeyaml.orig/src/test/java/org/pyyaml/PyReaderTest.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/org/pyyaml/PyReaderTest.java 2011-06-09 14:07:02.000000000 +0200 -@@ -19,6 +19,7 @@ - import java.io.File; - import java.io.FileInputStream; - import java.io.IOException; -+import java.io.InputStream; - - import org.yaml.snakeyaml.reader.ReaderException; - import org.yaml.snakeyaml.reader.StreamReader; -@@ -32,8 +33,8 @@ - public void testReaderUnicodeErrors() throws IOException { - File[] inputs = getStreamsByExtension(".stream-error"); - for (int i = 0; i < inputs.length; i++) { -- StreamReader stream = new StreamReader( -- new UnicodeReader(new FileInputStream(inputs[i]))); -+ InputStream input = new FileInputStream(inputs[i]); -+ StreamReader stream = new StreamReader(new UnicodeReader(input)); - try { - while (stream.peek() != '\u0000') { - stream.forward(); -@@ -41,10 +42,11 @@ - fail("Invalid stream must not be accepted: " + inputs[i].getAbsolutePath() - + "; encoding=" + stream.getEncoding()); - } catch (ReaderException e) { -- assertTrue(e.toString(), e.toString().contains( -- " special characters are not allowed")); -+ assertTrue(e.toString(), -+ e.toString().contains(" special characters are not allowed")); -+ } finally { -+ input.close(); - } - } - } -- - } -diff -Naur snakeyaml.orig/src/test/java/org/pyyaml/PyStructureTest.java snakeyaml/src/test/java/org/pyyaml/PyStructureTest.java ---- snakeyaml.orig/src/test/java/org/pyyaml/PyStructureTest.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/org/pyyaml/PyStructureTest.java 2011-06-09 14:07:02.000000000 +0200 -@@ -85,7 +85,9 @@ - continue; - } - try { -- List events1 = parse(new FileInputStream(file)); -+ InputStream input = new FileInputStream(file); -+ List events1 = parse(input); -+ input.close(); - assertFalse(events1.isEmpty()); - int index = file.getAbsolutePath().lastIndexOf('.'); - String canonicalName = file.getAbsolutePath().substring(0, index) + ".canonical"; -@@ -106,7 +108,9 @@ - assertTrue("No test files found.", canonicalFiles.length > 0); - for (File file : canonicalFiles) { - try { -- List events1 = parse(new FileInputStream(file)); -+ InputStream input = new FileInputStream(file); -+ List events1 = parse(input); -+ input.close(); - assertFalse(events1.isEmpty()); - List events2 = canonicalParse(new FileInputStream(file)); - assertFalse(events2.isEmpty()); -@@ -157,11 +161,15 @@ - assertTrue("No test files found.", files.length > 0); - for (File file : files) { - try { -- List events1 = compose_all(new FileInputStream(file)); -+ InputStream input = new FileInputStream(file); -+ List events1 = compose_all(input); -+ input.close(); - int index = file.getAbsolutePath().lastIndexOf('.'); - String canonicalName = file.getAbsolutePath().substring(0, index) + ".canonical"; - File canonical = new File(canonicalName); -- List events2 = canonical_compose_all(new FileInputStream(canonical)); -+ InputStream input2 = new FileInputStream(canonical); -+ List events2 = canonical_compose_all(input2); -+ input2.close(); - assertEquals(events1.size(), events2.size()); - Iterator iter1 = events1.iterator(); - Iterator iter2 = events2.iterator(); -@@ -268,11 +276,14 @@ - Yaml canonicalYaml = new CanonicalLoader(); - for (File file : files) { - try { -- Iterable documents1 = myYaml.loadAll(new FileInputStream(file)); -+ InputStream input = new FileInputStream(file); -+ Iterable documents1 = myYaml.loadAll(input); - int index = file.getAbsolutePath().lastIndexOf('.'); - String canonicalName = file.getAbsolutePath().substring(0, index) + ".canonical"; - File canonical = new File(canonicalName); -- Iterable documents2 = canonicalYaml.loadAll(new FileInputStream(canonical)); -+ InputStream input2 = new FileInputStream(canonical); -+ Iterable documents2 = canonicalYaml.loadAll(input2); -+ input2.close(); - Iterator iter2 = documents2.iterator(); - for (Object object1 : documents1) { - Object object2 = iter2.next(); -@@ -282,6 +293,7 @@ - } - assertEquals("" + object1, object1, object2); - } -+ input.close(); - } catch (Exception e) { - System.out.println("Failed File: " + file); - // fail("Failed File: " + file + "; " + e.getMessage()); -diff -Naur snakeyaml.orig/src/test/java/org/pyyaml/PyTokensTest.java snakeyaml/src/test/java/org/pyyaml/PyTokensTest.java ---- snakeyaml.orig/src/test/java/org/pyyaml/PyTokensTest.java 2011-01-16 14:39:08.000000000 +0100 -+++ snakeyaml/src/test/java/org/pyyaml/PyTokensTest.java 2011-06-09 14:07:02.000000000 +0200 -@@ -19,6 +19,8 @@ - import java.io.File; - import java.io.FileInputStream; - import java.io.FileNotFoundException; -+import java.io.IOException; -+import java.io.InputStream; - import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; -@@ -56,7 +58,7 @@ - public class PyTokensTest extends PyImportTest { - - public void testTokens() throws FileNotFoundException { -- Map replaces = new HashMap(); -+ Map, String> replaces = new HashMap, String>(); - replaces.put(DirectiveToken.class, "%"); - replaces.put(DocumentStartToken.class, "---"); - replaces.put(DocumentEndToken.class, "..."); -@@ -117,12 +119,13 @@ - } - } - -- public void testScanner() throws FileNotFoundException { -+ public void testScanner() throws IOException { - File[] files = getStreamsByExtension(".data", true); - assertTrue("No test files found.", files.length > 0); - for (File file : files) { - List tokens = new ArrayList(); -- StreamReader reader = new StreamReader(new UnicodeReader(new FileInputStream(file))); -+ InputStream input = new FileInputStream(file); -+ StreamReader reader = new StreamReader(new UnicodeReader(input)); - Scanner scanner = new ScannerImpl(reader); - try { - while (scanner.checkToken(new Token.ID[0])) { -@@ -138,6 +141,8 @@ - System.out.println(token); - } - fail("Cannot scan: " + file + "; " + e.getMessage()); -+ } finally { -+ input.close(); - } - } - } -diff -Naur snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java ---- snakeyaml.orig/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java 2011-01-12 13:56:10.000000000 +0100 -+++ snakeyaml/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java 2011-06-09 14:54:45.094267212 +0200 -@@ -65,6 +65,7 @@ - Map bean = (Map) yaml.load(inputStream); - byte[] jpeg = (byte[]) bean.get("jpegPhoto"); - checkBytes(jpeg); -+ inputStream.close(); - } - - private void checkBytes(byte[] jpeg) throws IOException { -@@ -86,8 +87,10 @@ - - /** - * In the literal scalar all the line breaks are significant -+ * -+ * @throws IOException - */ -- public void testYamlBase64LoadingLiteral() { -+ public void testYamlBase64LoadingLiteral() throws IOException { - Yaml yaml = new Yaml(); - InputStream inputStream = YamlBase64Test.class - .getResourceAsStream("/issues/issue99-base64_literal.yaml"); -@@ -95,8 +98,10 @@ - yaml.load(inputStream); - fail("In the literal scalar all the line breaks are significant"); - } catch (Exception e) { -- assertEquals("Length of Base64 encoded input string is not a multiple of 4.", e -- .getMessage()); -+ assertEquals("Length of Base64 encoded input string is not a multiple of 4.", -+ e.getMessage()); -+ } finally { -+ inputStream.close(); - } - } - -@@ -112,6 +117,7 @@ - Map bean = (Map) yaml.load(inputStream); - byte[] jpeg = (byte[]) bean.get("jpegPhoto"); - checkBytes(jpeg); -+ inputStream.close(); - } - - private class SpecialContructor extends Constructor { -@@ -141,5 +147,6 @@ - Map bean = (Map) yaml.load(inputStream); - byte[] jpeg = (byte[]) bean.get("jpegPhoto"); - checkBytes(jpeg); -+ inputStream.close(); - } - } diff --git a/snakeyaml.spec b/snakeyaml.spec index 9d64f24..720a24a 100644 --- a/snakeyaml.spec +++ b/snakeyaml.spec @@ -2,21 +2,19 @@ %global group_id org.yaml Name: snakeyaml -Version: 1.8 -Release: 7%{?dist} +Version: 1.9 +Release: 1%{?dist} Summary: YAML parser and emitter for the Java programming language License: ASL 2.0 Group: Development/Libraries # http://code.google.com/p/snakeyaml URL: http://code.google.com/p/%{name} -# http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.8.zip +# http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.9.zip Source0: http://%{name}.googlecode.com/files/SnakeYAML-all-%{version}.zip Source1: %{name}.depmap Patch0: %{name}-spring-removal-workaround.patch Patch1: %{name}-gdata+base64coder+cobertura-addition.patch -Patch2: %{name}-issue121-file-handle-leaks.patch -Patch3: %{name}-add-osgi-metadata.patch BuildArch: noarch @@ -61,8 +59,6 @@ This package contains the API documentation for %{name}. %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 # remove bundled stuff rm -rf target @@ -85,18 +81,12 @@ install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}. # pom install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap %{group_id} %{name} %{version} JPP %{name} +%add_maven_depmap JPP-%{name}.pom %{name}.jar # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name} -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files %doc LICENSE.txt %{_javadir}/%{name}.jar @@ -108,6 +98,11 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Fri Jan 20 2012 Mo Morsi - 1.9-1 +- Update to latest upstream release +- patch2, patch3 no longer needed +- update to latest fedora java guidelines + * Sat Jan 14 2012 Fedora Release Engineering - 1.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 920342c..b8eb631 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f02bc7f8207d95f235535678d2df70ce SnakeYAML-all-1.8.zip +78a82f2b24d6c4271c079756b5784f99 SnakeYAML-all-1.9.zip