rpms / snakeyaml

Clone
Source Code
GIT

#4 replace base64coder dependency with java.util.Base64 from JDK8
Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.
Unknown source master  into  master

0001-replace-bundled-base64coder-with-java.util.Base64.patch 0001-Replace-bundled-base64-implementation.patch
file renamed
+88 -27 
@@ -1,30 +1,46 @@
 

- From 7eb4cceb36eff9d863abe45bafa6d94c6e7e9270 Mon Sep 17 00:00:00 2001
 

- From: Michal Srb <msrb@redhat.com>
 

- Date: Wed, 24 Apr 2013 11:25:52 +0200
 

- Subject: [PATCH 1/2] Replace bundled base64 implementation
 

+ From 82e728f896dffcd88c7cb86e8d9cbebd1a04d29e Mon Sep 17 00:00:00 2001
 

+ From: Fabio Valentini <decathorpe@gmail.com>
 

+ Date: Tue, 10 Sep 2019 13:38:15 +0200
 

+ Subject: [PATCH] replace bundled base64coder with java.util.Base64
 

  

  ---
 

-  .../constructor/SafeConstructor.java          |   2 +-
 

+  pom.xml                                       |   4 +-
 

+  .../constructor/SafeConstructor.java          |   4 +-
 

   .../external/biz/base64Coder/Base64Coder.java | 305 ------------------
 

-  .../representer/SafeRepresenter.java          |   2 +-
 

+  .../representer/SafeRepresenter.java          |   6 +-
 

   .../base64Coder/Base64CoderTest.java          |  73 -----
 

-  .../issues/issue99/YamlBase64Test.java        |   2 +-
 

-  5 files changed, 3 insertions(+), 381 deletions(-)
 

+  .../issues/issue99/YamlBase64Test.java        |   6 +-
 

+  6 files changed, 10 insertions(+), 388 deletions(-)
 

   delete mode 100644 src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java
 

   delete mode 100644 src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
 

  

+ diff --git a/pom.xml b/pom.xml
 

+ index 8112370..ae308c7 100644
 

+ --- a/pom.xml
 

+ +++ b/pom.xml
 

+ @@ -10,8 +10,8 @@
 

+          <project.scm.id>bitbucket</project.scm.id>
 

+          <release.repo.url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</release.repo.url>
 

+          <snapshot.repo.url>https://oss.sonatype.org/content/repositories/snapshots/</snapshot.repo.url>
 

+ -        <maven.compiler.source>7</maven.compiler.source>
 

+ -        <maven.compiler.target>7</maven.compiler.target>
 

+ +        <maven.compiler.source>8</maven.compiler.source>
 

+ +        <maven.compiler.target>8</maven.compiler.target>
 

+          <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
 

+          <spring.version>3.2.17.RELEASE</spring.version>
 

+          <maven-bundle-plugin.version>3.5.0</maven-bundle-plugin.version>
 

  diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
 

- index a9c0f68..9b5eab1 100644
 

+ index bd022cc..217835d 100644
 

  --- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
 

  +++ b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
 

- @@ -15,6 +15,7 @@
 

-   */
 

-  package org.yaml.snakeyaml.constructor;
 

+ @@ -17,6 +17,7 @@ package org.yaml.snakeyaml.constructor;
 

   

- +import biz.source_code.base64Coder.Base64Coder;
 

   import java.math.BigInteger;
 

   import java.util.ArrayList;
 

+ +import java.util.Base64;
 

   import java.util.Calendar;
 

+  import java.util.HashMap;
 

+  import java.util.Iterator;
 

  @@ -30,7 +31,6 @@ import java.util.regex.Matcher;
 

   import java.util.regex.Pattern;
 

   
@@ -33,6 +49,15 @@
 

   import org.yaml.snakeyaml.nodes.MappingNode;
 

   import org.yaml.snakeyaml.nodes.Node;
 

   import org.yaml.snakeyaml.nodes.NodeId;
 

+ @@ -313,7 +313,7 @@ public class SafeConstructor extends BaseConstructor {
 

+              // Ignore white spaces for base64 encoded scalar
 

+              String noWhiteSpaces = constructScalar((ScalarNode) node).toString().replaceAll("\\s",
 

+                      "");
 

+ -            byte[] decoded = Base64Coder.decode(noWhiteSpaces.toCharArray());
 

+ +            byte[] decoded = Base64.getDecoder().decode(noWhiteSpaces);
 

+              return decoded;
 

+          }
 

+      }
 

  diff --git a/src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java b/src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java
 

  deleted file mode 100644
 

  index 65923b6..0000000
 
@@ -345,17 +370,17 @@
 

  -
 

  -} // end class Base64Coder
 

  diff --git a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
 

- index 6f0c96c..5eff120 100644
 

+ index 2cc15d9..e5ac480 100644
 

  --- a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
 

  +++ b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
 

- @@ -15,6 +15,7 @@
 

-   */
 

-  package org.yaml.snakeyaml.representer;
 

-  

- +import biz.source_code.base64Coder.Base64Coder;
 

-  import java.io.UnsupportedEncodingException;
 

+ @@ -19,6 +19,7 @@ import java.io.UnsupportedEncodingException;
 

   import java.math.BigInteger;
 

   import java.util.ArrayList;
 

+  import java.util.Arrays;
 

+ +import java.util.Base64;
 

+  import java.util.Calendar;
 

+  import java.util.Date;
 

+  import java.util.HashMap;
 

  @@ -33,7 +34,6 @@ import java.util.regex.Pattern;
 

   

   import org.yaml.snakeyaml.DumperOptions;
 
@@ -364,6 +389,24 @@
 

   import org.yaml.snakeyaml.nodes.Node;
 

   import org.yaml.snakeyaml.nodes.Tag;
 

   import org.yaml.snakeyaml.reader.StreamReader;
 

+ @@ -131,7 +131,7 @@ class SafeRepresenter extends BaseRepresenter {
 

+                      if (!checkValue.equals(value)) {
 

+                          throw new YAMLException("invalid string value has occurred");
 

+                      }
 

+ -                    binary = Base64Coder.encode(bytes);
 

+ +                    binary = Base64.getEncoder().encodeToString(bytes).toCharArray();
 

+                  } catch (UnsupportedEncodingException e) {
 

+                      throw new YAMLException(e);
 

+                  }
 

+ @@ -433,7 +433,7 @@ class SafeRepresenter extends BaseRepresenter {
 

+  

+      protected class RepresentByteArray implements Represent {
 

+          public Node representData(Object data) {
 

+ -            char[] binary = Base64Coder.encode((byte[]) data);
 

+ +            char[] binary = Base64.getEncoder().encodeToString((byte[]) data).toCharArray();
 

+              return representScalar(Tag.BINARY, String.valueOf(binary), DumperOptions.ScalarStyle.LITERAL);
 

+          }
 

+      }
 

  diff --git a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
 

  deleted file mode 100644
 

  index 60f6d84..0000000
 
@@ -444,17 +487,17 @@
 

  -    }
 

  -}
 

  diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
 

- index e425f25..04909ab 100644
 

+ index e425f25..a0c4f6a 100644
 

  --- a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
 

  +++ b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
 

- @@ -15,6 +15,7 @@
 

-   */
 

-  package org.yaml.snakeyaml.issues.issue99;
 

-  

- +import biz.source_code.base64Coder.Base64Coder;
 

+ @@ -18,6 +18,7 @@ package org.yaml.snakeyaml.issues.issue99;
 

   import java.io.BufferedInputStream;
 

   import java.io.IOException;
 

   import java.io.InputStream;
 

+ +import java.util.Base64;
 

+  import java.util.Map;
 

+  

+  import junit.framework.TestCase;
 

  @@ -27,7 +28,6 @@ import org.yaml.snakeyaml.Yaml;
 

   import org.yaml.snakeyaml.YamlDocument;
 

   import org.yaml.snakeyaml.constructor.AbstractConstruct;
 
@@ -463,6 +506,24 @@
 

   import org.yaml.snakeyaml.nodes.Node;
 

   import org.yaml.snakeyaml.nodes.ScalarNode;
 

   import org.yaml.snakeyaml.nodes.Tag;
 

+ @@ -50,7 +50,7 @@ public class YamlBase64Test extends TestCase {
 

+              all = all + lines[i].trim();
 

+          }
 

+          // System.out.println(all);
 

+ -        byte[] decoded = Base64Coder.decode(all.toCharArray());
 

+ +        byte[] decoded = Base64.getDecoder().decode(all);
 

+          assertEquals(3737, decoded.length);
 

+          checkBytes(decoded);
 

+      }
 

+ @@ -122,7 +122,7 @@ public class YamlBase64Test extends TestCase {
 

+              public Object construct(Node node) {
 

+                  String contentWithNewLines = constructScalar((ScalarNode) node).toString();
 

+                  String noNewLines = contentWithNewLines.replaceAll("\\s", "");
 

+ -                byte[] decoded = Base64Coder.decode(noNewLines.toCharArray());
 

+ +                byte[] decoded = Base64.getDecoder().decode(noNewLines);
 

+                  return decoded;
 

+              }
 

+          }
 

  -- 

- 2.20.1
 

+ 2.21.0

file modified
+6 -6 
@@ -5,7 +5,7 @@
 

  Name:           snakeyaml
 

  Summary:        YAML parser and emitter for Java
 

  Version:        1.25
 

- Release:        2%{?dist}
 

+ Release:        3%{?dist}
 

  License:        ASL 2.0
 

  

  URL:            https://bitbucket.org/asomov/%{name}
 
@@ -16,8 +16,8 @@
 

  # 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
 

  #
 

- # Remove use of bundled Base64 implementation
 

- Patch0:         0001-Replace-bundled-base64-implementation.patch
 

+ # 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
 

  # Fix a broken test, change backported from upstream:
 
@@ -27,7 +27,6 @@
 

  BuildArch:      noarch
 

  

  BuildRequires:  maven-local
 

- BuildRequires:  mvn(biz.source_code:base64coder)
 

  BuildRequires:  mvn(commons-codec:commons-codec)
 

  BuildRequires:  mvn(commons-io:commons-io)
 

  BuildRequires:  mvn(joda-time:joda-time)
 
@@ -81,8 +80,6 @@
 

  

  # Replacement for bundled gdata-java-client
 

  %pom_add_dep commons-codec:commons-codec
 

- # Re-add bundled base64coder
 

- %pom_add_dep biz.source_code:base64coder
 

  

  # remove bundled stuff
 

  rm -rf target
 
@@ -118,6 +115,9 @@
 

  

  

  %changelog
 

+ * Thu Oct 15 2019 Fabio Valentini <decathorpe@gmail.com> - 1.25-3
 

+ - Replace base64coder dependency with java.util.Base64 from JDK8.
 

+ 

  * Tue Oct 15 2019 Fabio Valentini <decathorpe@gmail.com> - 1.25-2
 

  - Backport fix for a broken test from upstream.

  • remove bundled base64coder fork
  • drop base64coder package dependency
  • replace with java.util.Base64, available since JDK8
  • bump java dependency from 1.7 to 1.8 in the POM

snakeyaml tests still pass. dependent packages build correctly:

https://copr.fedorainfracloud.org/coprs/decathorpe/snakeyaml-base64-pr/monitor/

This will allow us to drop the base64coder package.

I haven't read the patch, but it seems to work. Let's do it (we can always revert if it's totally broken).

I've read the patch, it seems to work, I don't have any questions about it (once I realized I was reading a diff of a diff...). :)

Ship it!

rebased onto dce9f85
4 years ago

Rebased onto master, and re-run the test rebuilds:

https://copr.fedorainfracloud.org/coprs/decathorpe/snakeyaml-base64-pr/monitor/

Everything went fine, so I'll go ahead and merge this.

dependencies-- :tada:

Pull-Request has been merged by decathorpe
4 years ago
Metadata
None
No Tags
Changes Summary 2
+88 -27
file renamed
0001-Replace-bundled-base64-implementation.patch
0001-replace-bundled-base64coder-with-java.util.Base64.patch
+6 -6
file changed
snakeyaml.spec
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.