diff --git a/apache-commons-io.spec b/apache-commons-io.spec index a8a9abccc099db78de0f1f4ad0aff4af73b55aca..98892abebe7a66e0fd4f5dab8bc32fe83148c8f1 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,9 +1,9 @@ -%define anolis_release 2 +%define anolis_release 1 %bcond_without bootstrap Name: apache-commons-io Epoch: 1 -Version: 2.11.0 +Version: 2.16.1 Release: %{anolis_release}%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 @@ -16,13 +16,14 @@ Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{v %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local 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) %endif - +BuildRequires: jurand %description Commons-IO contains utility classes, stream implementations, file filters, and endian classes. It is a library of utilities @@ -42,16 +43,11 @@ sed -i '//d' pom.xml %mvn_alias : org.apache.commons: %pom_remove_dep org.junit-pioneer:junit-pioneer -%pom_remove_dep :junit-bom -%pom_remove_dep com.google.jimfs:jimfs +%java_remove_annotations src -s -n DefaultLocale -# Test depends on com.google.jimfs:jimfs +%pom_remove_dep 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 - %build # See "-DcommonsIoVersion" in maven-surefire for the tested version @@ -61,7 +57,7 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea # * PathUtilsDeleteFileTest.testSetReadOnlyFileDirectory1FileSize1:134 » FileSystem # * PathUtilsDeleteTest.testDeleteDirectory1FileSize0OverrideReadonly:97->testDeleteDirectory1FileSize0:69 » FileSystem # * PathUtilsDeleteTest.testDeleteDirectory1FileSize1OverrideReadOnly:145->testDeleteDirectory1FileSize1:117 » FileSystem - +# moditect profile generates module-info.class %mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io %install @@ -72,6 +68,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Tue Jul 8 2025 lzq11122 - 1:2.16.1-1 +- Update to 2.16.1 to fix CVE-2024-47554 + * Tue Apr 15 2025 Xiaoping Liu - 1:2.11.0-2 - remove BuildRequires openjdk8 diff --git a/commons-io-2.11.0-src.tar.gz b/commons-io-2.11.0-src.tar.gz deleted file mode 100644 index be52cc4e2be7baf0e1b3a68eed41771b23391552..0000000000000000000000000000000000000000 Binary files a/commons-io-2.11.0-src.tar.gz and /dev/null differ diff --git a/commons-io-2.16.1-src.tar.gz b/commons-io-2.16.1-src.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e759b8b309047e6ada1897f84b061e0fc0e9606e Binary files /dev/null and b/commons-io-2.16.1-src.tar.gz differ