Compare commits
No commits in common. "c8" and "9be28b833153505028010049407f32e031ac69dd" have entirely different histories.
c8
...
9be28b8331
|
|
@ -1 +1,11 @@
|
|||
SOURCES/snakeyaml-1.25.tar.gz
|
||||
/results_*
|
||||
/*.src.rpm
|
||||
|
||||
/SnakeYAML-all-1.8.zip
|
||||
/SnakeYAML-all-1.9.zip
|
||||
/snakeyaml-1.13.zip
|
||||
/snakeyaml-1.16.tar.bz2
|
||||
/snakeyaml-1.17.tar.bz2
|
||||
/snakeyaml-1.25.tar.gz
|
||||
/snakeyaml-1.26.tar.gz
|
||||
/snakeyaml-1.27.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
aeb966ac73817d8ccda148de2bc870ad3186512d SOURCES/snakeyaml-1.25.tar.gz
|
||||
cfc905b4daa83fdc58c01824825ec5807c158c91 snakeyaml-1.27.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,38 +1,63 @@
|
|||
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>
|
||||
<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 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;
|
||||
@@ -30,7 +31,6 @@ import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
@@ -31,7 +32,6 @@ import java.util.regex.Pattern;
|
||||
|
||||
import org.yaml.snakeyaml.LoaderOptions;
|
||||
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;
|
||||
@@ -348,7 +348,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 @@ 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 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 @@ index 6f0c96c..5eff120 100644
|
|||
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 @@ 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..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 @@ index e425f25..04909ab 100644
|
|||
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
|
||||
|
||||
|
|
@ -1,144 +0,0 @@
|
|||
%global vertag 8450addf3473
|
||||
|
||||
%bcond_with spring
|
||||
|
||||
Name: snakeyaml
|
||||
Summary: YAML parser and emitter for Java
|
||||
Version: 1.25
|
||||
Release: 3%{?dist}
|
||||
License: ASL 2.0
|
||||
|
||||
URL: https://bitbucket.org/asomov/%{name}
|
||||
Source0: %{url}/get/%{name}-%{version}.tar.gz
|
||||
|
||||
# Upstream has forked gdata-java and base64 and refuses [1] to
|
||||
# consider replacing them by external dependencies. Bundled libraries
|
||||
# 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
|
||||
# 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
|
||||
|
||||
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(junit:junit)
|
||||
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:
|
||||
* a complete YAML 1.1 parser. In particular,
|
||||
SnakeYAML can parse all examples from the specification.
|
||||
* Unicode support including UTF-8/UTF-16 input/output.
|
||||
* high-level API for serializing and deserializing
|
||||
native Java objects.
|
||||
* support for all types from the YAML types repository.
|
||||
* relatively sensible error messages.
|
||||
|
||||
|
||||
%package javadoc
|
||||
Summary: API documentation for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package contains %{summary}.
|
||||
|
||||
%package tests
|
||||
Summary: Tests jar for %{name}
|
||||
|
||||
%description tests
|
||||
This package contains %{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q -n asomov-%{name}-%{vertag}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%mvn_file : %{name}
|
||||
|
||||
%pom_remove_plugin :cobertura-maven-plugin
|
||||
%pom_remove_plugin :maven-changes-plugin
|
||||
%pom_remove_plugin :maven-enforcer-plugin
|
||||
%pom_remove_plugin :maven-license-plugin
|
||||
%pom_remove_plugin :maven-javadoc-plugin
|
||||
%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
|
||||
# Re-add bundled base64coder
|
||||
%pom_add_dep biz.source_code:base64coder
|
||||
|
||||
# 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
|
||||
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
|
||||
|
||||
# Remove tests requiring joda-time
|
||||
rm -rf src/test/java/examples/jodatime/
|
||||
%pom_remove_dep joda-time:joda-time
|
||||
|
||||
%pom_xpath_inject pom:project/pom:build/pom:plugins '<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.1.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>test-jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>'
|
||||
%mvn_package org.yaml:snakeyaml:jar:tests:%{version} tests
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
|
||||
%files -f .mfiles
|
||||
%doc LICENSE.txt
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE.txt
|
||||
|
||||
%files tests -f .mfiles-tests
|
||||
|
||||
%changelog
|
||||
* Mon Oct 07 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1.25-3
|
||||
- Add tests sub-package.
|
||||
|
||||
* Mon Oct 07 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1.25-2
|
||||
- Initial import from Fedora.
|
||||
- Remove joda-time test dependency.
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
diff --git a/asomov-snakeyaml-29e2699b80fc/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java b/asomov-snakeyaml-29e2699b80fc/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
|
||||
index 54ad0d6..6728680 100644
|
||||
--- a/asomov-snakeyaml-29e2699b80fc/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
|
||||
+++ b/asomov-snakeyaml-29e2699b80fc/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
|
||||
@@ -79,41 +79,4 @@ public class ReaderBomTest extends TestCase {
|
||||
input.close();
|
||||
}
|
||||
|
||||
- public void testUnicodeLeBom() throws IOException {
|
||||
- File file = new File("src/test/resources/reader/unicode-16le.txt");
|
||||
- assertTrue("Test file not found: " + file.getAbsolutePath(), file.exists());
|
||||
- InputStream input = new FileInputStream(file);
|
||||
- UnicodeReader unicodeReader = new UnicodeReader(input);
|
||||
- StreamReader reader = new StreamReader(unicodeReader);
|
||||
- assertEquals('t', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('e', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('s', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('t', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('\u0000', reader.peek());
|
||||
- assertEquals(Charset.forName("UTF-16LE"), Charset.forName(unicodeReader.getEncoding()));
|
||||
- input.close();
|
||||
- }
|
||||
-
|
||||
- public void testUnicodeBeBom() throws IOException {
|
||||
- File file = new File("src/test/resources/reader/unicode-16be.txt");
|
||||
- assertTrue("Test file not found: " + file.getAbsolutePath(), file.exists());
|
||||
- InputStream input = new FileInputStream(file);
|
||||
- UnicodeReader unicodeReader = new UnicodeReader(input);
|
||||
- StreamReader reader = new StreamReader(unicodeReader);
|
||||
- assertEquals('t', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('e', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('s', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('t', reader.peek());
|
||||
- reader.forward(1);
|
||||
- assertEquals('\u0000', reader.peek());
|
||||
- assertEquals(Charset.forName("UTF-16BE"), Charset.forName(unicodeReader.getEncoding()));
|
||||
- input.close();
|
||||
- }
|
||||
}
|
||||
|
|
@ -0,0 +1,280 @@
|
|||
%global vertag 29e2699b80fc
|
||||
|
||||
Name: snakeyaml
|
||||
Summary: YAML parser and emitter for Java
|
||||
Version: 1.27
|
||||
Release: 5%{?dist}
|
||||
License: ASL 2.0
|
||||
|
||||
URL: https://bitbucket.org/asomov/%{name}
|
||||
Source0: %{url}/get/%{name}-%{version}.tar.gz
|
||||
|
||||
# Upstream has forked gdata-java and base64 and refuses [1] to
|
||||
# consider replacing them by external dependencies. Bundled libraries
|
||||
# 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
|
||||
#
|
||||
# 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
|
||||
Patch2: reader_bom_test_fix.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(commons-codec:commons-codec)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
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)
|
||||
|
||||
%description
|
||||
SnakeYAML features:
|
||||
* a complete YAML 1.1 parser. In particular,
|
||||
SnakeYAML can parse all examples from the specification.
|
||||
* Unicode support including UTF-8/UTF-16 input/output.
|
||||
* high-level API for serializing and deserializing
|
||||
native Java objects.
|
||||
* support for all types from the YAML types repository.
|
||||
* relatively sensible error messages.
|
||||
|
||||
|
||||
%package javadoc
|
||||
Summary: API documentation for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package contains %{summary}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n asomov-%{name}-%{vertag}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p2
|
||||
|
||||
|
||||
%mvn_file : %{name}
|
||||
|
||||
%pom_remove_plugin :cobertura-maven-plugin
|
||||
%pom_remove_plugin :maven-changes-plugin
|
||||
%pom_remove_plugin :maven-enforcer-plugin
|
||||
%pom_remove_plugin :maven-license-plugin
|
||||
%pom_remove_plugin :maven-javadoc-plugin
|
||||
%pom_remove_plugin :maven-site-plugin
|
||||
%pom_remove_plugin :nexus-staging-maven-plugin
|
||||
|
||||
# Replacement for bundled gdata-java-client
|
||||
%pom_add_dep commons-codec:commons-codec
|
||||
|
||||
# Unnecessary test-time only dependency
|
||||
%pom_remove_dep joda-time:joda-time
|
||||
rm -rf src/test/java/examples/jodatime
|
||||
|
||||
# fails in rpmbuild only due to different locale
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue67/NonAsciiCharsInClassNameTest.java
|
||||
# fails after unbundling
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
|
||||
|
||||
# Problematic test resources for maven-resources-plugin 3.2
|
||||
rm src/test/resources/issues/issue99.jpeg
|
||||
rm src/test/resources/reader/unicode-16be.txt
|
||||
rm src/test/resources/reader/unicode-16le.txt
|
||||
rm src/test/resources/pyyaml/spec-05-01-utf16be.data
|
||||
rm src/test/resources/pyyaml/spec-05-01-utf16le.data
|
||||
rm src/test/resources/pyyaml/spec-05-02-utf16le.data
|
||||
rm src/test/resources/pyyaml/odd-utf16.stream-error
|
||||
rm src/test/resources/pyyaml/invalid-character.loader-error
|
||||
rm src/test/resources/pyyaml/invalid-character.stream-error
|
||||
rm src/test/resources/pyyaml/invalid-utf8-byte.loader-error
|
||||
rm src/test/resources/pyyaml/invalid-utf8-byte.stream-error
|
||||
rm src/test/resources/pyyaml/empty-document-bug.data
|
||||
rm src/test/resources/pyyaml/spec-05-02-utf16be.data
|
||||
# Test using the jpeg data removed above
|
||||
rm src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
|
||||
|
||||
# convert CR+LF to LF
|
||||
sed -i 's/\r//g' LICENSE.txt
|
||||
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
|
||||
%files -f .mfiles
|
||||
%doc LICENSE.txt
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE.txt
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.27-5
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Mon Jul 12 2021 Severin Gehwolf <sgehwolf@redhat.com> - 1.27-4
|
||||
- Fix maven-resources-plugin 3.2 issues. Fixes FTBFS.
|
||||
- Resolves: RHBZ#1980965
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.27-3
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.27-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* 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
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.26-3
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Wed May 06 2020 Mat Booth <mat.booth@redhat.com> - 1.26-2
|
||||
- Drop unnecessary dep on joda-time
|
||||
|
||||
* Wed Apr 15 2020 Severin Gehwolf <sgehwolf@redhat.com> - 1.26-1
|
||||
- Update to latest upstream 1.26 release.
|
||||
- Resolves: CVE-2017-18640
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.25-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue 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.
|
||||
|
||||
* Thu Aug 22 2019 Fabio Valentini <decathorpe@gmail.com> - 1.25-1
|
||||
- Update to version 1.25.
|
||||
|
||||
* Sun Jul 28 2019 Fabio Valentini <decathorpe@gmail.com> - 1.17-9
|
||||
- Disable support for spring.
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Thu Feb 02 2017 Michael Simacek <msimacek@redhat.com> - 1.17-2
|
||||
- Add conditional for spring
|
||||
|
||||
* Mon Oct 17 2016 Michael Simacek <msimacek@redhat.com> - 1.17-1
|
||||
- Update to upstream version 1.17
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Mon Sep 28 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.16-1
|
||||
- Update to upstream version 1.16
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue Apr 21 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.13-8
|
||||
- Remove maven-javadoc-plugin from POM
|
||||
|
||||
* Tue Mar 31 2015 Michael Simacek <msimacek@redhat.com> - 1.13-7
|
||||
- Remove BR on maven-changes-plugin
|
||||
|
||||
* Wed Mar 25 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.13-6
|
||||
- Remove build dependency on cobertura
|
||||
|
||||
* Wed Mar 11 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.13-5
|
||||
- Add BR on objectweb-asm3
|
||||
|
||||
* Wed Jan 21 2015 Mat Booth <mat.booth@redhat.com> - 1.13-4
|
||||
- Add missing BR on maven-site-plugin
|
||||
|
||||
* Mon Jun 16 2014 Michal Srb <msrb@redhat.com> - 1.13-3
|
||||
- Fix FTBFS
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Mon Sep 30 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.13-1
|
||||
- Update to upstream version 1.13
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Jun 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-6
|
||||
- Update to current packaging guidelines
|
||||
|
||||
* Fri Apr 26 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-5
|
||||
- Explain gdata-java and base64 bundling situation
|
||||
- Resolves: rhbz#875777
|
||||
|
||||
* Mon Apr 22 2013 Michal Srb <msrb@redhat.com> - 1.11-5
|
||||
- Replace bundled base64 implementation
|
||||
- Replace bundled gdata-java-client classes with apache-commons-codec
|
||||
|
||||
* Wed Apr 10 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-4
|
||||
- Conditionally disable tests
|
||||
- Conditionally remove test dependencies from POM
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.11-2
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-1
|
||||
- Update to upstream version 1.11
|
||||
|
||||
* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9-3
|
||||
- Remove unneeded dependencies: base64coder, gdata-java
|
||||
- Convert pom.xml patch to POM macro
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Jan 20 2012 Mo Morsi <mmorsi@redhat.com> - 1.9-1
|
||||
- Update to latest upstream release
|
||||
- patch2, patch3 no longer needed
|
||||
- update to latest fedora java guidelines
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Jun 20 2011 Jaromir Capik <jcapik@redhat.com> - 1.8-6
|
||||
- Patch for the issue67 test removed
|
||||
|
||||
* Fri Jun 17 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.8-5
|
||||
- Add osgi metadata to jar file (#713935)
|
||||
|
||||
* Thu Jun 09 2011 Jaromir Capik <jcapik@redhat.com> - 1.8-4
|
||||
- File handle leaks patched
|
||||
|
||||
* Tue Jun 07 2011 Jaromir Capik <jcapik@redhat.com> - 1.8-3
|
||||
- base64coder-java renamed to base64coder
|
||||
|
||||
* Wed Jun 01 2011 Jaromir Capik <jcapik@redhat.com> - 1.8-2
|
||||
- Bundled stuff removal
|
||||
|
||||
* Mon May 16 2011 Jaromir Capik <jcapik@redhat.com> - 1.8-1
|
||||
- Initial version of the package
|
||||
|
||||
Loading…
Reference in New Issue