commit d0c577beb735689004ce499699899289fea42f63 Author: MSVSphere Packaging Team Date: Tue May 7 16:33:19 2024 +0300 import maven-common-artifact-filters-3.2.0-6.module_el8+931+be23202a diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f40e7ac --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-common-artifact-filters-3.2.0-source-release.zip diff --git a/.maven-common-artifact-filters.metadata b/.maven-common-artifact-filters.metadata new file mode 100644 index 0000000..8555983 --- /dev/null +++ b/.maven-common-artifact-filters.metadata @@ -0,0 +1 @@ +ff263a4996f12aad55d706a3e2bc3c06d0ca40a9 SOURCES/maven-common-artifact-filters-3.2.0-source-release.zip diff --git a/SOURCES/0001-Pass-empty-list-instead-of-null-to-DependencyFilter..patch b/SOURCES/0001-Pass-empty-list-instead-of-null-to-DependencyFilter..patch new file mode 100644 index 0000000..d5db80d --- /dev/null +++ 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 +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.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), Collections.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), Collections.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "test" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "test" ), Collections.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.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "compile" ), Collections.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.emptyList() ) ); + +- assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) ); ++ assertTrue( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), Collections.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), Collections.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.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "compile" ), Collections.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "test" ), Collections.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.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), Collections.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.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v", "runtime" ), Collections.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.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:v", "runtime" ), Collections.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v:c:*", "runtime" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "x:a:v:c:*", "runtime" ), Collections.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.emptyList() ) ); + +- assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:1.0", "compile" ), null ) ); ++ assertFalse( dependencyFilter.accept( newDependencyNode( "g:a:1.0", "compile" ), Collections.emptyList() ) ); + } + + private DependencyNode newDependencyNode( String string, String scope ) +-- +2.31.1 + diff --git a/SPECS/maven-common-artifact-filters.spec b/SPECS/maven-common-artifact-filters.spec new file mode 100644 index 0000000..7d9af3e --- /dev/null +++ b/SPECS/maven-common-artifact-filters.spec @@ -0,0 +1,201 @@ +%bcond_with bootstrap + +Name: maven-common-artifact-filters +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 + +Patch1: 0001-Pass-empty-list-instead-of-null-to-DependencyFilter..patch + +%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) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) +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 + +%description +A collection of ready-made filters to control inclusion/exclusion of artifacts +during dependency resolution. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q +%patch1 -p1 + +# 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 + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE + +%changelog +* Thu Feb 08 2024 Marián Konček - 3.2.0-6 +- Rebuild to regenerate auto-requires + +* Mon Feb 05 2024 Mikolaj Izdebski - 3.2.0-5 +- Rebuild to regenerate auto-requires + +* Thu Jul 21 2022 Fedora Release Engineering - 3.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 3.2.0-3 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jan 06 2022 Marian Koncek - 3.2.0-1 +- Update to upstream version 3.2.0 + +* Thu Jul 22 2021 Fedora Release Engineering - 3.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.1.1-2 +- Bootstrap build +- Non-bootstrap build + +* Fri May 14 2021 Mikolaj Izdebski - 3.1.1-1 +- Update to upstream version 3.1.1 + +* Sat Jan 30 2021 Fabio Valentini - 3.1.1-1 +- Update to version 3.1.1. + +* Tue Jan 26 2021 Fedora Release Engineering - 3.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.1.0-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu May 07 2020 Fabio Valentini - 3.1.0-1 +- Update to version 3.1.0. + +* Wed Jan 29 2020 Fedora Release Engineering - 3.0.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 3.1.0-2 +- Mass rebuild for javapackages-tools 201902 + +* Tue Aug 13 2019 Marian Koncek - 3.1.0-1 +- Update to upstream version 3.1.0 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 3.0.1-5 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 3.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 3.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Nov 02 2016 Michael Simacek - 3.0.1-1 +- Update to upstream version 3.0.1 + +* Thu Feb 04 2016 Fedora Release Engineering - 3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Dec 2 2015 Mikolaj Izdebski - 3.0.0-1 +- Update to upstream version 3.0.0 + +* Mon Oct 12 2015 Mikolaj Izdebski - 3.0-0.1.20151012svn1708080 +- Update to upstream 3.0 snapshot (svn revision 1708080) + +* Wed Jun 17 2015 Fedora Release Engineering - 1.4-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Feb 10 2015 gil cattaneo 1.4-15 +- introduce license macro + +* Sat Jun 07 2014 Fedora Release Engineering - 1.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.4-13 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Feb 19 2014 Mikolaj Izdebski - 1.4-12 +- Fix unowned directory + +* Thu Aug 29 2013 Mikolaj Izdebski - 1.4-11 +- Migrate from easymock 1 to easymock 3 +- Resolves: rhbz#1002476 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Apr 11 2013 Michal Srb - 1.4-9 +- Enable tests again, they don't cause any trouble anywhere + +* Thu Apr 11 2013 Michal Srb - 1.4-8 +- Run tests only in Fedora + +* Tue Feb 19 2013 Mikolaj Izdebski - 1.4-7 +- Build with xmvn +- Bring back BR on maven-shared + +* Mon Feb 18 2013 Tomas Radej - 1.4-6 +- Removed B/R on maven-shared (unnecessary + blocking maven-shared retirement) + +* Thu Feb 14 2013 Fedora Release Engineering - 1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.4-4 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Nov 22 2012 gil 1.4-3 +- resolves rhbz#879363 (NOTICE file is not installed with javadoc package) + +* Thu Jul 19 2012 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Feb 08 2012 gil cattaneo 1.4-1 +- initial rpm