From cfab120ce5756ab35cfbc2c213eb75d4ee7bdd66 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 14:00:18 +0000 Subject: [PATCH] import CS maven-dependency-tree-3.2.1-17.module_el9+1171+eb38a622 --- .gitignore | 2 +- .maven-dependency-tree.metadata | 2 +- SPECS/maven-dependency-tree.spec | 126 ++++++++++++++++++++++++------- 3 files changed, 102 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 58d0591..3abfa00 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/maven-dependency-tree-3.0.1-source-release.zip +SOURCES/maven-dependency-tree-3.2.1-source-release.zip diff --git a/.maven-dependency-tree.metadata b/.maven-dependency-tree.metadata index 8cd40f0..1a4ef25 100644 --- a/.maven-dependency-tree.metadata +++ b/.maven-dependency-tree.metadata @@ -1 +1 @@ -a70e2240a7abf6be044788704140c0ac61238c23 SOURCES/maven-dependency-tree-3.0.1-source-release.zip +8e75d946d6d8fd85b07eda9e27db77b31bf75ff4 SOURCES/maven-dependency-tree-3.2.1-source-release.zip diff --git a/SPECS/maven-dependency-tree.spec b/SPECS/maven-dependency-tree.spec index 529006d..eb0e007 100644 --- a/SPECS/maven-dependency-tree.spec +++ b/SPECS/maven-dependency-tree.spec @@ -1,65 +1,139 @@ -Name: maven-dependency-tree -Version: 3.0.1 -Release: 3%{?dist} -Summary: Maven dependency tree artifact -License: ASL 2.0 -Url: http://maven.apache.org/ -Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip -BuildArch: noarch +%bcond_with bootstrap +Name: maven-dependency-tree +Version: 3.2.1 +Release: 17%{?dist} +Summary: Maven dependency tree artifact +License: Apache-2.0 +URL: https://maven.apache.org/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip + +%if %{with bootstrap} +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.plugins:maven-invoker-plugin) -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) - -Provides: maven-shared-dependency-tree = %{version}-%{release} +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.slf4j:slf4j-api) +%endif %description Apache Maven dependency tree artifact. Originally part of maven-shared. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -This package contains javadoc for %{name}. +API documentation for %{name}. %prep -%setup -q - -find -name Maven3DependencyGraphBuilder.java -delete -%pom_remove_dep org.sonatype.aether: +%autosetup -p1 %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 %files -f .mfiles -%doc LICENSE NOTICE +%license LICENSE NOTICE %files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE +%license LICENSE NOTICE %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.2.1-15 +- Update javapackages test plan to f42 + +* Wed Jul 24 2024 Mikolaj Izdebski - 3.2.1-8 +- Install license files in licensedir instead of docdir + +* Thu Jul 18 2024 Fedora Release Engineering - 3.2.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.2.1-6 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 3.2.1-5 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 3.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.2.1-2 +- Rebuild + +* Tue Aug 15 2023 Marian Koncek - 3.2.1-1 +- Update to upstream version 3.2.1 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Apr 24 2022 Mikolaj Izdebski - 3.1.0-1 +- Update to upstream version 3.1.0 + +* Sat Feb 05 2022 Jiri Vanek - 3.0.1-10 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.0.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.0.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.0.1-7 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 3.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.0.1-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 3.0.1-3 - Mass rebuild for javapackages-tools 201902 +* Thu Jul 25 2019 Fedora Release Engineering - 3.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 3.0.1-2 - Mass rebuild for javapackages-tools 201901 * Tue May 14 2019 Mikolaj Izdebski - 3.0.1-1 - Update to upstream version 3.0.1 +* Fri Feb 01 2019 Fedora Release Engineering - 3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild