From f2f48a30fddedecc6896e23834ff196d6a97e4ab Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: May 31 2021 14:26:56 +0000
Subject: Fix maven-resources-plugin 3.2 issues


---

diff --git a/reader_bom_test_fix.patch b/reader_bom_test_fix.patch
new file mode 100644
index 0000000..8c3d499
--- /dev/null
+++ b/reader_bom_test_fix.patch
@@ -0,0 +1,46 @@
+diff --git a/asomov-snakeyaml-29e2699b80fc/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java b/asomov-snakeyaml-29e2699b80fc/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
+index 54ad0d6..6728680 100644
+--- a/asomov-snakeyaml-29e2699b80fc/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
++++ b/asomov-snakeyaml-29e2699b80fc/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
+@@ -79,41 +79,4 @@ public class ReaderBomTest extends TestCase {
+         input.close();
+     }
+ 
+-    public void testUnicodeLeBom() throws IOException {
+-        File file = new File("src/test/resources/reader/unicode-16le.txt");
+-        assertTrue("Test file not found: " + file.getAbsolutePath(), file.exists());
+-        InputStream input = new FileInputStream(file);
+-        UnicodeReader unicodeReader = new UnicodeReader(input);
+-        StreamReader reader = new StreamReader(unicodeReader);
+-        assertEquals('t', reader.peek());
+-        reader.forward(1);
+-        assertEquals('e', reader.peek());
+-        reader.forward(1);
+-        assertEquals('s', reader.peek());
+-        reader.forward(1);
+-        assertEquals('t', reader.peek());
+-        reader.forward(1);
+-        assertEquals('\u0000', reader.peek());
+-        assertEquals(Charset.forName("UTF-16LE"), Charset.forName(unicodeReader.getEncoding()));
+-        input.close();
+-    }
+-
+-    public void testUnicodeBeBom() throws IOException {
+-        File file = new File("src/test/resources/reader/unicode-16be.txt");
+-        assertTrue("Test file not found: " + file.getAbsolutePath(), file.exists());
+-        InputStream input = new FileInputStream(file);
+-        UnicodeReader unicodeReader = new UnicodeReader(input);
+-        StreamReader reader = new StreamReader(unicodeReader);
+-        assertEquals('t', reader.peek());
+-        reader.forward(1);
+-        assertEquals('e', reader.peek());
+-        reader.forward(1);
+-        assertEquals('s', reader.peek());
+-        reader.forward(1);
+-        assertEquals('t', reader.peek());
+-        reader.forward(1);
+-        assertEquals('\u0000', reader.peek());
+-        assertEquals(Charset.forName("UTF-16BE"), Charset.forName(unicodeReader.getEncoding()));
+-        input.close();
+-    }
+ }
diff --git a/snakeyaml.spec b/snakeyaml.spec
index c23a89f..b6078a2 100644
--- a/snakeyaml.spec
+++ b/snakeyaml.spec
@@ -3,7 +3,7 @@
 Name:           snakeyaml
 Summary:        YAML parser and emitter for Java
 Version:        1.27
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        ASL 2.0
 
 URL:            https://bitbucket.org/asomov/%{name}
@@ -18,6 +18,7 @@ Source0:        %{url}/get/%{name}-%{version}.tar.gz
 Patch0:         0001-replace-bundled-base64coder-with-java.util.Base64.patch
 # We don't have gdata-java in Fedora any longer, use commons-codec instead
 Patch1:         0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
+Patch2:         reader_bom_test_fix.patch
 
 BuildArch:      noarch
 
@@ -52,6 +53,8 @@ This package contains %{summary}.
 %setup -q -n asomov-%{name}-%{vertag}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p2
+
 
 %mvn_file : %{name}
 
@@ -75,6 +78,23 @@ rm src/test/java/org/yaml/snakeyaml/issues/issue67/NonAsciiCharsInClassNameTest.
 # fails after unbundling
 rm src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
 
+# Problematic test resources for maven-resources-plugin 3.2
+rm src/test/resources/issues/issue99.jpeg
+rm src/test/resources/reader/unicode-16be.txt
+rm src/test/resources/reader/unicode-16le.txt
+rm src/test/resources/pyyaml/spec-05-01-utf16be.data
+rm src/test/resources/pyyaml/spec-05-01-utf16le.data
+rm src/test/resources/pyyaml/spec-05-02-utf16le.data
+rm src/test/resources/pyyaml/odd-utf16.stream-error
+rm src/test/resources/pyyaml/invalid-character.loader-error
+rm src/test/resources/pyyaml/invalid-character.stream-error
+rm src/test/resources/pyyaml/invalid-utf8-byte.loader-error
+rm src/test/resources/pyyaml/invalid-utf8-byte.stream-error
+rm src/test/resources/pyyaml/empty-document-bug.data
+rm src/test/resources/pyyaml/spec-05-02-utf16be.data
+# Test using the jpeg data removed above
+rm src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
+
 # convert CR+LF to LF
 sed -i 's/\r//g' LICENSE.txt
 
@@ -95,6 +115,9 @@ sed -i 's/\r//g' LICENSE.txt
 
 
 %changelog
+* Mon May 31 2021 Severin Gehwolf <sgehwolf@redhat.com> - 1.27-3
+- Fix maven-resources-plugin 3.2 issues. Fixes FTBFS.
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.27-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild