.gitignore

@@ -1 +1 @@
-SOURCES/maven-common-artifact-filters-3.1.1-source-release.zip
+SOURCES/maven-common-artifact-filters-3.1.0-source-release.zip

.maven-common-artifact-filters.metadata

@@ -1 +1 @@
-43d9649e2321e979e91ee9faef5945367bf8aea0 SOURCES/maven-common-artifact-filters-3.1.1-source-release.zip
+d608aaf061769181f30a3fe02baa6ba81333afb3 SOURCES/maven-common-artifact-filters-3.1.0-source-release.zip

SOURCES/0001-Remove-Maven-3.0-specific-code.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] Remove Maven 3.0 specific code
  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
+index 7db1664..df749db 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
+@@ -116,37 +116,7 @@ public class ArtifactTransitivityFilter
              }
              else
              {
@@ -31,7 +31,17 @@ index 6001854..406c956 100644
 -                        transitiveArtifacts.add( mavenArtifact.getDependencyConflictId() );
 -                    }
 -                }
--                catch ( IllegalAccessException | InvocationTargetException | NoSuchMethodException e )
+-                catch ( IllegalAccessException e )
+-                {
+-                    // don't want to pollute method signature with ReflectionExceptions
+-                    throw new RuntimeException( e.getMessage(), e );
+-                }
+-                catch ( InvocationTargetException e )
+-                {
+-                    // don't want to pollute method signature with ReflectionExceptions
+-                    throw new RuntimeException( e.getMessage(), e );
+-                }
+-                catch ( NoSuchMethodException e )
 -                {
 -                    // don't want to pollute method signature with ReflectionExceptions
 -                    throw new RuntimeException( e.getMessage(), e );
@@ -40,3 +50,6 @@ index 6001854..406c956 100644
              }
          }
      }
+-- 
+2.7.4
+

SPECS/maven-common-artifact-filters.spec

@@ -1,22 +1,16 @@
-%bcond_with bootstrap
-
 Name:           maven-common-artifact-filters
-Version:        3.1.1
-Release:        5%{?dist}
+Version:        3.1.0
+Release:        2%{?dist}
 Summary:        Maven Common Artifact Filters
 License:        ASL 2.0
-URL:            https://maven.apache.org/shared/
+URL:            http://maven.apache.org/shared/
 BuildArch:      noarch
 
-Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 Patch0:         0001-Remove-Maven-3.0-specific-code.patch
 
 BuildRequires:  maven-local
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
-BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-core)
@@ -27,8 +21,7 @@ BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-api)
 BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-util)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
-BuildRequires:  mvn(org.mockito:mockito-core)
-%endif
+BuildRequires:  mvn(org.easymock:easymock)
 
 %description
 A collection of ready-made filters to control inclusion/exclusion of artifacts
@@ -62,40 +55,8 @@ 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
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-4
-- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-3
-- Bootstrap Maven for CentOS Stream 9
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-2
-- Bootstrap build
-- Non-bootstrap build
-
-* Fri May 14 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-1
-- Update to upstream version 3.1.1
-
-* Sat Jan 30 2021 Fabio Valentini <decathorpe@gmail.com> - 3.1.1-1
-- Update to version 3.1.1.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.1.0-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu May 07 2020 Fabio Valentini <decathorpe@gmail.com> - 3.1.0-1
-- Update to version 3.1.0.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Tue May 07 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.1.0-2
+- Rebuilt for MSVSphere 8.9
 
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-2
 - Mass rebuild for javapackages-tools 201902
@@ -103,18 +64,9 @@ find -name SonatypeAether\*.java -delete
 * Tue Aug 13 2019 Marian Koncek <mkoncek@redhat.com> - 3.1.0-1
 - Update to upstream version 3.1.0
 
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-5
 - Mass rebuild for javapackages-tools 201901
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild