Revert "Upgrade apache-commons-compress to 1.26.1 and address depende…

SPECS-EXTENDED/apache-commons-codec/apache-commons-codec.spec

@@ -24,7 +24,7 @@ Distribution:   Azure Linux
 %bcond_with tests
 Name:           apache-commons-codec
 Version:        1.15
-Release:        3%{?dist}
+Release:        2%{?dist}
 Summary:        Apache Commons Codec Package
 License:        Apache-2.0
 Group:          Development/Libraries/Java
@@ -104,10 +104,6 @@ install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
-# Remove LICENSE from javadoc directory to avoid duplicate license warning
-mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO .
-mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE .
-
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %pre javadoc
@@ -117,18 +113,13 @@ fi
 
 %files -f .mfiles
 %license LICENSE.txt
-%license ADDITIONAL_LICENSE_INFO
 %doc RELEASE-NOTES.txt
 %{_javadir}/%{name}.jar
 
 %files javadoc
 %{_javadocdir}/%{name}
 
 %changelog
-* Fri Nov 28 2025 Durga Jagadeesh Palli <v-dpalli@microsoft.com> - 1.15-3
-- Address build error caused by license warning
-- License verified
-
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.15-2
 - Converting the 'Release' tag to the '[number].[distribution]' format.
 

SPECS-EXTENDED/apache-commons-compress/0001-Remove-Brotli-compressor.patch

@@ -1,17 +1,17 @@
-From 0b10cc9b13fa782b7e318fdbc0d8c790a472f722 Mon Sep 17 00:00:00 2001
+From bba585e9e4fdfc67de3b53b58b8d60923e1ccd0c Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Mon, 12 Feb 2018 10:53:48 +0100
-Subject: [PATCH 1/3] Remove Brotli compressor
+Subject: [PATCH 1/2] Remove Brotli compressor
 
 ---
- .../compress/compressors/CompressorStreamFactory.java      | 7 +------
+ .../commons/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 ca0973095..2406d5a44 100644
+index d730b9d..ab178a9 100644
 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
 +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
-@@ -30,8 +30,6 @@
+@@ -31,8 +31,6 @@ import java.util.Set;
  import java.util.SortedMap;
  import java.util.TreeMap;
 
@@ -20,7 +20,7 @@ index ca0973095..2406d5a44 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;
-@@ -545,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina
+@@ -586,10 +584,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
 
              if (BROTLI.equalsIgnoreCase(name)) {
@@ -33,5 +33,5 @@ index ca0973095..2406d5a44 100644
 
              if (XZ.equalsIgnoreCase(name)) {
 -- 
-2.43.0
+2.14.3
 

SPECS-EXTENDED/apache-commons-compress/0002-Remove-ZSTD-compressor.patch

@@ -1,58 +1,38 @@
-From d80b7b190c789c33a15f56613a21c44827a63c75 Mon Sep 17 00:00:00 2001
+From bab91e014f73296a8ac9a3aef2aaa324a85e9b96 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Mon, 12 Feb 2018 10:59:55 +0100
-Subject: [PATCH 2/3] Remove ZSTD compressor
+Subject: [PATCH 2/2] Remove ZSTD compressor
 
 ---
- .../compressors/CompressorStreamFactory.java  | 22 ++++---------------
- 1 file changed, 4 insertions(+), 18 deletions(-)
+ .../compress/compressors/CompressorStreamFactory.java      | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 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 2406d5a44..9ed40a3d7 100644
+index ab178a9..3817704 100644
 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
 +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
-@@ -53,9 +53,6 @@
+@@ -54,9 +54,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;
 -import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
 -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.Sets;
-
-@@ -280,10 +277,6 @@ static String detect(final InputStream inputStream, final Set<String> compressor
+ import org.apache.commons.compress.utils.Lists;
+ import org.apache.commons.compress.utils.ServiceLoaderIterator;
+@@ -516,10 +513,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              return LZ4_FRAMED;
          }
 
--        if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) {
+-        if (ZstdUtils.matches(signature, signatureLength)) {
 -            return ZSTANDARD;
 -        }
 -
          throw new CompressorException("No Compressor found for the stream signature.");
      }
-
-@@ -405,10 +398,6 @@ public static String getZ() {
-         return Z;
-     }
-
--    public static String getZstandard() {
--        return ZSTANDARD;
--    }
--
-     static void putAll(final Set<String> names, final CompressorStreamProvider provider, final TreeMap<String, CompressorStreamProvider> map) {
-         names.forEach(name -> map.put(toKey(name), provider));
-     }
-@@ -513,7 +502,7 @@ public CompressorInputStream createCompressorInputStream(final InputStream in, f
-      * Creates a compressor input stream from a compressor name and an input stream.
-      *
-      * @param name of the compressor, i.e. {@value #GZIP}, {@value #BZIP2}, {@value #XZ}, {@value #LZMA}, {@value #PACK200}, {@value #SNAPPY_RAW},
--     *             {@value #SNAPPY_FRAMED}, {@value #Z}, {@value #LZ4_BLOCK}, {@value #LZ4_FRAMED}, {@value #ZSTANDARD}, {@value #DEFLATE64} or
-+     *             {@value #SNAPPY_FRAMED}, {@value #Z}, {@value #LZ4_BLOCK}, {@value #LZ4_FRAMED}, {@value #DEFLATE64} or
-      *             {@value #DEFLATE}
-      * @param in   the input stream
-      * @return compressor input stream
-@@ -554,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina
+     /**
+@@ -595,10 +588,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
 
              if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -64,16 +44,7 @@ index 2406d5a44..9ed40a3d7 100644
              }
 
              if (LZMA.equalsIgnoreCase(name)) {
-@@ -614,7 +600,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina
-      * Creates a compressor output stream from a compressor name and an output stream.
-      *
-      * @param name the compressor name, i.e. {@value #GZIP}, {@value #BZIP2}, {@value #XZ}, {@value #PACK200}, {@value #SNAPPY_FRAMED}, {@value #LZ4_BLOCK},
--     *             {@value #LZ4_FRAMED}, {@value #ZSTANDARD} or {@value #DEFLATE}
-+     *             {@value #LZ4_FRAMED} or {@value #DEFLATE}
-      * @param out  the output stream
-      * @return the compressor output stream
-      * @throws CompressorException      if the archiver name is not known
-@@ -665,7 +651,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, fi
+@@ -714,7 +704,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
 
              if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -83,5 +54,5 @@ index 2406d5a44..9ed40a3d7 100644
          } catch (final IOException e) {
              throw new CompressorException("Could not create CompressorOutputStream", e);
 -- 
-2.43.0
+2.14.3
 

SPECS-EXTENDED/apache-commons-compress/apache-commons-compress-build.xml

@@ -9,24 +9,27 @@
   <property file="build.properties"/>
 
   <property name="build.name" value="commons-compress"/>
-  <property name="build.version" value="1.26.1"/>
+  <property name="build.version" value="1.19"/>
   <property name="build.finalName" value="${build.name}-${build.version}"/>
   <property name="build.dir" value="target"/>
   <property name="build.javadocDir" value="${build.dir}/site/apidocs"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
-  <property name="build.srcDir" value="src/main/java"/>
-  <property name="build.resourceDir" value="src/main/resources"/>
+  <property name="build.srcDir.0" value="src/main/java"/>
+  <property name="build.resourceDir.0" value="src/main/resources"/>
+  <property name="build.resourceDir.1" value="."/>
+
+  <property name="commons.javadoc.javaee.link" value="http://docs.oracle.com/javaee/6/api/"/>
+  <property name="commons.javadoc.java.link" value="http://docs.oracle.com/javase/7/docs/api/"/>
 
   <property name="commons.osgi.dynamicImport" value=""/>
   <property name="commons.osgi.excludeDependencies" value="true"/>
-  <property name="commons.osgi.export" value="org.apache.commons.compress.archivers.ar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.arj;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.cpio;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.dump;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.examples;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.jar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.sevenz;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.tar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.zip;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers;version=&quot;${build.version}&quot;,org.apache.commons.compress.changes;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.bzip2;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.deflate64;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.deflate;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.gzip;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lz4;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lz77support;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lzma;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lzw;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.snappy;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.xz;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.z;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors;version=&quot;${build.version}&quot;,org.apache.commons.compress.java.util.jar;version=&quot;${build.version}&quot;,org.apache.commons.compress.parallel;version=&quot;${build.version}&quot;,org.apache.commons.compress.utils;version=&quot;${build.version}&quot;,org.apache.commons.compress;version=&quot;${build.version}&quot;"/>
-  <property name="commons.osgi.import" value="javax.crypto.spec;resolution:=optional,javax.crypto;resolution:=optional,org.apache.commons.codec.digest;resolution:=optional,org.apache.commons.codec;resolution:=optional,org.apache.commons.io.build;resolution:=optional,org.apache.commons.io.file.attribute;resolution:=optional,org.apache.commons.io.input;resolution:=optional,org.apache.commons.io.output;resolution:=optional,org.apache.commons.io;resolution:=optional,org.apache.commons.lang3.reflect;resolution:=optional,org.apache.commons.lang3;resolution:=optional,org.objectweb.asm;resolution:=optional,org.tukaani.xz;resolution:=optional"/>
+  <property name="commons.osgi.export" value="org.apache.commons.compress;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.ar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.arj;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.cpio;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.dump;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.examples;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.jar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.sevenz;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.tar;version=&quot;${build.version}&quot;,org.apache.commons.compress.archivers.zip;version=&quot;${build.version}&quot;,org.apache.commons.compress.changes;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.bzip2;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.deflate;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.deflate64;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.gzip;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lz4;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lz77support;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lzma;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.lzw;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.pack200;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.snappy;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.xz;version=&quot;${build.version}&quot;,org.apache.commons.compress.compressors.z;version=&quot;${build.version}&quot;,org.apache.commons.compress.parallel;version=&quot;${build.version}&quot;,org.apache.commons.compress.utils;version=&quot;${build.version}&quot;"/>
+  <property name="commons.osgi.import" value="org.tukaani.xz;resolution:=optional,javax.crypto;resolution:=optional,javax.crypto.spec;resolution:=optional,org.brotli.dec;resolution:=optional,com.github.luben.zstd;resolution:=optional"/>
   <property name="commons.osgi.private" value=""/>
   <property name="commons.osgi.symbolicName" value="org.apache.commons.compress"/>
 
-  <property name="compiler.release" value="8"/>
-  <property name="compiler.source" value="1.${compiler.release}"/>
-  <property name="compiler.target" value="${compiler.source}"/>
+  <property name="compiler.source" value="1.7"/>
+  <property name="compiler.target" value="1.7"/>
 
 
   <!-- ====================================================================== -->
@@ -61,15 +64,21 @@
            optimize="false" 
            deprecation="true" 
            target="${compiler.target}" 
-           release="${compiler.release}"
            verbose="false" 
            fork="false" 
            source="${compiler.source}">
       <src>
-        <pathelement location="${build.srcDir}"/>
+        <pathelement location="${build.srcDir.0}"/>
       </src>
       <classpath refid="build.classpath"/>
     </javac>
+    <mkdir dir="${build.outputDir}/META-INF"/>
+    <copy todir="${build.outputDir}/META-INF">
+      <fileset dir="${build.resourceDir.1}">
+        <include name="NOTICE.txt"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </copy>
   </target>
 
   <!-- ====================================================================== -->
@@ -78,7 +87,7 @@
 
   <target name="javadoc" description="Generates the Javadoc of the application">
     <mkdir dir="${build.javadocDir}"/>
-    <javadoc sourcepath="${build.srcDir}" 
+    <javadoc sourcepath="${build.srcDir.0}" 
              packagenames="*" 
              destdir="${build.javadocDir}" 
              access="protected" 
@@ -99,6 +108,8 @@
              linksource="true" 
              breakiterator="false">
       <classpath refid="build.classpath"/>
+      <!-- <link href="${commons.javadoc.java.link}"/> -->
+      <!-- <link href="${commons.javadoc.javaee.link}"/> -->
     </javadoc>
   </target>
 
@@ -113,12 +124,10 @@
          basedir="${build.outputDir}" 
          excludes="**/package.html">
       <manifest>
-        <attribute name="Automatic-Module-Name" value="${commons.osgi.symbolicName}"/>
         <attribute name="Bundle-SymbolicName" value="${commons.osgi.symbolicName}"/>
         <attribute name="Bundle-Version" value="${build.version}"/>
-        <attribute name="Export-Package" value="${commons.osgi.export}"/>
-        <attribute name="Import-Package" value="${commons.osgi.import}"/>
-        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
+		<attribute name="Export-Package" value="${commons.osgi.export}"/>
+		<attribute name="Import-Package" value="${commons.osgi.import}"/>
       </manifest>
     </jar>
   </target>