-- * This class is used to encode and decode data in Base64 format as described in RFC 1521. -- * -- *
-- * Project home page: www.
-- * source-code.biz/base64coder/java
-- * Author: Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland
-- * Multi-licensed: EPL / LGPL / GPL / AL / BSD.
-- */
--public class Base64Coder {
--
-- // The line separator string of the operating system.
-- private static final String systemLineSeparator = System.getProperty("line.separator");
--
-- // Mapping table from 6-bit nibbles to Base64 characters.
-- private static final char[] map1 = new char[64];
--
-- static {
-- int i = 0;
-- for (char c = 'A'; c <= 'Z'; c++) {
-- map1[i++] = c;
-- }
-- for (char c = 'a'; c <= 'z'; c++) {
-- map1[i++] = c;
-- }
-- for (char c = '0'; c <= '9'; c++) {
-- map1[i++] = c;
-- }
-- map1[i++] = '+';
-- map1[i++] = '/';
-- }
--
-- // Mapping table from Base64 characters to 6-bit nibbles.
-- private static final byte[] map2 = new byte[128];
--
-- static {
-- for (int i = 0; i < map2.length; i++) {
-- map2[i] = -1;
-- }
-- for (int i = 0; i < 64; i++) {
-- map2[map1[i]] = (byte) i;
-- }
-- }
--
-- /**
-- * Encodes a string into Base64 format. No blanks or line breaks are inserted.
-- *
-- * @param s A String to be encoded.
-- * @return A String containing the Base64 encoded data.
-- */
-- public static String encodeString(String s) {
-- return new String(encode(s.getBytes()));
-- }
--
-- /**
-- * Encodes a byte array into Base 64 format and breaks the output into lines of 76 characters.
-- * This method is compatible with sun.misc.BASE64Encoder.encodeBuffer(byte[]).
-- *
-- * @param in An array containing the data bytes to be encoded.
-- * @return A String containing the Base64 encoded data, broken into lines.
-- */
-- public static String encodeLines(byte[] in) {
-- return encodeLines(in, 0, in.length, 76, systemLineSeparator);
-- }
--
-- /**
-- * Encodes a byte array into Base 64 format and breaks the output into lines.
-- *
-- * @param in An array containing the data bytes to be encoded.
-- * @param iOff Offset of the first byte in in to be processed.
-- * @param iLen Number of bytes to be processed in in, starting at iOff.
-- * @param lineLen Line length for the output data. Should be a multiple of 4.
-- * @param lineSeparator The line separator to be used to separate the output lines.
-- * @return A String containing the Base64 encoded data, broken into lines.
-- */
-- public static String encodeLines(byte[] in, int iOff, int iLen, int lineLen,
-- String lineSeparator) {
-- int blockLen = (lineLen * 3) / 4;
-- if (blockLen <= 0) {
-- throw new IllegalArgumentException();
-- }
-- int lines = (iLen + blockLen - 1) / blockLen;
-- int bufLen = ((iLen + 2) / 3) * 4 + lines * lineSeparator.length();
-- StringBuilder buf = new StringBuilder(bufLen);
-- int ip = 0;
-- while (ip < iLen) {
-- int l = Math.min(iLen - ip, blockLen);
-- buf.append(encode(in, iOff + ip, l));
-- buf.append(lineSeparator);
-- ip += l;
-- }
-- return buf.toString();
-- }
--
-- /**
-- * Encodes a byte array into Base64 format. No blanks or line breaks are inserted in the output.
-- *
-- * @param in An array containing the data bytes to be encoded.
-- * @return A character array containing the Base64 encoded data.
-- */
-- public static char[] encode(byte[] in) {
-- return encode(in, 0, in.length);
-- }
--
-- /**
-- * Encodes a byte array into Base64 format. No blanks or line breaks are inserted in the output.
-- *
-- * @param in An array containing the data bytes to be encoded.
-- * @param iLen Number of bytes to process in in.
-- * @return A character array containing the Base64 encoded data.
-- */
-- public static char[] encode(byte[] in, int iLen) {
-- return encode(in, 0, iLen);
-- }
--
-- /**
-- * Encodes a byte array into Base64 format. No blanks or line breaks are inserted in the output.
-- *
-- * @param in An array containing the data bytes to be encoded.
-- * @param iOff Offset of the first byte in in to be processed.
-- * @param iLen Number of bytes to process in in, starting at iOff.
-- * @return A character array containing the Base64 encoded data.
-- */
-- public static char[] encode(byte[] in, int iOff, int iLen) {
-- int oDataLen = (iLen * 4 + 2) / 3; // output length without padding
-- int oLen = ((iLen + 2) / 3) * 4; // output length including padding
-- char[] out = new char[oLen];
-- int ip = iOff;
-- int iEnd = iOff + iLen;
-- int op = 0;
-- while (ip < iEnd) {
-- int i0 = in[ip++] & 0xff;
-- int i1 = ip < iEnd ? in[ip++] & 0xff : 0;
-- int i2 = ip < iEnd ? in[ip++] & 0xff : 0;
-- int o0 = i0 >>> 2;
-- int o1 = ((i0 & 3) << 4) | (i1 >>> 4);
-- int o2 = ((i1 & 0xf) << 2) | (i2 >>> 6);
-- int o3 = i2 & 0x3F;
-- out[op++] = map1[o0];
-- out[op++] = map1[o1];
-- out[op] = op < oDataLen ? map1[o2] : '=';
-- op++;
-- out[op] = op < oDataLen ? map1[o3] : '=';
-- op++;
-- }
-- return out;
-- }
--
-- /**
-- * Decodes a string from Base64 format. No blanks or line breaks are allowed within the Base64
-- * encoded input data.
-- *
-- * @param s A Base64 String to be decoded.
-- * @return A String containing the decoded data.
-- * @throws IllegalArgumentException If the input is not valid Base64 encoded data.
-- */
-- public static String decodeString(String s) {
-- return new String(decode(s));
-- }
--
-- /**
-- * Decodes a byte array from Base64 format and ignores line separators, tabs and blanks. CR, LF,
-- * Tab and Space characters are ignored in the input data. This method is compatible with
-- * sun.misc.BASE64Decoder.decodeBuffer(String).
-- *
-- * @param s A Base64 String to be decoded.
-- * @return An array containing the decoded data bytes.
-- * @throws IllegalArgumentException If the input is not valid Base64 encoded data.
-- */
-- public static byte[] decodeLines(String s) {
-- char[] buf = new char[s.length()];
-- int p = 0;
-- for (int ip = 0; ip < s.length(); ip++) {
-- char c = s.charAt(ip);
-- if (c != ' ' && c != '\r' && c != '\n' && c != '\t') {
-- buf[p++] = c;
-- }
-- }
-- return decode(buf, 0, p);
-- }
--
-- /**
-- * Decodes a byte array from Base64 format. No blanks or line breaks are allowed within the Base64
-- * encoded input data.
-- *
-- * @param s A Base64 String to be decoded.
-- * @return An array containing the decoded data bytes.
-- * @throws IllegalArgumentException If the input is not valid Base64 encoded data.
-- */
-- public static byte[] decode(String s) {
-- return decode(s.toCharArray());
-- }
--
-- /**
-- * Decodes a byte array from Base64 format. No blanks or line breaks are allowed within the Base64
-- * encoded input data.
-- *
-- * @param in A character array containing the Base64 encoded data.
-- * @return An array containing the decoded data bytes.
-- * @throws IllegalArgumentException If the input is not valid Base64 encoded data.
-- */
-- public static byte[] decode(char[] in) {
-- return decode(in, 0, in.length);
-- }
--
-- /**
-- * Decodes a byte array from Base64 format. No blanks or line breaks are allowed within the Base64
-- * encoded input data.
-- *
-- * @param in A character array containing the Base64 encoded data.
-- * @param iOff Offset of the first character in in to be processed.
-- * @param iLen Number of characters to process in in, starting at iOff.
-- * @return An array containing the decoded data bytes.
-- * @throws IllegalArgumentException If the input is not valid Base64 encoded data.
-- */
-- public static byte[] decode(char[] in, int iOff, int iLen) {
-- if (iLen % 4 != 0) {
-- throw new IllegalArgumentException(
-- "Length of Base64 encoded input string is not a multiple of 4.");
-- }
-- while (iLen > 0 && in[iOff + iLen - 1] == '=') {
-- iLen--;
-- }
-- int oLen = (iLen * 3) / 4;
-- byte[] out = new byte[oLen];
-- int ip = iOff;
-- int iEnd = iOff + iLen;
-- int op = 0;
-- while (ip < iEnd) {
-- int i0 = in[ip++];
-- int i1 = in[ip++];
-- int i2 = ip < iEnd ? in[ip++] : 'A';
-- int i3 = ip < iEnd ? in[ip++] : 'A';
-- if (i0 > 127 || i1 > 127 || i2 > 127 || i3 > 127) {
-- throw new IllegalArgumentException("Illegal character in Base64 encoded data.");
-- }
-- int b0 = map2[i0];
-- int b1 = map2[i1];
-- int b2 = map2[i2];
-- int b3 = map2[i3];
-- if (b0 < 0 || b1 < 0 || b2 < 0 || b3 < 0) {
-- throw new IllegalArgumentException("Illegal character in Base64 encoded data.");
-- }
-- int o0 = (b0 << 2) | (b1 >>> 4);
-- int o1 = ((b1 & 0xf) << 4) | (b2 >>> 2);
-- int o2 = ((b2 & 3) << 6) | b3;
-- out[op++] = (byte) o0;
-- if (op < oLen) {
-- out[op++] = (byte) o1;
-- }
-- if (op < oLen) {
-- out[op++] = (byte) o2;
-- }
-- }
-- return out;
-- }
--
-- // Dummy constructor.
-- private Base64Coder() {}
--
--} // end class Base64Coder
-diff --git a/snakeyaml-snakeyaml-49e794037c6b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java b/snakeyaml-snakeyaml-49e794037c6b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
-index b46e07f..5a80523 100644
---- a/snakeyaml-snakeyaml-49e794037c6b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
-+++ b/snakeyaml-snakeyaml-49e794037c6b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
-@@ -17,6 +17,7 @@ import java.math.BigInteger;
- import java.nio.charset.StandardCharsets;
- import java.util.ArrayList;
- import java.util.Arrays;
-+import java.util.Base64;
- import java.util.Calendar;
- import java.util.Date;
- import java.util.HashMap;
-@@ -30,7 +31,6 @@ import java.util.UUID;
- import java.util.regex.Pattern;
- import org.yaml.snakeyaml.DumperOptions;
- import org.yaml.snakeyaml.error.YAMLException;
--import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
- import org.yaml.snakeyaml.nodes.Node;
- import org.yaml.snakeyaml.nodes.Tag;
- import org.yaml.snakeyaml.reader.StreamReader;
-@@ -118,7 +118,6 @@ class SafeRepresenter extends BaseRepresenter {
- if (nonPrintableStyle == DumperOptions.NonPrintableStyle.BINARY
- && !StreamReader.isPrintable(value)) {
- tag = Tag.BINARY;
-- char[] binary;
- final byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
- // sometimes above will just silently fail - it will return incomplete data
- // it happens when String has invalid code points
-@@ -127,8 +126,7 @@ class SafeRepresenter extends BaseRepresenter {
- if (!checkValue.equals(value)) {
- throw new YAMLException("invalid string value has occurred");
- }
-- binary = Base64Coder.encode(bytes);
-- value = String.valueOf(binary);
-+ value = Base64.getEncoder().encodeToString(bytes);
- style = DumperOptions.ScalarStyle.LITERAL;
- }
- // if no other scalar style is explicitly set, use literal style for
-@@ -449,8 +447,8 @@ class SafeRepresenter extends BaseRepresenter {
- protected class RepresentByteArray implements Represent {
-
- public Node representData(Object data) {
-- char[] binary = Base64Coder.encode((byte[]) data);
-- return representScalar(Tag.BINARY, String.valueOf(binary), DumperOptions.ScalarStyle.LITERAL);
-+ String binary = Base64.getEncoder().encodeToString((byte[]) data);
-+ return representScalar(Tag.BINARY, binary, DumperOptions.ScalarStyle.LITERAL);
- }
- }
-
-diff --git a/snakeyaml-snakeyaml-49e794037c6b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java b/snakeyaml-snakeyaml-49e794037c6b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
-index 295eb72..dbe814b 100644
---- a/snakeyaml-snakeyaml-49e794037c6b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
-+++ b/snakeyaml-snakeyaml-49e794037c6b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
-@@ -13,10 +13,10 @@
- */
- package biz.source_code.base64Coder;
-
-+import java.util.Base64;
- import java.io.UnsupportedEncodingException;
- import java.nio.charset.StandardCharsets;
- import junit.framework.TestCase;
--import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
-
- public class Base64CoderTest extends TestCase {
-
-@@ -30,10 +30,10 @@ public class Base64CoderTest extends TestCase {
-
- public void testFailure1() throws UnsupportedEncodingException {
- try {
-- Base64Coder.decode("YQ=".toCharArray());
-+ Base64.getDecoder().decode("YQ=".getBytes(StandardCharsets.UTF_8));
- fail();
- } catch (Exception e) {
-- assertEquals("Length of Base64 encoded input string is not a multiple of 4.", e.getMessage());
-+ assertEquals("Input byte array has wrong 4-byte ending unit", e.getMessage());
- }
- }
-
-@@ -51,18 +51,18 @@ public class Base64CoderTest extends TestCase {
-
- private void checkInvalid(String encoded) {
- try {
-- Base64Coder.decode(encoded.toCharArray());
-+ Base64.getDecoder().decode(encoded.getBytes(StandardCharsets.UTF_8));
- fail("Illegal chanracter.");
- } catch (Exception e) {
-- assertEquals("Illegal character in Base64 encoded data.", e.getMessage());
-+ assertTrue(e.getMessage().startsWith("Illegal base64 character"));
- }
- }
-
- private void check(String text, String encoded) throws UnsupportedEncodingException {
-- char[] s1 = Base64Coder.encode(text.getBytes(StandardCharsets.UTF_8));
-- String t1 = new String(s1);
-+ byte[] s1 = Base64.getEncoder().encode(text.getBytes(StandardCharsets.UTF_8));
-+ String t1 = new String(s1, StandardCharsets.UTF_8);
- assertEquals(encoded, t1);
-- byte[] s2 = Base64Coder.decode(encoded.toCharArray());
-+ byte[] s2 = Base64.getDecoder().decode(encoded.getBytes(StandardCharsets.UTF_8));
- String t2 = new String(s2, StandardCharsets.UTF_8);
- assertEquals(text, t2);
- }
diff --git a/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch b/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
deleted file mode 100644
index 461034b..0000000
--- a/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/snakeyaml-snakeyaml-49e794037c6b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java b/snakeyaml-snakeyaml-49e794037c6b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
-index 02c3e43..5ccb842 100644
---- a/snakeyaml-snakeyaml-49e794037c6b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
-+++ b/snakeyaml-snakeyaml-49e794037c6b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
-@@ -22,18 +22,33 @@ import java.nio.charset.CharsetDecoder;
- import java.nio.charset.CodingErrorAction;
- import java.nio.charset.StandardCharsets;
- import org.yaml.snakeyaml.error.YAMLException;
--import org.yaml.snakeyaml.external.com.google.gdata.util.common.base.Escaper;
--import org.yaml.snakeyaml.external.com.google.gdata.util.common.base.PercentEscaper;
-+import java.util.BitSet;
-+
-+import org.apache.commons.codec.net.URLCodec;
-
- public abstract class UriEncoder {
-
-+ // default safe characters which can appear within URI and shouldn't be escaped
-+ private static final BitSet allowedCharacters = new BitSet(256);
-+
-+ static {
-+ for (int i = 'a'; i <= 'z'; i++) {
-+ allowedCharacters.set(i);
-+ }
-+ for (int i = 'A'; i <= 'Z'; i++) {
-+ allowedCharacters.set(i);
-+ }
-+ for (int i = '0'; i <= '9'; i++) {
-+ allowedCharacters.set(i);
-+ }
-+ // http://yaml.org/spec/1.1/#escaping%20in%20URI/
-+ for (char c : "-_.!~*'()@:$&,;=/[]".toCharArray()) {
-+ allowedCharacters.set(c);
-+ }
-+ }
-+
- private static final CharsetDecoder UTF8Decoder =
- StandardCharsets.UTF_8.newDecoder().onMalformedInput(CodingErrorAction.REPORT);
-- // Include the [] chars to the SAFEPATHCHARS_URLENCODER to avoid
-- // its escape as required by spec. See
-- // http://yaml.org/spec/1.1/#escaping%20in%20URI/
-- private static final String SAFE_CHARS = PercentEscaper.SAFEPATHCHARS_URLENCODER + "[]/";
-- private static final Escaper escaper = new PercentEscaper(SAFE_CHARS, false);
-
- /**
- * Escape special characters with '%'
-@@ -42,7 +57,13 @@ public abstract class UriEncoder {
- * @return encoded URI
- */
- public static String encode(String uri) {
-- return escaper.escape(uri);
-+ try {
-+ byte[] rawdata = URLCodec.encodeUrl(allowedCharacters,
-+ uri.getBytes("UTF-8"));
-+ return new String(rawdata, 0, rawdata.length, "US-ASCII");
-+ } catch (UnsupportedEncodingException e) {
-+ throw new YAMLException(e);
-+ }
- }
-
- /**
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..1d71fd7
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+snakeyaml package is retired on branch c10s for BAKERY-412
\ No newline at end of file
diff --git a/reader_bom_test_fix.patch b/reader_bom_test_fix.patch
deleted file mode 100644
index 0d662fa..0000000
--- a/reader_bom_test_fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/snakeyaml-snakeyaml-49e794037c6b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java b/snakeyaml-snakeyaml-49e794037c6b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
-index c7396c2..375bb75 100644
---- a/snakeyaml-snakeyaml-49e794037c6b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
-+++ b/snakeyaml-snakeyaml-49e794037c6b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
-@@ -77,41 +77,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(StandardCharsets.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(StandardCharsets.UTF_16BE, Charset.forName(unicodeReader.getEncoding()));
-- input.close();
-- }
- }
diff --git a/snakeyaml.spec b/snakeyaml.spec
deleted file mode 100644
index 59cd8f4..0000000
--- a/snakeyaml.spec
+++ /dev/null
@@ -1,318 +0,0 @@
-%global vertag 49e794037c6b
-
-Name: snakeyaml
-Summary: YAML parser and emitter for Java
-Version: 1.32
-Release: 3%{?dist}
-License: ASL 2.0
-
-URL: https://bitbucket.org/%{name}/%{name}
-Source0: %{url}/get/%{name}-%{version}.tar.gz
-
-# Upstream has forked gdata-java and base64 and refuses [1] to
-# consider replacing them by external dependencies. Bundled libraries
-# need to be removed and their use replaced by system libraries.
-# See rhbz#875777 and http://code.google.com/p/snakeyaml/issues/detail?id=175
-#
-# Replace use of bundled Base64 implementation with java.util.Base64
-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
-ExclusiveArch: %{java_arches} noarch
-
-BuildRequires: maven-local
-BuildRequires: mvn(commons-codec:commons-codec)
-BuildRequires: mvn(commons-io:commons-io)
-BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(org.apache.commons:commons-lang3)
-BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires: mvn(org.apache.velocity:velocity)
-
-%description
-SnakeYAML features:
- * a complete YAML 1.1 parser. In particular,
- SnakeYAML can parse all examples from the specification.
- * Unicode support including UTF-8/UTF-16 input/output.
- * high-level API for serializing and deserializing
- native Java objects.
- * support for all types from the YAML types repository.
- * relatively sensible error messages.
-
-
-%package javadoc
-Summary: API documentation for %{name}
-
-%description javadoc
-This package contains %{summary}.
-
-
-%prep
-%setup -q -n %{name}-%{name}-%{vertag}
-%patch0 -p2
-%patch1 -p2
-# Remove gdata code which we've replaced
-rm -r src/main/java/org/yaml/snakeyaml/external/com
-%patch2 -p2
-
-
-%mvn_file : %{name}
-
-%pom_remove_plugin :cobertura-maven-plugin
-%pom_remove_plugin :maven-changes-plugin
-%pom_remove_plugin :maven-enforcer-plugin
-%pom_remove_plugin :maven-license-plugin
-%pom_remove_plugin :maven-javadoc-plugin
-%pom_remove_plugin :maven-site-plugin
-%pom_remove_plugin :nexus-staging-maven-plugin
-%pom_xpath_replace pom:project/pom:properties/pom:maven.compiler.source '