diff --git a/.gitignore b/.gitignore index 3843a9b..cba945a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ commons-io-2.1-src.tar.gz /commons-io-2.4-src.tar.gz /commons-io-2.5-src.tar.gz /commons-io-2.6-src.tar.gz +/commons-io-2.7-src.tar.gz diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 4897652..f74c907 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,18 +1,20 @@ Name: apache-commons-io Epoch: 1 -Version: 2.6 -Release: 6%{?dist} +Version: 2.7 +Release: 1%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 -URL: http://commons.apache.org/io +URL: https://commons.apache.org/io BuildArch: noarch -Source0: http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz +Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz BuildRequires: maven-local-openjdk8 -BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) +BuildRequires: mvn(org.mockito:mockito-core) %description Commons-IO contains utility classes, stream implementations, @@ -28,10 +30,24 @@ sed -i 's/\r//' *.txt # Run tests in multiple reusable forks to improve test performance sed -i -e /reuseForks/d -e /forkCount/d pom.xml +sed -i '//d' pom.xml %mvn_file : commons-io %{name} %mvn_alias : org.apache.commons: +%pom_remove_dep org.junit-pioneer:junit-pioneer +%pom_remove_dep com.google.jimfs:jimfs + +# Test depends on com.google.jimfs:jimfs +rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java + +# This annotation is part of junitpioneer +sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java +sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java + +rm src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java +rm src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java + %build %mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.io @@ -43,6 +59,9 @@ sed -i -e /reuseForks/d -e /forkCount/d pom.xml %doc RELEASE-NOTES.txt %changelog +* Wed Jul 29 2020 Marian Koncek - 1:2.7-1 +- Update to upstream version 2.7 + * Sat Jan 25 2020 Mikolaj Izdebski - 1:2.6-6 - Build with OpenJDK 8 diff --git a/sources b/sources index 3dc47d1..3a7630f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.6-src.tar.gz) = fa22397631283726b85276d8fb367e10755351ef2c4c87c5519485ba68ab26ffa2bfe36ee686f53f82e3aeb9e423618d89ad97b02fb272a549e0d4769928e764 +SHA512 (commons-io-2.7-src.tar.gz) = 9898b59c2aebdc1c51a7f8aca14e3080a08b766404c2aff091b204ba55870129dd95643665a6d46e15e94cd9d4cb280488ab0a28a1c51f43d132f839b742edc3