Update to upstream version 1.14

.gitignore

@@ -14,3 +14,4 @@ commons-compress-1.0-src.tar.gz
 /commons-compress-1.11-src.tar.gz
 /commons-compress-1.12-src.tar.gz
 /commons-compress-1.13-src.tar.gz
+/commons-compress-1.14-src.tar.gz

0001-Remove-Brotli-compressor.patch

@@ -0,0 +1,39 @@
+From 93736372a66cc6d35c2b848fd710b39b40293f0d Mon Sep 17 00:00:00 2001
+From: Roman Vais <rvais@redhat.com>
+Date: Wed, 14 Jun 2017 14:00:28 +0200
+Subject: [PATCH] Remove Brotli compressor
+
+---
+ .../commons/compress/compressors/CompressorStreamFactory.java    | 9 ---------
+ 1 file changed, 9 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 4bd22aa..238257d 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;
+ import java.util.SortedMap;
+ import java.util.TreeMap;
+ 
+-import org.apache.commons.compress.compressors.brotli.BrotliCompressorInputStream;
+-import org.apache.commons.compress.compressors.brotli.BrotliUtils;
+ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
+ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
+ import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream;
+@@ -540,13 +538,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+             if (BZIP2.equalsIgnoreCase(name)) {
+                 return new BZip2CompressorInputStream(in, actualDecompressConcatenated);
+             }
+-            
+-            if (BROTLI.equalsIgnoreCase(name)) {
+-                if (!BrotliUtils.isBrotliCompressionAvailable()) {
+-                    throw new CompressorException("Brotli compression is not available.");
+-                }
+-                return new BrotliCompressorInputStream(in);
+-            }
+ 
+             if (XZ.equalsIgnoreCase(name)) {
+                 if (!XZUtils.isXZCompressionAvailable()) {
+-- 
+2.7.4
+

apache-commons-compress.spec

@@ -2,8 +2,8 @@
 %global short_name      commons-%{base_name}
 
 Name:           apache-%{short_name}
-Version:        1.13
+Version:        1.14
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Java API for working with compressed files and archivers
 License:        ASL 2.0
 URL:            http://commons.apache.org/proper/commons-compress/
@@ -11,6 +11,8 @@ BuildArch:      noarch
 
 Source0:        http://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz
 
+Patch0: 0001-Remove-Brotli-compressor.patch
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
@@ -22,7 +24,8 @@ BuildRequires:  mvn(org.tukaani:xz)
 %description
 The Apache Commons Compress library defines an API for working with
 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}
@@ -32,13 +35,16 @@ This package provides %{summary}.
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
+%patch0 -p1
+%pom_remove_dep org.brotli:dec
 
-%pom_remove_plugin :jacoco-maven-plugin
+rm -r src/main/java/org/apache/commons/compress/compressors/brotli
+rm -r src/test/java/org/apache/commons/compress/compressors/brotli
 
 %build
 %mvn_file  : %{short_name} %{name}
 %mvn_alias : commons:
-%mvn_build -- -P!jacoco
+%mvn_build
 
 %install
 %mvn_install
@@ -50,6 +56,10 @@ This package provides %{summary}.
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jun 14 2017 Roman Vais <rvais@redhat.com> - 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 <releng@fedoraproject.org> - 1.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (commons-compress-1.13-src.tar.gz) = e8945023180a357d4f0c7c179ad51a957e7723496cdd34d76e70f2921ba734e17d1bb722d1369a6a36ebdda3888750f53cf5c3f15c7bd50809c2844a18544e06
+SHA512 (commons-compress-1.14-src.tar.gz) = dfe7160500aaaa96ac280710fcf9c99067d4df774fe3cb829d9c6a52d7ca6ff59499ed5bb666b143d8fe122db6c71293f29744556db6aaa896ea5fb00bab9b17