diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 979291e..19fa2fa 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,8 @@ /commons-compress-1.17-src.tar.gz /commons-compress-1.18-src.tar.gz /commons-compress-1.19-src.tar.gz +/commons-compress-1.20-src.tar.gz +/commons-compress-1.21-src.tar.gz +/commons-compress-1.25.0-src.tar.gz +/commons-compress-1.27.1-src.tar.gz +/commons-compress-1.28.0-src.tar.gz diff --git a/0001-Remove-Brotli-compressor.patch b/0001-Remove-Brotli-compressor.patch index cb3ba5b..d1fe4be 100644 --- a/0001-Remove-Brotli-compressor.patch +++ b/0001-Remove-Brotli-compressor.patch @@ -1,17 +1,18 @@ -From d42b16c3334229cc400c6713f3bd11c8df2f70cc Mon Sep 17 00:00:00 2001 +From 1bc6dadd753f5eb66401d8455bcfc108f1919f74 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 12 Feb 2018 10:53:48 +0100 Subject: [PATCH 1/3] Remove Brotli compressor +Forwarded: not-needed --- .../compress/compressors/CompressorStreamFactory.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index d730b9d..ab178a9 100644 +index 9287d99..9a65ba4 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -@@ -31,8 +31,6 @@ import java.util.Set; +@@ -29,8 +29,6 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; @@ -20,9 +21,9 @@ index d730b9d..ab178a9 100644 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream; -@@ -586,10 +584,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -603,10 +601,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + return new BZip2CompressorInputStream(in, actualDecompressConcatenated); } - if (BROTLI.equalsIgnoreCase(name)) { - if (!BrotliUtils.isBrotliCompressionAvailable()) { - throw new CompressorException("Brotli compression is not available." + YOU_NEED_BROTLI_DEC); @@ -30,8 +31,8 @@ index d730b9d..ab178a9 100644 - return new BrotliCompressorInputStream(in); + throw new CompressorException("Brotli compression is not available in this build."); } - if (XZ.equalsIgnoreCase(name)) { + if (!XZUtils.isXZCompressionAvailable()) { -- -2.20.1 +2.51.0 diff --git a/0002-Remove-ZSTD-compressor.patch b/0002-Remove-ZSTD-compressor.patch index de8a529..1399f22 100644 --- a/0002-Remove-ZSTD-compressor.patch +++ b/0002-Remove-ZSTD-compressor.patch @@ -1,17 +1,66 @@ -From 575df9b9a3519186ac801a10eb632e0e2b4ddbdd Mon Sep 17 00:00:00 2001 +From 9a061729b0976ded5a739765fcdfc0c56bd0e46c Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 12 Feb 2018 10:59:55 +0100 Subject: [PATCH 2/3] Remove ZSTD compressor +Forwarded: not-needed --- - .../compressors/CompressorStreamFactory.java | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) + .../archivers/zip/ZipArchiveInputStream.java | 3 +-- + .../commons/compress/archivers/zip/ZipFile.java | 7 ++++--- + .../compressors/CompressorStreamFactory.java | 13 ++----------- + 3 files changed, 7 insertions(+), 16 deletions(-) +diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java +index b6d0abc..81ddb57 100644 +--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java ++++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java +@@ -45,7 +45,6 @@ import org.apache.commons.compress.archivers.ArchiveEntry; + import org.apache.commons.compress.archivers.ArchiveInputStream; + import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; + import org.apache.commons.compress.compressors.deflate64.Deflate64CompressorInputStream; +-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream; + import org.apache.commons.compress.utils.ArchiveUtils; + import org.apache.commons.compress.utils.IOUtils; + import org.apache.commons.compress.utils.InputStreamStatistics; +@@ -522,7 +521,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream i + * @since 1.28.0 + */ + protected InputStream createZstdInputStream(final InputStream in) throws IOException { +- return new ZstdCompressorInputStream(in); ++ throw new IOException("Zstandard compression is not available in this build."); + } + + /** +diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java +index 264ac33..5535a57 100644 +--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java ++++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java +@@ -55,7 +55,6 @@ import org.apache.commons.compress.archivers.EntryStreamOffsets; + import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; + import org.apache.commons.compress.compressors.deflate64.Deflate64CompressorInputStream; + import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; +-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream; + import org.apache.commons.compress.utils.BoundedArchiveInputStream; + import org.apache.commons.compress.utils.BoundedSeekableByteChannelInputStream; + import org.apache.commons.compress.utils.IOUtils; +@@ -1083,8 +1082,10 @@ public class ZipFile implements Closeable { + */ + @SuppressWarnings("resource") + InputStream createZstdInputStream(final InputStream in) throws IOException { +- // This method is the only location that references ZstdCompressorInputStream directly to avoid requiring the JAR for all use cases. +- return zstdInputStreamFactory != null ? zstdInputStreamFactory.apply(in) : new ZstdCompressorInputStream(in); ++ if (zstdInputStreamFactory == null) { ++ throw new IOException("Zstandard compression is not available in this build."); ++ } ++ return zstdInputStreamFactory.apply(in); + } + + private void fillNameMap() { diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index ab178a9..3817704 100644 +index 9a65ba4..a7432c4 100644 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -@@ -54,9 +54,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; +@@ -52,9 +52,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream; import org.apache.commons.compress.compressors.xz.XZUtils; import org.apache.commons.compress.compressors.z.ZCompressorInputStream; @@ -19,22 +68,21 @@ index ab178a9..3817704 100644 -import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream; -import org.apache.commons.compress.compressors.zstandard.ZstdUtils; import org.apache.commons.compress.utils.IOUtils; - import org.apache.commons.compress.utils.Lists; - import org.apache.commons.compress.utils.ServiceLoaderIterator; -@@ -516,10 +513,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + import org.apache.commons.compress.utils.Sets; + import org.apache.commons.lang3.StringUtils; +@@ -266,9 +263,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + if (compressorNames.contains(LZ4_FRAMED) && FramedLZ4CompressorInputStream.matches(signature, signatureLength)) { return LZ4_FRAMED; } - -- if (ZstdUtils.matches(signature, signatureLength)) { +- if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) { - return ZSTANDARD; - } -- throw new CompressorException("No Compressor found for the stream signature."); } - /** -@@ -595,10 +588,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { - } +@@ -616,10 +610,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + // @formatter:on + } if (ZSTANDARD.equalsIgnoreCase(name)) { - if (!ZstdUtils.isZstdCompressionAvailable()) { - throw new CompressorException("Zstandard compression is not available." + YOU_NEED_ZSTD_JNI); @@ -42,17 +90,17 @@ index ab178a9..3817704 100644 - return new ZstdCompressorInputStream(in); + throw new CompressorException("Zstandard compression is not available in this build."); } - if (LZMA.equalsIgnoreCase(name)) { -@@ -714,7 +704,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + if (!LZMAUtils.isLZMACompressionAvailable()) { +@@ -707,7 +698,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + return new FramedLZ4CompressorOutputStream(out); } - if (ZSTANDARD.equalsIgnoreCase(name)) { - return new ZstdCompressorOutputStream(out); + throw new CompressorException("Zstandard compression is not available in this build."); } } catch (final IOException e) { - throw new CompressorException("Could not create CompressorOutputStream", e); + throw new CompressorException("Could not create CompressorOutputStream.", e); -- -2.20.1 +2.51.0 diff --git a/0003-Avoid-use-of-internal-Mockito-API.patch b/0003-Avoid-use-of-internal-Mockito-API.patch deleted file mode 100644 index a63e95f..0000000 --- a/0003-Avoid-use-of-internal-Mockito-API.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4dd332d8f82d3a5f0ac6654d2c1733e44da6ddbd Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Thu, 7 Feb 2019 14:57:25 +0000 -Subject: [PATCH 3/3] Avoid use of internal Mockito API - ---- - .../compress/utils/FixedLengthBlockOutputStreamTest.java | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java -index cfda61b..e94ccee 100644 ---- a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java -+++ b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java -@@ -39,7 +39,6 @@ import java.nio.file.Path; - import java.util.concurrent.atomic.AtomicBoolean; - import org.hamcrest.core.IsInstanceOf; - import org.junit.Test; --import org.mockito.internal.matchers.GreaterOrEqual; - - public class FixedLengthBlockOutputStreamTest { - -@@ -294,7 +293,6 @@ public class FixedLengthBlockOutputStreamTest { - - private static void assertContainsAtOffset(String msg, byte[] expected, int offset, - byte[] actual) { -- assertThat(actual.length, new GreaterOrEqual<>(offset + expected.length)); - for (int i = 0; i < expected.length; i++) { - assertEquals(String.format("%s ([%d])", msg, i), expected[i], actual[i + offset]); - } --- -2.20.1 - diff --git a/0003-Remove-Pack200-compressor.patch b/0003-Remove-Pack200-compressor.patch new file mode 100644 index 0000000..9acdeb8 --- /dev/null +++ b/0003-Remove-Pack200-compressor.patch @@ -0,0 +1,54 @@ +From f5e9621355abba25bf18afb50c75045322617e78 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Mon, 11 Mar 2024 12:16:28 +0100 +Subject: [PATCH 3/3] Remove Pack200 compressor + +Forwarded: not-needed +--- + .../compress/compressors/CompressorStreamFactory.java | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +index a7432c4..3d405e7 100644 +--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java ++++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java +@@ -43,8 +43,6 @@ import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStre + import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream; + import org.apache.commons.compress.compressors.lzma.LZMACompressorOutputStream; + import org.apache.commons.compress.compressors.lzma.LZMAUtils; +-import org.apache.commons.compress.compressors.pack200.Pack200CompressorInputStream; +-import org.apache.commons.compress.compressors.pack200.Pack200CompressorOutputStream; + import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream; + import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream; + import org.apache.commons.compress.compressors.snappy.SnappyCompressorInputStream; +@@ -242,9 +240,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + if (compressorNames.contains(GZIP) && GzipCompressorInputStream.matches(signature, signatureLength)) { + return GZIP; + } +- if (compressorNames.contains(PACK200) && Pack200CompressorInputStream.matches(signature, signatureLength)) { +- return PACK200; +- } + if (compressorNames.contains(SNAPPY_FRAMED) && FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { + return SNAPPY_FRAMED; + } +@@ -619,7 +614,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + return LZMACompressorInputStream.builder().setInputStream(in).setMemoryLimitKiB(memoryLimitInKb).get(); + } + if (PACK200.equalsIgnoreCase(name)) { +- return new Pack200CompressorInputStream(in); ++ throw new CompressorException("Pack200 compression is not available in this build."); + } + if (SNAPPY_RAW.equalsIgnoreCase(name)) { + return new SnappyCompressorInputStream(in); +@@ -680,7 +675,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { + return new XZCompressorOutputStream(out); + } + if (PACK200.equalsIgnoreCase(name)) { +- return new Pack200CompressorOutputStream(out); ++ throw new CompressorException("Pack200 compression is not available in this build."); + } + if (LZMA.equalsIgnoreCase(name)) { + return new LZMACompressorOutputStream(out); +-- +2.51.0 + diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 6ad63b8..e170941 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,28 +1,36 @@ -%global base_name compress -%global short_name commons-%{base_name} +%bcond_with bootstrap -Name: apache-%{short_name} -Version: 1.19 -Release: 1%{?dist} +Name: apache-commons-compress +Version: 1.28.0 +Release: %autorelease Summary: Java API for working with compressed files and archivers -License: ASL 2.0 -URL: http://commons.apache.org/proper/commons-compress/ +License: Apache-2.0 +URL: https://commons.apache.org/proper/commons-compress/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: http://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz +Source0: https://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz -Patch0: 0001-Remove-Brotli-compressor.patch -Patch1: 0002-Remove-ZSTD-compressor.patch -Patch2: 0003-Avoid-use-of-internal-Mockito-API.patch +Patch: 0001-Remove-Brotli-compressor.patch +Patch: 0002-Remove-ZSTD-compressor.patch +Patch: 0003-Remove-Pack200-compressor.patch -BuildRequires: maven-local -BuildRequires: mvn(junit:junit) +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local-openjdk25 +BuildRequires: mvn(commons-codec:commons-codec) +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.mockito:mockito-core) -BuildRequires: mvn(org.osgi:osgi.core) +BuildRequires: mvn(org.osgi:org.osgi.core) +BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.tukaani:xz) +%endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.27.1-7 %description The Apache Commons Compress library defines an API for working with @@ -30,224 +38,44 @@ ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200 and bzip2 files. In version 1.14 read-only support for Brotli decompression has been added, but it has been removed form this package. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -This package provides %{summary}. - %prep -%setup -q -n %{short_name}-%{version}-src +%autosetup -p1 -C # Unavailable Google Brotli library (org.brotli.dec) -%patch0 -p1 %pom_remove_dep org.brotli:dec rm -r src/{main,test}/java/org/apache/commons/compress/compressors/brotli # Unavailable ZSTD JNI library -%patch1 -p1 %pom_remove_dep :zstd-jni rm -r src/{main,test}/java/org/apache/commons/compress/compressors/zstandard -rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java -# Avoid using internal Mockito APIs -%patch2 -p1 +# Remove support for pack200 which depends on ancient asm:asm:3.2 +rm -r src/{main,test}/java/org/apache/commons/compress/harmony +rm -r src/main/java/org/apache/commons/compress/compressors/pack200 +rm src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java +rm -r src/test/java/org/apache/commons/compress/compressors/pack200 +rm src/test/java/org/apache/commons/compress/java/util/jar/Pack200Test.java # remove osgi tests, we don't have deps for them %pom_remove_dep org.ops4j.pax.exam:::test %pom_remove_dep :org.apache.felix.framework::test %pom_remove_dep :javax.inject::test -%pom_remove_dep :slf4j-api::test -rm src/test/java/org/apache/commons/compress/OsgiITest.java -# use osgi-core instead of felix-osgi-core -%pom_change_dep :org.osgi.core org.osgi:osgi.core - -# Remove test that requires powermock -%pom_remove_dep org.powermock: -%pom_add_dep org.mockito:mockito-core::test -rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java +# Not packaged +%pom_remove_dep com.github.marschall:memoryfilesystem +rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java %build -%mvn_file : %{short_name} %{name} +%mvn_file : commons-compress %{name} %mvn_alias : commons: -%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.compress +# XXX failing tests, need to investigate why +%mvn_build -j -f -- -Dcommons.osgi.symbolicName=org.apache.commons.compress %install %mvn_install %files -f .mfiles -%doc LICENSE.txt NOTICE.txt - -%files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %changelog -* Fri Oct 04 2019 Fabio Valentini - 1.19-1 -- Update to version 1.19. - -* Wed Sep 18 2019 Fabio Valentini - 1.18-7 -- Migrate from the obsolete felix-osgi-core to osgi-core. - -* Wed Aug 14 2019 Fabio Valentini - 1.18-6 -- Remove build-dependency on powermock - -* Wed Jul 24 2019 Fedora Release Engineering - 1.18-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Feb 14 2019 Mat Booth - 1.18-4 -- Rebuild to regenerate OSGi metadata - -* Thu Feb 07 2019 Mat Booth - 1.18-3 -- Fix test suite build against Mockito 2.x - -* Thu Jan 31 2019 Fedora Release Engineering - 1.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Oct 05 2018 Marian Koncek - 1.18-1 -- Update to upstream version 1.18 -- Resolves: CVE-2018-11771 - -* Thu Jul 12 2018 Fedora Release Engineering - 1.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 05 2018 Michael Simacek - 1.17-1 -- Update to upstream version 1.17 - -* Mon Feb 12 2018 Michael Simacek - 1.16.1-1 -- Update to upstream version 1.16.1 - -* Wed Feb 07 2018 Fedora Release Engineering - 1.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Oct 22 2017 Michael Simacek - 1.15-1 -- Update to upstream version 1.15 - -* Wed Jul 26 2017 Fedora Release Engineering - 1.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jun 14 2017 Roman Vais - 1.14-1 -- Update to upstream version 1.14 -- Remove Brotli support, it is not packaged for fedora - -* Fri Feb 10 2017 Fedora Release Engineering - 1.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jan 02 2017 Michael Simacek - 1.13-1 -- Update to upstream version 1.13 - -* Wed Jun 22 2016 Michael Simacek - 1.12-1 -- Update to upstream version 1.12 - -* Mon May 02 2016 Michael Simacek - 1.11-1 -- Update to upstream version 1.11 - -* Wed Feb 03 2016 Fedora Release Engineering - 1.10-0.3.svn1684406 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.10-0.2.svn1684406 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Jun 9 2015 Mikolaj Izdebski - 1.10-0.1.svn1684406 -- Update to latest upstream snapshot - -* Tue Oct 14 2014 Mikolaj Izdebski - 1.9-2 -- Remove legacy Obsoletes/Provides for jakarta-commons - -* Mon Oct 13 2014 Mikolaj Izdebski - 1.9-1 -- Update to upstream version 1.9 - -* Wed Jul 30 2014 Mikolaj Izdebski - 1.8.1-3 -- Fix build-requires on apache-commons-parent - -* Sat Jun 07 2014 Fedora Release Engineering - 1.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Mikolaj Izdebski - 1.8.1-1 -- Update to upstream version 1.8.1 - -* Mon Mar 17 2014 Mikolaj Izdebski - 1.8-2 -- Remove dependency on maven-scm-publish-plugin - -* Fri Mar 14 2014 Mikolaj Izdebski - 1.8-1 -- Update to upstream version 1.8 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1.7-2 -- Use Requires: java-headless rebuild (#1067528) - -* Mon Jan 20 2014 Mikolaj Izdebski - 1.7-1 -- Update to upstream version 1.7 - -* Tue Oct 29 2013 Mikolaj Izdebski - 1.6-1 -- Update to upstream version 1.6 - -* Sat Aug 03 2013 Fedora Release Engineering - 1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Mar 14 2013 Mikolaj Izdebski - 1.5-1 -- Update to upstream version 1.5 - -* Wed Feb 13 2013 Fedora Release Engineering - 1.4.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.4.1-5 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Wed Jan 9 2013 Mikolaj Izdebski - 1.4.1-4 -- Bump release tag - -* Tue Jan 8 2013 Mikolaj Izdebski - 1.4.1-3 -- Build with xmvn -- Update to current packaging guidelines - -* Wed Jul 18 2012 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu May 24 2012 Sandro Mathys - 1.4.1-1 -- Updated to 1.4.1 -- Fixes CVE-2012-2098 Low: Denial of Service - -* Fri Apr 27 2012 Sandro Mathys - 1.4-1 -- Updated to 1.4 - -* Thu Jan 12 2012 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 01 2011 Sandro Mathys - 1.3-1 -- Updated to 1.3 - -* Thu Aug 04 2011 Sandro Mathys - 1.2-2 -- Fixing mistake where different versions of the spec file got mixed up - -* Thu Aug 04 2011 Sandro Mathys - 1.2-1 -- Updated to 1.2 - -* Sat Apr 16 2011 Chris Spike 1.1-1 -- Updated to 1.1 -- Adapted to current java packaging guidelines - -* Mon Feb 07 2011 Fedora Release Engineering - 1.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jul 11 2010 Sandro Mathys - 1.0-8 -- Fixed the Maven depmap line by replacing org.apache.maven by org.apache.commons - -* Mon May 31 2010 Sandro Mathys - 1.0-7 -- Fixed regression with missing Provides/Obsoletes for javadocs -- Fixed changelog format - -* Sun May 23 2010 Sandro Mathys - 1.0-6 -- Fixed Maven depmap to use commons-compress - -* Thu May 13 2010 Sandro Mathys - 1.0-5 -- Added missing Provides/Obsoletes for javadocs - -* Mon May 10 2010 Sandro Mathys - 1.0-4 -- Cleared some problems after the review - -* Thu May 06 2010 Sandro Mathys - 1.0-3 -- Now using maven2 (mvn-jpp) instead of directly calling javac & co - -* Tue May 04 2010 Sandro Mathys - 1.0-2 -- Renamed from jakarta-commons-compress +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..2b0d5f7 --- /dev/null +++ b/changelog @@ -0,0 +1,250 @@ +* Wed Jul 24 2024 Mikolaj Izdebski - 1.25.0-7 +- Install license files in licensedir instead of docdir + +* Wed Jul 17 2024 Fedora Release Engineering - 1.25.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.25.0-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.25.0-4 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1.25.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.25.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 08 2023 Marian Koncek - 1.25.0-1 +- Update to upstream version 1.25.0 + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.21-7 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 1.21-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.21-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.21-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.21-3 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Aug 06 2021 Marian Koncek - 1.21-1 +- Update to upstream version 1.21 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.20-6 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 16 2020 Mat Booth - 1.20-3 +- Ensure Java 8 level bytecode when built on Java 11 + +* Fri Jul 10 2020 Jiri Vanek - 1.20-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Mar 04 2020 Marian Koncek - 1.20-1 +- Update to upstream version 1.20 + +* Mon Mar 02 2020 Fabio Valentini - 1.20-1 +- Update to version 1.20. + +* Tue Jan 28 2020 Fedora Release Engineering - 1.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.19-2 +- Mass rebuild for javapackages-tools 201902 + +* Fri Oct 04 2019 Fabio Valentini - 1.19-1 +- Update to version 1.19. + +* Wed Sep 18 2019 Fabio Valentini - 1.18-7 +- Migrate from the obsolete felix-osgi-core to osgi-core. + +* Mon Sep 02 2019 Marian Koncek - 1.19-1 +- Update to upstream version 1.19 + +* Wed Aug 14 2019 Fabio Valentini - 1.18-6 +- Remove build-dependency on powermock + +* Wed Jul 24 2019 Fedora Release Engineering - 1.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.18-6 +- Mass rebuild for javapackages-tools 201901 + +* Fri May 24 2019 Mikolaj Izdebski - 1.18-5 +- Remove build-dependency on powermock + +* Thu Feb 14 2019 Mat Booth - 1.18-4 +- Rebuild to regenerate OSGi metadata + +* Thu Feb 07 2019 Mat Booth - 1.18-3 +- Fix test suite build against Mockito 2.x + +* Thu Jan 31 2019 Fedora Release Engineering - 1.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Oct 05 2018 Marian Koncek - 1.18-1 +- Update to upstream version 1.18 +- Resolves: CVE-2018-11771 + +* Thu Jul 12 2018 Fedora Release Engineering - 1.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 05 2018 Michael Simacek - 1.17-1 +- Update to upstream version 1.17 + +* Mon Feb 12 2018 Michael Simacek - 1.16.1-1 +- Update to upstream version 1.16.1 + +* Wed Feb 07 2018 Fedora Release Engineering - 1.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Oct 22 2017 Michael Simacek - 1.15-1 +- Update to upstream version 1.15 + +* Wed Jul 26 2017 Fedora Release Engineering - 1.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jun 14 2017 Roman Vais - 1.14-1 +- Update to upstream version 1.14 +- Remove Brotli support, it is not packaged for fedora + +* Fri Feb 10 2017 Fedora Release Engineering - 1.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 02 2017 Michael Simacek - 1.13-1 +- Update to upstream version 1.13 + +* Wed Jun 22 2016 Michael Simacek - 1.12-1 +- Update to upstream version 1.12 + +* Mon May 02 2016 Michael Simacek - 1.11-1 +- Update to upstream version 1.11 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.10-0.3.svn1684406 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.10-0.2.svn1684406 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 9 2015 Mikolaj Izdebski - 1.10-0.1.svn1684406 +- Update to latest upstream snapshot + +* Tue Oct 14 2014 Mikolaj Izdebski - 1.9-2 +- Remove legacy Obsoletes/Provides for jakarta-commons + +* Mon Oct 13 2014 Mikolaj Izdebski - 1.9-1 +- Update to upstream version 1.9 + +* Wed Jul 30 2014 Mikolaj Izdebski - 1.8.1-3 +- Fix build-requires on apache-commons-parent + +* Sat Jun 07 2014 Fedora Release Engineering - 1.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 23 2014 Mikolaj Izdebski - 1.8.1-1 +- Update to upstream version 1.8.1 + +* Mon Mar 17 2014 Mikolaj Izdebski - 1.8-2 +- Remove dependency on maven-scm-publish-plugin + +* Fri Mar 14 2014 Mikolaj Izdebski - 1.8-1 +- Update to upstream version 1.8 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.7-2 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Jan 20 2014 Mikolaj Izdebski - 1.7-1 +- Update to upstream version 1.7 + +* Tue Oct 29 2013 Mikolaj Izdebski - 1.6-1 +- Update to upstream version 1.6 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Mar 14 2013 Mikolaj Izdebski - 1.5-1 +- Update to upstream version 1.5 + +* Wed Feb 13 2013 Fedora Release Engineering - 1.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.4.1-5 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jan 9 2013 Mikolaj Izdebski - 1.4.1-4 +- Bump release tag + +* Tue Jan 8 2013 Mikolaj Izdebski - 1.4.1-3 +- Build with xmvn +- Update to current packaging guidelines + +* Wed Jul 18 2012 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu May 24 2012 Sandro Mathys - 1.4.1-1 +- Updated to 1.4.1 +- Fixes CVE-2012-2098 Low: Denial of Service + +* Fri Apr 27 2012 Sandro Mathys - 1.4-1 +- Updated to 1.4 + +* Thu Jan 12 2012 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 01 2011 Sandro Mathys - 1.3-1 +- Updated to 1.3 + +* Thu Aug 04 2011 Sandro Mathys - 1.2-2 +- Fixing mistake where different versions of the spec file got mixed up + +* Thu Aug 04 2011 Sandro Mathys - 1.2-1 +- Updated to 1.2 + +* Sat Apr 16 2011 Chris Spike 1.1-1 +- Updated to 1.1 +- Adapted to current java packaging guidelines + +* Mon Feb 07 2011 Fedora Release Engineering - 1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Jul 11 2010 Sandro Mathys - 1.0-8 +- Fixed the Maven depmap line by replacing org.apache.maven by org.apache.commons + +* Mon May 31 2010 Sandro Mathys - 1.0-7 +- Fixed regression with missing Provides/Obsoletes for javadocs +- Fixed changelog format + +* Sun May 23 2010 Sandro Mathys - 1.0-6 +- Fixed Maven depmap to use commons-compress + +* Thu May 13 2010 Sandro Mathys - 1.0-5 +- Added missing Provides/Obsoletes for javadocs + +* Mon May 10 2010 Sandro Mathys - 1.0-4 +- Cleared some problems after the review + +* Thu May 06 2010 Sandro Mathys - 1.0-3 +- Now using maven2 (mvn-jpp) instead of directly calling javac & co + +* Tue May 04 2010 Sandro Mathys - 1.0-2 +- Renamed from jakarta-commons-compress diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..ae17c0c --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 +execute: + how: tmt diff --git a/sources b/sources index eed6188..ae715dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-compress-1.19-src.tar.gz) = 9c3c1152ea7419a2e5c398a1d9becfcb807708ed9dccda94e2c19666269d4d2d89c14fb329484a4668b002d3d2c02ca6cd3012b3144f7221c6969201a96c0c8f +SHA512 (commons-compress-1.28.0-src.tar.gz) = cd37f7d554dff9f1cf9c90e93a30b7b15ace002d69d317a63d575fd623b4e64dbd55fbf2876ecd5333cf96858a37458f55762e5505311a7a8063d0cc8cdc4120