snakeyaml/Replace-bundled-base64-implementation.patch

55 lines
2.4 KiB
Diff

--- asomov-snakeyaml-8450addf3473/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java 2019-08-13 21:16:33.000000000 +0200
+++ asomov-snakeyaml-8450addf3473.new/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java 2019-11-09 19:57:01.024700221 +0100
@@ -15,6 +15,7 @@
*/
package org.yaml.snakeyaml.constructor;
+import biz.source_code.base64Coder.Base64Coder;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Calendar;
@@ -30,7 +31,6 @@
import java.util.regex.Pattern;
import org.yaml.snakeyaml.error.YAMLException;
-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.NodeId;
--- asomov-snakeyaml-8450addf3473/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java 2019-08-13 21:16:33.000000000 +0200
+++ asomov-snakeyaml-8450addf3473.new/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java 2019-11-09 19:57:01.028700205 +0100
@@ -15,6 +15,7 @@
*/
package org.yaml.snakeyaml.representer;
+import biz.source_code.base64Coder.Base64Coder;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
import java.util.ArrayList;
@@ -33,7 +34,6 @@
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;
--- asomov-snakeyaml-8450addf3473/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java 2019-08-13 21:16:33.000000000 +0200
+++ asomov-snakeyaml-8450addf3473.new/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java 2019-11-09 19:57:01.028700205 +0100
@@ -15,6 +15,7 @@
*/
package org.yaml.snakeyaml.issues.issue99;
+import biz.source_code.base64Coder.Base64Coder;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -27,7 +28,6 @@
import org.yaml.snakeyaml.YamlDocument;
import org.yaml.snakeyaml.constructor.AbstractConstruct;
import org.yaml.snakeyaml.constructor.Constructor;
-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.ScalarNode;
import org.yaml.snakeyaml.nodes.Tag;