OBS-URL: https://build.opensuse.org/package/show/Java:packages/snakeyaml?expand=0&rev=16

2022-09-06 13:54:49 +00:00 · 2022-09-06 13:54:49 +00:00 · 224feaf936
commit 224feaf936
parent 5b97d38b98
6 changed files with 43 additions and 41 deletions
--- a/0001-replace-bundled-base64coder-with-java.util.Base64.patch
+++ b/0001-replace-bundled-base64coder-with-java.util.Base64.patch
@ -1,39 +1,41 @@
-From 82e728f896dffcd88c7cb86e8d9cbebd1a04d29e Mon Sep 17 00:00:00 2001
+From c7ea35842ddebe7069024f284b543f1c10d00631 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
+Subject: [PATCH 1/2] replace bundled base64coder with java.util.Base64

 ---
- pom.xml                                       |   4 +-
+ pom.xml                                       |   6 +-
 .../constructor/SafeConstructor.java          |   4 +-
 .../external/biz/base64Coder/Base64Coder.java | 305 ------------------
 .../representer/SafeRepresenter.java          |   6 +-
 .../base64Coder/Base64CoderTest.java          |  73 -----
 .../issues/issue99/YamlBase64Test.java        |   6 +-
- 6 files changed, 10 insertions(+), 388 deletions(-)
+ 6 files changed, 10 insertions(+), 390 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
+index cff065a7..102381e7 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -10,8 +10,8 @@
+@@ -10,10 +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.testSource>8</maven.compiler.testSource>
+-        <maven.compiler.testTarget>8</maven.compiler.testTarget>
 +        <maven.compiler.source>8</maven.compiler.source>
 +        <maven.compiler.target>8</maven.compiler.target>
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
         <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
+index f38c4e9a..cb29cf39 100644
 --- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
 +++ b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
-@@ -17,6 +17,7 @@
+@@ -17,6 +17,7 @@ package org.yaml.snakeyaml.constructor;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@ -41,7 +43,7 @@ index bd022cc..217835d 100644
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
-@@ -31,7 +32,6 @@
+@@ -31,7 +32,6 @@ import java.util.regex.Pattern;
 
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.error.YAMLException;
@ -49,7 +51,7 @@ index bd022cc..217835d 100644
 import org.yaml.snakeyaml.nodes.MappingNode;
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.nodes.NodeId;
-@@ -348,7 +348,7 @@
+@@ -383,7 +383,7 @@ public class SafeConstructor extends BaseConstructor {
             // Ignore white spaces for base64 encoded scalar
             String noWhiteSpaces = constructScalar((ScalarNode) node).toString().replaceAll("\\s",
                     "");
@ -60,7 +62,7 @@ index bd022cc..217835d 100644
     }
 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
+index 65923b65..00000000
 --- a/src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java
 +++ /dev/null
@@ -1,305 +0,0 @@
@ -370,10 +372,10 @@ index 65923b6..0000000
 -
 -} // 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 2cc15d9..e5ac480 100644
+index 810dbe97..cafc0be8 100644
 --- a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
 +++ b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
-@@ -19,6 +19,7 @@
+@@ -19,6 +19,7 @@ import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
@ -381,7 +383,7 @@ index 2cc15d9..e5ac480 100644
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
-@@ -33,7 +34,6 @@
+@@ -33,7 +34,6 @@ import java.util.regex.Pattern;
 
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.error.YAMLException;
@ -389,7 +391,7 @@ index 2cc15d9..e5ac480 100644
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.reader.StreamReader;
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ class SafeRepresenter extends BaseRepresenter {
                     if (!checkValue.equals(value)) {
                         throw new YAMLException("invalid string value has occurred");
                     }
@ -398,7 +400,7 @@ index 2cc15d9..e5ac480 100644
                 } catch (UnsupportedEncodingException e) {
                     throw new YAMLException(e);
                 }
-@@ -433,7 +433,7 @@
+@@ -433,7 +433,7 @@ class SafeRepresenter extends BaseRepresenter {
 
     protected class RepresentByteArray implements Represent {
         public Node representData(Object data) {
@ -409,12 +411,12 @@ index 2cc15d9..e5ac480 100644
     }
 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
+index e8e32da1..00000000
 --- a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
 +++ /dev/null
@@ -1,73 +0,0 @@
 -/**
- * Copyright (c) 2008, http://www.snakeyaml.org
+- * Copyright (c) 2008, SnakeYAML
 - *
 - * Licensed under the Apache License, Version 2.0 (the "License");
 - * you may not use this file except in compliance with the License.
@ -487,10 +489,10 @@ index 60f6d84..0000000
 -    }
 -}
 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..a0c4f6a 100644
+index bae02d29..5f3e62ed 100644
 --- a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
 +++ b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ package org.yaml.snakeyaml.issues.issue99;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@ -498,7 +500,7 @@ index e425f25..a0c4f6a 100644
 import java.util.Map;
 
 import junit.framework.TestCase;
-@@ -27,7 +28,6 @@
+@@ -27,7 +28,6 @@ import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.YamlDocument;
 import org.yaml.snakeyaml.constructor.AbstractConstruct;
 import org.yaml.snakeyaml.constructor.Constructor;
@ -506,7 +508,7 @@ index e425f25..a0c4f6a 100644
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.nodes.ScalarNode;
 import org.yaml.snakeyaml.nodes.Tag;
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,7 @@ public class YamlBase64Test extends TestCase {
             all = all + lines[i].trim();
         }
         // System.out.println(all);
@ -515,7 +517,7 @@ index e425f25..a0c4f6a 100644
         assertEquals(3737, decoded.length);
         checkBytes(decoded);
     }
-@@ -122,7 +122,7 @@
+@@ -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", "");
@ -525,5 +527,5 @@ index e425f25..a0c4f6a 100644
             }
         }
 -- 
-2.21.0
+2.37.3

--- a/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
+++ b/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
@ -1,4 +1,4 @@
-From f06ff492f18d7c9cdf861a79293279e5ed55823f Mon Sep 17 00:00:00 2001
+From 4e09236b88488cfc222d8e3419e344092548117b Mon Sep 17 00:00:00 2001
 From: Michal Srb <msrb@redhat.com>
 Date: Fri, 26 Apr 2013 07:32:04 +0200
 Subject: [PATCH 2/2] Replace bundled gdata-java-client classes with
@ -16,7 +16,7 @@ Subject: [PATCH 2/2] Replace bundled gdata-java-client classes with

 diff --git a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java
 deleted file mode 100644
-index c26e3cb..0000000
+index c26e3cb6..00000000
 --- a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java
 +++ /dev/null
@@ -1,97 +0,0 @@
@ -119,7 +119,7 @@ index c26e3cb..0000000
 -}
 diff --git a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java
 deleted file mode 100644
-index 5e2f902..0000000
+index 5e2f902d..00000000
 --- a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java
 +++ /dev/null
@@ -1,281 +0,0 @@
@ -406,7 +406,7 @@ index 5e2f902..0000000
 -}
 diff --git a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java
 deleted file mode 100644
-index 5403185..0000000
+index 54031850..00000000
 --- a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java
 +++ /dev/null
@@ -1,506 +0,0 @@
@ -917,7 +917,7 @@ index 5403185..0000000
 -    };
 -}
 diff --git a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
-index 4cc18b4..b6a1992 100644
+index de7849d4..d6140bb4 100644
 --- a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
 +++ b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
@@ -23,27 +23,46 @@ import java.nio.charset.CharacterCodingException;
@ -977,5 +977,5 @@ index 4cc18b4..b6a1992 100644
 
     /**
 -- 
-2.20.1
+2.37.3

--- a/snakeyaml-1.28.tar.bz2
+++ b/snakeyaml-1.28.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a8c452c7274223d284ec28d3a16715c4741a7efed2a888cce080ef9b7ee6df8
-size 300779
--- a/snakeyaml-1.31.tar.bz2
+++ b/snakeyaml-1.31.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aba076a8e921b7406e15748bf7d60425ce6c40530335b91dfebb36e14e3aabd4
+size 308276
--- a/snakeyaml-build.xml
+++ b/snakeyaml-build.xml
@ -12,10 +12,10 @@
  <property name="project.description" value="YAML 1.1 parser and emitter for Java"/>
  <property name="project.groupId" value="org.yaml"/>
  <property name="project.artifactId" value="snakeyaml"/>
-  <property name="project.version" value="1.28"/>
+  <property name="project.version" value="1.31"/>
  <property name="bundle.version" value="${project.version}.0"/>
  
-  <property name="compiler.source" value="1.7"/>
+  <property name="compiler.source" value="1.8"/>
  <property name="compiler.target" value="${compiler.source}"/>

  <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
--- a/snakeyaml.spec
+++ b/snakeyaml.spec
@ -1,7 +1,7 @@
 #
 # spec file for package snakeyaml
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -16,16 +16,16 @@
 #


-%global vertag b28f0b4d87c6
+%global vertag 04401a88fa9b
 %bcond_with tests
 Name:           snakeyaml
-Version:        1.28
+Version:        1.31
 Release:        0
 Summary:        YAML parser and emitter for the Java programming language
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            https://bitbucket.org/asomov/snakeyaml/
-Source0:        https://bitbucket.org/asomov/snakeyaml/get/%{name}-%{version}.tar.bz2
+URL:            https://bitbucket.org/%{name}/%{name}
+Source0:        https://bitbucket.org/%{name}/%{name}/get/%{name}-%{version}.tar.bz2
 Source1:        %{name}-build.xml
 # Upstream has forked gdata-java and base64 and refuses [1] to
 # consider replacing them by external dependencies.  Bundled libraries
@ -76,7 +76,7 @@ Group:          Documentation/HTML
 This package contains %{summary}.

 %prep
-%setup -q -n asomov-%{name}-%{vertag}
+%setup -q -n %{name}-%{name}-%{vertag}
 cp %{SOURCE1} build.xml
 %patch0 -p1
 %patch1 -p1