diff --git a/snakeyaml-build.xml b/snakeyaml-build.xml index 65fd48b..5f28e8c 100644 --- a/snakeyaml-build.xml +++ b/snakeyaml-build.xml @@ -121,6 +121,8 @@ + + diff --git a/snakeyaml.changes b/snakeyaml.changes index f183d71..8cd080c 100644 --- a/snakeyaml.changes +++ b/snakeyaml.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 18 07:17:01 UTC 2022 - Fridrich Strba + +- Fix --with tests build + ------------------------------------------------------------------- Mon Oct 17 17:05:58 UTC 2022 - Fridrich Strba diff --git a/snakeyaml.spec b/snakeyaml.spec index 82e3762..785f709 100644 --- a/snakeyaml.spec +++ b/snakeyaml.spec @@ -95,11 +95,48 @@ rm -f src/test/java/examples/SpringTest.java # 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 +%pom_remove_dep org.projectlombok:lombok +%pom_remove_dep org.apache.velocity:velocity-engine-core + # 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 +# Tests using dependencies we don't have/have removed +rm src/test/java/org/yaml/snakeyaml/emitter/template/VelocityTest.java +rm src/test/java/org/yaml/snakeyaml/issues/issue387/YamlExecuteProcessContextTest.java +rm src/test/java/org/yaml/snakeyaml/env/ApplicationProperties.java +rm src/test/java/org/yaml/snakeyaml/env/EnvLombokTest.java +rm src/test/java/org/yaml/snakeyaml/issues/issue527/Fuzzy47047Test.java +rm src/test/java/org/yaml/snakeyaml/issues/issue530/Fuzzy47039Test.java +rm src/test/java/org/yaml/snakeyaml/issues/issue543/Fuzzer50355Test.java +rm src/test/java/org/yaml/snakeyaml/issues/issue525/FuzzyStackOverflowTest.java +rm src/test/java/org/yaml/snakeyaml/issues/issue529/Fuzzy47028Test.java +rm src/test/java/org/yaml/snakeyaml/issues/issue531/Fuzzy47081Test.java +rm src/test/java/org/yaml/snakeyaml/issues/issue526/Fuzzy47027Test.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 +rm -rf src/test/resources/fuzzer/ +# 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