5 changed files with 158 additions and 60 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/maven-common-artifact-filters-3.1.1-source-release.zip
+SOURCES/maven-common-artifact-filters-3.2.0-source-release.zip
--- a/.maven-common-artifact-filters.metadata
+++ b/.maven-common-artifact-filters.metadata
@ -1 +1 @@
-43d9649e2321e979e91ee9faef5945367bf8aea0 SOURCES/maven-common-artifact-filters-3.1.1-source-release.zip
+ff263a4996f12aad55d706a3e2bc3c06d0ca40a9 SOURCES/maven-common-artifact-filters-3.2.0-source-release.zip
--- a/SOURCES/0001-Pass-empty-list-instead-of-null-to-DependencyFilter..patch
+++ b/SOURCES/0001-Pass-empty-list-instead-of-null-to-DependencyFilter..patch
@ -0,0 +1,127 @@
+From d4ed5c2c1e5965ea092a9cf9a02cd60aa4c22f07 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Thu, 6 Jan 2022 10:43:03 +0100
+Subject: [PATCH] Pass empty list instead of null to DependencyFilter.accept
+
+---
+ .../EclipseAetherFilterTransformerTest.java   | 42 +++++++++----------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java b/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java
+index d3b661c..3a33368 100644
+--- a/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java
+++ b/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java
+@@ -62,13 +62,13 @@ public class EclipseAetherFilterTransformerTest
+ 
+         AndDependencyFilter dependencyFilter = (AndDependencyFilter) filter.transform( transformer );
+         
+-        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), Collections.<DependencyNode>emptyList() ) );
+ 
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), Collections.<DependencyNode>emptyList() ) );
+ 
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), Collections.<DependencyNode>emptyList() ) );
+ 
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "test" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "test" ), Collections.<DependencyNode>emptyList() ) );
+     }
+ 
+     @Test
+@@ -78,9 +78,9 @@ public class EclipseAetherFilterTransformerTest
+ 
+         ExclusionsDependencyFilter dependencyFilter = (ExclusionsDependencyFilter) filter.transform( transformer );
+ 
+-        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), Collections.<DependencyNode>emptyList() ) );
+ 
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), Collections.<DependencyNode>emptyList() ) );
+     }
+ 
+     @Test
+@@ -91,11 +91,11 @@ public class EclipseAetherFilterTransformerTest
+ 
+         OrDependencyFilter dependencyFilter = (OrDependencyFilter) filter.transform( transformer );
+ 
+-        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), Collections.<DependencyNode>emptyList() ) );
+ 
+-        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) );
+        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), Collections.<DependencyNode>emptyList() ) );
+         
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), Collections.<DependencyNode>emptyList() ) );
+     }
+ 
+     @Test
+@@ -105,11 +105,11 @@ public class EclipseAetherFilterTransformerTest
+ 
+         ScopeDependencyFilter dependencyFilter = (ScopeDependencyFilter) filter.transform( transformer );
+         
+-        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
+        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), Collections.<DependencyNode>emptyList() ) );
+ 
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), Collections.<DependencyNode>emptyList() ) );
+ 
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), Collections.<DependencyNode>emptyList() ) );
+     }
+ 
+     @Test
+@@ -121,9 +121,9 @@ public class EclipseAetherFilterTransformerTest
+         PatternExclusionsDependencyFilter dependencyFilter =
+             (PatternExclusionsDependencyFilter) filter.transform( transformer );
+ 
+-        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
+        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), Collections.<DependencyNode>emptyList() ) );
+ 
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), Collections.<DependencyNode>emptyList() ) );
+     }
+ 
+     @Test
+@@ -135,9 +135,9 @@ public class EclipseAetherFilterTransformerTest
+         PatternInclusionsDependencyFilter dependencyFilter =
+             (PatternInclusionsDependencyFilter) filter.transform( transformer );
+ 
+-        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
+        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), Collections.<DependencyNode>emptyList() ) );
+ 
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), Collections.<DependencyNode>emptyList() ) );
+     }
+ 
+     @Test
+@@ -148,11 +148,11 @@ public class EclipseAetherFilterTransformerTest
+ 
+         DependencyFilter dependencyFilter = filter.transform( transformer );
+ 
+-        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v:c:*", "runtime" ), null ) );
+        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v:c:*", "runtime" ), Collections.<DependencyNode>emptyList() ) );
+ 
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), Collections.<DependencyNode>emptyList() ) );
+         
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v:c:*", "runtime" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v:c:*", "runtime" ), Collections.<DependencyNode>emptyList() ) );
+     }
+ 
+     @Test
+@@ -169,9 +169,9 @@ public class EclipseAetherFilterTransformerTest
+         
+         DependencyFilter dependencyFilter = snapshotFilter.transform( transformer );
+         
+-        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:1.0-SNAPSHOT", "compile" ), null ) );
+        assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:1.0-SNAPSHOT", "compile" ), Collections.<DependencyNode>emptyList() ) );
+ 
+-        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:1.0", "compile" ), null ) );
+        assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:1.0", "compile" ), Collections.<DependencyNode>emptyList() ) );
+     }
+     
+     private DependencyNode newDependencyNode( String string, String scope )
+-- 
+2.31.1
+
--- a/SOURCES/0001-Remove-Maven-3.0-specific-code.patch
+++ b/SOURCES/0001-Remove-Maven-3.0-specific-code.patch
@ -1,42 +0,0 @@
-From 2adad987d89aa6ab94fa1351756730c3c09dd35d Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Mon, 12 Oct 2015 13:03:40 +0200
-Subject: [PATCH] Remove Maven 3.0 specific code
-
---
- .../collection/ArtifactTransitivityFilter.java     | 32 +---------------------
- 1 file changed, 1 insertion(+), 31 deletions(-)
-
-diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
-index 6001854..406c956 100644
--- a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
-+++ b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
-@@ -105,27 +105,7 @@ public class ArtifactTransitivityFilter
-             }
-             else
-             {
-                try
-                {
-                    @SuppressWarnings( "unchecked" ) List<org.sonatype.aether.graph.Dependency> dependencies =
-                        (List<org.sonatype.aether.graph.Dependency>) Invoker.invoke( resolutionResult,
-                                                                                     "getDependencies" );
-
-                    for ( org.sonatype.aether.graph.Dependency dependency : dependencies )
-                    {
-                        Artifact mavenArtifact = 
-                                        (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
-                                                                    org.sonatype.aether.artifact.Artifact.class,
-                                                                    dependency.getArtifact() );
-
-                        transitiveArtifacts.add( mavenArtifact.getDependencyConflictId() );
-                    }
-                }
-                catch ( IllegalAccessException | InvocationTargetException | NoSuchMethodException e )
-                {
-                    // don't want to pollute method signature with ReflectionExceptions
-                    throw new RuntimeException( e.getMessage(), e );
-                }
-+                throw new RuntimeException( "Maven older than 3.1 are not supported" );
-             }
-         }
-     }
--- a/SPECS/maven-common-artifact-filters.spec
+++ b/SPECS/maven-common-artifact-filters.spec
@ -1,21 +1,22 @@
 %bcond_with bootstrap

 Name:           maven-common-artifact-filters
-Version:        3.1.1
-Release:        5%{?dist}
+Version:        3.2.0
+Release:        6%{?dist}
 Summary:        Maven Common Artifact Filters
 License:        ASL 2.0
 URL:            https://maven.apache.org/shared/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch

 Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip

-Patch0:         0001-Remove-Maven-3.0-specific-code.patch
+Patch1:         0001-Pass-empty-list-instead-of-null-to-DependencyFilter..patch

-BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+BuildRequires:  maven-local
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
@ -42,12 +43,13 @@ This package contains javadoc for %{name}.

 %prep
 %setup -q
-%patch0 -p1
+%patch1 -p1

-# We don't want to support legacy Maven versions (older than 3.1)
-%pom_remove_dep org.sonatype.sisu:
-%pom_remove_dep org.sonatype.aether:
-find -name SonatypeAether\*.java -delete
+# Test depends on jmh performance benchmarking library
+%pom_remove_dep org.openjdk.jmh:jmh-core
+%pom_remove_dep org.openjdk.jmh:jmh-generator-annprocess
+
+rm src/test/java/org/apache/maven/shared/artifact/filter/PatternFilterPerfTest.java

 %build
 %mvn_build
@ -62,15 +64,26 @@ find -name SonatypeAether\*.java -delete
 %license LICENSE NOTICE

 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.1-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Thu Feb 08 2024 Marián Konček <mkoncek@redhat.com> - 3.2.0-6
+- Rebuild to regenerate auto-requires
+
+* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-5
+- Rebuild to regenerate auto-requires
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.2.0-3
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-4
- Rebuild to workaround DistroBaker issue
+* Thu Jan 06 2022 Marian Koncek <mkoncek@redhat.com> - 3.2.0-1
+- Update to upstream version 3.2.0

-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-3
- Bootstrap Maven for CentOS Stream 9
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-2
 - Bootstrap build