Compare commits

..

No commits in common. 'cs10' and 'c9' have entirely different histories.
cs10 ... c9

2
.gitignore vendored

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

@ -1 +1 @@
4bb029255fe18c17a08a1491a0c8f56e4c4dc5b4 SOURCES/maven-common-artifact-filters-3.3.2-source-release.zip
43d9649e2321e979e91ee9faef5945367bf8aea0 SOURCES/maven-common-artifact-filters-3.1.1-source-release.zip

@ -0,0 +1,42 @@
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" );
}
}
}

@ -1,20 +1,21 @@
%bcond_with bootstrap
Name: maven-common-artifact-filters
Version: 3.3.2
Release: 7%{?dist}
Version: 3.1.1
Release: 5%{?dist}
Summary: Maven Common Artifact Filters
License: Apache-2.0
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
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)
@ -41,12 +42,12 @@ This package contains javadoc for %{name}.
%prep
%setup -q
%patch0 -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
# 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
%build
%mvn_build
@ -61,48 +62,15 @@ rm src/test/java/org/apache/maven/shared/artifact/filter/PatternFilterPerfTest.j
%license LICENSE NOTICE
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.3.2-7
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.3.2-6
- Bump release for Aug 2024 java mass rebuild
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.3.2-5
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.2-2
- Rebuild
* Thu Aug 17 2023 Marian Koncek <mkoncek@redhat.com> - 3.3.2-1
- Update to upstream version 3.3.2
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* 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
* 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 Jan 06 2022 Marian Koncek <mkoncek@redhat.com> - 3.2.0-1
- Update to upstream version 3.2.0
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-4
- Rebuild to workaround DistroBaker issue
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* 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

Loading…
Cancel
Save