Update to upstream version 3.2.1

This commit is contained in:
Marian Koncek 2023-08-15 10:50:36 +02:00
parent f56cb26be6
commit dfc6f15a24
3 changed files with 12 additions and 17 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/maven-dependency-tree-3.0-source-release.zip
/maven-dependency-tree-3.0.1-source-release.zip
/maven-dependency-tree-3.1.0-source-release.zip
/maven-dependency-tree-3.2.1-source-release.zip

View File

@ -1,8 +1,8 @@
%bcond_with bootstrap
Name: maven-dependency-tree
Version: 3.1.0
Release: 4%{?dist}
Version: 3.2.1
Release: 1%{?dist}
Summary: Maven dependency tree artifact
License: Apache-2.0
URL: https://maven.apache.org/
@ -15,18 +15,15 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(org.apache.maven:maven-compat)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness)
BuildRequires: mvn(javax.inject:javax.inject)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.eclipse.aether:aether-api)
BuildRequires: mvn(org.eclipse.aether:aether-util)
BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin)
BuildRequires: mvn(org.slf4j:slf4j-api)
%endif
Provides: maven-shared-dependency-tree = %{version}-%{release}
%description
Apache Maven dependency tree artifact. Originally part of maven-shared.
@ -39,17 +36,11 @@ This package contains javadoc for %{name}.
%prep
%setup -q
rm -R src/main/java/org/apache/maven/shared/dependency/graph/internal/maven30
rm src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
rm src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyCollectorBuilder.java
%pom_remove_dep org.sonatype.aether:
%pom_remove_plugin :apache-rat-plugin
%pom_remove_plugin :maven-invoker-plugin
%build
# Incompatible version of jMock (Fedora has 2.x, upstream uses 1.x)
%mvn_build -f
%mvn_build
%install
%mvn_install
@ -61,6 +52,9 @@ rm src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3Depende
%doc LICENSE NOTICE
%changelog
* Tue Aug 15 2023 Marian Koncek <mkoncek@redhat.com> - 3.2.1-1
- Update to upstream version 3.2.1
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (maven-dependency-tree-3.1.0-source-release.zip) = a34df4748ed28dcf0224abd1ff7c2ebe228c90e95afa01b0a9590770392a9642c3b716cd09847c30f6a58492b5e08015f2ffa0e498f0351a85a97c6dc089e6c4
SHA512 (maven-dependency-tree-3.2.1-source-release.zip) = 72cd2b34a56e44ef04a9a73adf8f8ddddcbc1c8ab99ebcd68a865fcb7e55b494fa0b74a9b9363d42aa19e32ad9139d500c1897cbac14d0a5d1d079e7ccc43554