From 5780bcab55f93653bab036154843d9e75751f5d6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/10] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index fc69f80..fc88a69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed0bba77bb2265c46d02c0047c1436ce maven-dependency-tree-3.0-source-release.zip +SHA512 (maven-dependency-tree-3.0-source-release.zip) = 62b7cd590854316d7b12ef64e90a1dad5cf4e2c001b8bda88a43c7f66a2451e7e17cf8a3946191bc06f62bbf1f133bdb495dc4ef73893f70aaae40114c1a656b From ed10b3305625d0a8442f7d25486f92fb3f67a379 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:48:42 +0000 Subject: [PATCH 02/10] Remove Group tags --- maven-dependency-tree.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec index d8676bb..7ddfd20 100644 --- a/maven-dependency-tree.spec +++ b/maven-dependency-tree.spec @@ -3,7 +3,6 @@ Name: maven-dependency-tree Version: 3.0 Release: 5%{?dist} Summary: Maven dependency tree artifact -Group: Development/Libraries 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 @@ -27,7 +26,6 @@ Obsoletes: maven-shared-dependency-tree < %{version}-%{release} Apache Maven dependency tree artifact. Originally part of maven-shared. %package javadoc -Group: Documentation Summary: Javadoc for %{name} %description javadoc From 579a7e2e5f3c68960f7b69ef3c63c3062318d6ba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:39 +0000 Subject: [PATCH 03/10] Remove Obsoletes --- maven-dependency-tree.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec index 7ddfd20..f766092 100644 --- a/maven-dependency-tree.spec +++ b/maven-dependency-tree.spec @@ -20,7 +20,6 @@ BuildRequires: mvn(org.eclipse.aether:aether-api) BuildRequires: mvn(org.eclipse.aether:aether-util) Provides: maven-shared-dependency-tree = %{version}-%{release} -Obsoletes: maven-shared-dependency-tree < %{version}-%{release} %description Apache Maven dependency tree artifact. Originally part of maven-shared. From e8016f78f2ad181221559d0758e92bff4ca819e7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 May 2019 08:08:34 +0200 Subject: [PATCH 04/10] Update to upstream version 3.0.1 --- .gitignore | 1 + maven-dependency-tree.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4e48b10..2fd1dcd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /maven-dependency-tree-2.1-source-release.zip /maven-dependency-tree-2.2-source-release.zip /maven-dependency-tree-3.0-source-release.zip +/maven-dependency-tree-3.0.1-source-release.zip diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec index f766092..2b4c814 100644 --- a/maven-dependency-tree.spec +++ b/maven-dependency-tree.spec @@ -1,7 +1,6 @@ - Name: maven-dependency-tree -Version: 3.0 -Release: 5%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: Maven dependency tree artifact License: ASL 2.0 Url: http://maven.apache.org/ @@ -53,6 +52,9 @@ find -name Maven3DependencyGraphBuilder.java -delete %doc LICENSE NOTICE %changelog +* Tue May 14 2019 Mikolaj Izdebski - 3.0.1-1 +- Update to upstream version 3.0.1 + * Thu Feb 08 2018 Fedora Release Engineering - 3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index fc88a69..fe853fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-dependency-tree-3.0-source-release.zip) = 62b7cd590854316d7b12ef64e90a1dad5cf4e2c001b8bda88a43c7f66a2451e7e17cf8a3946191bc06f62bbf1f133bdb495dc4ef73893f70aaae40114c1a656b +SHA512 (maven-dependency-tree-3.0.1-source-release.zip) = 277968a7e7bcf1cc2384fb39cc225c3c9f1c2996a780b77e97dca6ac16bc4185dbf5079fb9c15d89d0435c0ba0749582628c95787d8a50a4e883e90841e1a67d From a43fe64a738baeb7dd66e87fc22bed4e9cc823c6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:03 +0200 Subject: [PATCH 05/10] Mass rebuild for javapackages-tools 201901 --- maven-dependency-tree.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec index 2b4c814..5594f81 100644 --- a/maven-dependency-tree.spec +++ b/maven-dependency-tree.spec @@ -1,6 +1,6 @@ Name: maven-dependency-tree Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven dependency tree artifact License: ASL 2.0 Url: http://maven.apache.org/ @@ -52,6 +52,9 @@ find -name Maven3DependencyGraphBuilder.java -delete %doc LICENSE NOTICE %changelog +* 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 From 9aedd891f7994952f11a4868ff9a9b3449cfcf11 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 Aug 2019 05:04:37 +0200 Subject: [PATCH 06/10] Remove unneeded %dir --- maven-dependency-tree.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec index 5594f81..91ff233 100644 --- a/maven-dependency-tree.spec +++ b/maven-dependency-tree.spec @@ -45,7 +45,6 @@ find -name Maven3DependencyGraphBuilder.java -delete %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} %doc LICENSE NOTICE %files javadoc -f .mfiles-javadoc From df885ca98ce437ae8c708b069a0c1cab44e7856c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 07/10] Mass rebuild for javapackages-tools 201902 --- maven-dependency-tree.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec index 91ff233..529006d 100644 --- a/maven-dependency-tree.spec +++ b/maven-dependency-tree.spec @@ -1,6 +1,6 @@ Name: maven-dependency-tree Version: 3.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven dependency tree artifact License: ASL 2.0 Url: http://maven.apache.org/ @@ -51,6 +51,9 @@ find -name Maven3DependencyGraphBuilder.java -delete %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.0.1-3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 3.0.1-2 - Mass rebuild for javapackages-tools 201901 From 4800828513b14e5742fbcbef32cfd60eb4e79ad1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Apr 2020 05:51:36 +0200 Subject: [PATCH 08/10] Drop dependency maven-invoker-plugin --- maven-dependency-tree.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec index 529006d..f66ae3d 100644 --- a/maven-dependency-tree.spec +++ b/maven-dependency-tree.spec @@ -10,7 +10,6 @@ BuildArch: noarch 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(org.apache.maven.shared:maven-shared-components:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) @@ -36,6 +35,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) From 1d2beb8f4f71850c76147d4928894d58a3514b8d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 09/10] Conditionalize buildrequires in bootstrap mode --- maven-dependency-tree.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec index f66ae3d..be1e493 100644 --- a/maven-dependency-tree.spec +++ b/maven-dependency-tree.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-dependency-tree Version: 3.0.1 Release: 3%{?dist} @@ -8,6 +10,9 @@ 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.shared:maven-plugin-testing-harness) @@ -16,6 +21,7 @@ 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} From 8fdc59e22ebe45fbfcc1664c019e2ebcf7b0c82e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 10/10] Turn off bootstrap mode by default --- maven-dependency-tree.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec index be1e493..4ab20b8 100644 --- a/maven-dependency-tree.spec +++ b/maven-dependency-tree.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-dependency-tree Version: 3.0.1