/snakeyaml-1.13.zip

  /snakeyaml-1.16.tar.bz2

  /snakeyaml-1.17.tar.bz2

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

  ---

   5 files changed, 3 insertions(+), 381 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/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java

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

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

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

  +import biz.source_code.base64Coder.Base64Coder;

   import java.math.BigInteger;

   import java.util.regex.Pattern;

   import org.yaml.snakeyaml.error.YAMLException;

  -

  -} // 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

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

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

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

   import java.io.UnsupportedEncodingException;

   import java.math.BigInteger;

   import java.util.ArrayList;

   import org.yaml.snakeyaml.error.YAMLException;

  -import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;

   import org.yaml.snakeyaml.nodes.Node;

  -    }

  -}

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

  --- 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 @@

   import org.yaml.snakeyaml.nodes.ScalarNode;

   import org.yaml.snakeyaml.nodes.Tag;

  -- 

   commons-codec

  ---

   delete mode 100644 src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java

   delete mode 100644 src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java

   delete mode 100644 src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java

  -    };

  -}

  diff --git a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java

  --- a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java

  +++ b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java

   import java.nio.charset.Charset;

   import java.nio.charset.CharsetDecoder;

   import java.nio.charset.CodingErrorAction;

  +import java.util.BitSet;

  +import org.apache.commons.codec.net.URLCodec;

   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;

   public abstract class UriEncoder {

       private static final CharsetDecoder UTF8Decoder = Charset.forName("UTF-8").newDecoder()

  -    // 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);

  +    private static final BitSet allowedCharacters = new BitSet(256);

  +

  +    static {

  +            allowedCharacters.set(c);

  +        }

  +    }

       /**

        * Escape special characters with '%'

        */

       public static String encode(String uri) {

  -        return escaper.escape(uri);

       /**

  -- 

  %bcond_with spring

  Name:           snakeyaml

  Summary:        YAML parser and emitter for Java

  License:        ASL 2.0

  # Upstream has forked gdata-java and base64 and refuses [1] to

  # consider replacing them by external dependencies.  Bundled libraries

  BuildRequires:  maven-local

  BuildRequires:  mvn(biz.source_code:base64coder)

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

  BuildRequires:  mvn(joda-time:joda-time)

  BuildRequires:  mvn(junit:junit)

  BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)

  BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)

  BuildRequires:  mvn(org.apache.velocity:velocity)

  %if %{with spring}

  BuildRequires:  mvn(org.springframework:spring-core)

  %endif

  %description

  %pom_remove_plugin :cobertura-maven-plugin

  %pom_remove_plugin :maven-changes-plugin

  %pom_remove_plugin :maven-license-plugin

  %pom_remove_plugin :maven-javadoc-plugin

  %pom_remove_plugin :maven-site-plugin

  sed -i "/<artifactId>spring</s/spring/&-core/" pom.xml

  rm -f src/test/java/examples/SpringTest.java

  %if %{without spring}

  %pom_remove_dep org.springframework

  rm -r src/test/java/org/yaml/snakeyaml/issues/issue9

  %endif

  %changelog

  * Sun Jul 28 2019 Fabio Valentini <decathorpe@gmail.com> - 1.17-9

  - Disable support for spring.