From c0900661b289a3462cd3c3e19c2791ae01f04d48 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 8 Jun 2021 20:17:56 +0200 Subject: [PATCH] Bootstrap Maven as non-modular packages Resolves: rhbz#1951482 --- maven-dependency-tree.spec | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec index 9d5d44c..53cbf78 100644 --- a/maven-dependency-tree.spec +++ b/maven-dependency-tree.spec @@ -1,6 +1,12 @@ +# Workaround for rhbz#1969370: __bootstrap macro is not defined in +# CentOS Stream, See https://bugzilla.redhat.com/1969370 +%global __bootstrap ~bootstrap + +%bcond_without bootstrap + Name: maven-dependency-tree Version: 3.0.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Maven dependency tree artifact License: ASL 2.0 Url: http://maven.apache.org/ @@ -8,15 +14,18 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{v BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else 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(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.eclipse.aether:aether-api) BuildRequires: mvn(org.eclipse.aether:aether-util) +%endif Provides: maven-shared-dependency-tree = %{version}-%{release} @@ -36,6 +45,7 @@ find -name Maven3DependencyGraphBuilder.java -delete %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) @@ -45,15 +55,18 @@ find -name Maven3DependencyGraphBuilder.java -delete %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} %doc LICENSE NOTICE %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE %changelog -* Fri Apr 16 2021 Mohan Boddu - 3.0.1-7 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 3.0.1-8 +- Bootstrap Maven for CentOS Stream 9 + +* 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 @@ -67,9 +80,15 @@ find -name Maven3DependencyGraphBuilder.java -delete * 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