Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/snakeyaml.git#4918961baed04fafe54933477208a18b860b877c

.gitignore

@@ -8,3 +8,4 @@
 /snakeyaml-1.17.tar.bz2
 /snakeyaml-1.25.tar.gz
 /snakeyaml-1.26.tar.gz
+/snakeyaml-1.27.tar.gz

0001-replace-bundled-base64coder-with-java.util.Base64.patch

@@ -27,8 +27,8 @@ index 8112370..ae308c7 100644
 +        <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>
+         <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version><!-- for Github CI -->
 diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
 index bd022cc..217835d 100644
 --- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java

snakeyaml.spec

@@ -1,11 +1,9 @@
-%global vertag e91772b1bc0b
-
-%bcond_with spring
+%global vertag 29e2699b80fc
 
 Name:           snakeyaml
 Summary:        YAML parser and emitter for Java
-Version:        1.26
-Release:        4%{?dist}
+Version:        1.27
+Release:        1%{?dist}
 License:        ASL 2.0
 
 URL:            https://bitbucket.org/asomov/%{name}
@@ -31,11 +29,6 @@ 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)
-%if %{with spring}
-BuildRequires:  mvn(org.springframework:spring-core)
-BuildRequires:  mvn(org.springframework:spring-beans)
-BuildRequires:  mvn(org.springframework:spring-context-support)
-%endif
 
 %description
 SnakeYAML features:
@@ -70,9 +63,6 @@ This package contains %{summary}.
 %pom_remove_plugin :maven-site-plugin
 %pom_remove_plugin :nexus-staging-maven-plugin
 
-sed -i "/<artifactId>spring</s/spring/&-core/" pom.xml
-rm -f src/test/java/examples/SpringTest.java
-
 # Replacement for bundled gdata-java-client
 %pom_add_dep commons-codec:commons-codec
 
@@ -80,9 +70,6 @@ rm -f src/test/java/examples/SpringTest.java
 %pom_remove_dep joda-time:joda-time
 rm -rf src/test/java/examples/jodatime
 
-# remove bundled stuff
-rm -rf target
-
 # fails in rpmbuild only due to different locale
 rm src/test/java/org/yaml/snakeyaml/issues/issue67/NonAsciiCharsInClassNameTest.java
 # fails after unbundling
@@ -91,12 +78,6 @@ rm src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
 # convert CR+LF to LF
 sed -i 's/\r//g' LICENSE.txt
 
-%if %{without spring}
-%pom_remove_dep org.springframework
-rm -r src/test/java/org/yaml/snakeyaml/issues/issue9
-rm src/test/java/org/yaml/snakeyaml/helpers/FileTestHelper.java
-%endif
-
 
 %build
 %mvn_build
@@ -114,6 +95,9 @@ rm src/test/java/org/yaml/snakeyaml/helpers/FileTestHelper.java
 
 
 %changelog
+* Sat Oct 24 2020 Fabio Valentini <decathorpe@gmail.com> - 1.27-1
+- Update to version 1.27.
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (snakeyaml-1.26.tar.gz) = 00cc2f9ee5f590eb6fbe511844856ed9cc97c6c135f2a116a01a9464eea79eec78be6b0cdfde363d4e1accf803b362cdfb9315f74da73f23c2f9b7900ade3145
+SHA512 (snakeyaml-1.27.tar.gz) = 91977b334d75278c22c55daa944fd3755f00091eeff819980793058a5a7954fa97d22bd7b8ccd03a7826415107ae21673865d70138b9b1bae5b3bdad874c48f2