From cba8cc036240e2141aa43c537281963b5cfd032c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:02 +0200 Subject: [PATCH 1/9] Mass rebuild for javapackages-tools 201901 --- maven-dependency-analyzer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-dependency-analyzer.spec b/maven-dependency-analyzer.spec index ba01f59..ecfad16 100644 --- a/maven-dependency-analyzer.spec +++ b/maven-dependency-analyzer.spec @@ -1,6 +1,6 @@ Name: maven-dependency-analyzer Version: 1.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven dependency analyzer License: ASL 2.0 URL: http://maven.apache.org/shared/maven-dependency-analyzer/ @@ -55,6 +55,9 @@ Summary: API documentation for %{name} %doc LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.8-3 +- Mass rebuild for javapackages-tools 201901 + * Thu Feb 08 2018 Fedora Release Engineering - 1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 49de86922929f8269a2f04bb1bed5d626f2f3e7e Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 4 Jun 2019 13:32:37 +0200 Subject: [PATCH 2/9] Update to upstream version 1.11.1 --- .gitignore | 1 + maven-dependency-analyzer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6452588..880bd17 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /maven-dependency-analyzer-1.6-source-release.zip /maven-dependency-analyzer-1.7-source-release.zip /maven-dependency-analyzer-1.8-source-release.zip +/maven-dependency-analyzer-1.11.1-source-release.zip diff --git a/maven-dependency-analyzer.spec b/maven-dependency-analyzer.spec index ecfad16..dfa33af 100644 --- a/maven-dependency-analyzer.spec +++ b/maven-dependency-analyzer.spec @@ -1,6 +1,6 @@ Name: maven-dependency-analyzer -Version: 1.8 -Release: 3%{?dist} +Version: 1.11.1 +Release: 1%{?dist} Summary: Maven dependency analyzer License: ASL 2.0 URL: http://maven.apache.org/shared/maven-dependency-analyzer/ @@ -55,6 +55,9 @@ Summary: API documentation for %{name} %doc LICENSE NOTICE %changelog +* Tue Jun 04 2019 Marian Koncek - 1.11.1-1 +- Update to upstream version 1.11.1 + * Fri May 24 2019 Mikolaj Izdebski - 1.8-3 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 33744f8..7cdc761 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-dependency-analyzer-1.8-source-release.zip) = 150dffddb28e5c0f1ef8b65be6ddfe3e024d28606fa34ff8a884982db7147b18ce890061256a45d4e0370928e0f58bf4c4861ea6483eb787e55fb08ea8ab5f56 +SHA512 (maven-dependency-analyzer-1.11.1-source-release.zip) = 7d8880bac7cfb5f9f01f0b82e6d1dc1b9a4e0f79e0c76f9d807182fcad5e3e8c57c0c019cb1177b87a1e85f92aff3770585422be691f5cfafb529e633af35600 From 5696e8b635b823b2bdac70d3b9f0835984341933 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 Aug 2019 05:04:37 +0200 Subject: [PATCH 3/9] Remove unneeded %dir --- maven-dependency-analyzer.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-dependency-analyzer.spec b/maven-dependency-analyzer.spec index dfa33af..ecd2286 100644 --- a/maven-dependency-analyzer.spec +++ b/maven-dependency-analyzer.spec @@ -48,7 +48,6 @@ Summary: API documentation for %{name} %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} %doc LICENSE NOTICE %files javadoc -f .mfiles-javadoc From 9e0fca5ddac3366f3e37c577b77c9f85e01fdf50 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 4/9] Mass rebuild for javapackages-tools 201902 --- maven-dependency-analyzer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-dependency-analyzer.spec b/maven-dependency-analyzer.spec index ecd2286..c536ecd 100644 --- a/maven-dependency-analyzer.spec +++ b/maven-dependency-analyzer.spec @@ -1,6 +1,6 @@ Name: maven-dependency-analyzer Version: 1.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven dependency analyzer License: ASL 2.0 URL: http://maven.apache.org/shared/maven-dependency-analyzer/ @@ -54,6 +54,9 @@ Summary: API documentation for %{name} %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.11.1-2 +- Mass rebuild for javapackages-tools 201902 + * Tue Jun 04 2019 Marian Koncek - 1.11.1-1 - Update to upstream version 1.11.1 From 0aad0a4444563d5aef6b2a9cef4ca06a1966f603 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 17 May 2020 09:17:27 +0200 Subject: [PATCH 5/9] Remove dependency on maven2 --- maven-dependency-analyzer.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/maven-dependency-analyzer.spec b/maven-dependency-analyzer.spec index c536ecd..12ae77f 100644 --- a/maven-dependency-analyzer.spec +++ b/maven-dependency-analyzer.spec @@ -9,11 +9,11 @@ BuildArch: noarch Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-model) -BuildRequires: mvn(org.apache.maven:maven-project) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) @@ -40,6 +40,8 @@ Summary: API documentation for %{name} # Fedora is org.jmock:jmock %pom_remove_dep jmock:jmock +%pom_change_dep :maven-project :maven-core + %build # org.jmock.core package is needed, we don't have it %mvn_build -f From 6b5cd64c66b2af9ec1b51e0b8272a7c1d3196132 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 25 Aug 2020 09:54:42 +0200 Subject: [PATCH 6/9] Update to upstream version 1.11.2 --- .gitignore | 1 + maven-dependency-analyzer.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 880bd17..13716b8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /maven-dependency-analyzer-1.7-source-release.zip /maven-dependency-analyzer-1.8-source-release.zip /maven-dependency-analyzer-1.11.1-source-release.zip +/maven-dependency-analyzer-1.11.2-source-release.zip diff --git a/maven-dependency-analyzer.spec b/maven-dependency-analyzer.spec index 12ae77f..43f8ddb 100644 --- a/maven-dependency-analyzer.spec +++ b/maven-dependency-analyzer.spec @@ -1,12 +1,12 @@ Name: maven-dependency-analyzer -Version: 1.11.1 -Release: 2%{?dist} +Version: 1.11.2 +Release: 1%{?dist} Summary: Maven dependency analyzer License: ASL 2.0 -URL: http://maven.apache.org/shared/maven-dependency-analyzer/ +URL: https://maven.apache.org/shared/maven-dependency-analyzer/ BuildArch: noarch -Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip +Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -56,6 +56,9 @@ Summary: API documentation for %{name} %doc LICENSE NOTICE %changelog +* Tue Aug 25 2020 Marian Koncek - 1.11.2-1 +- Update to upstream version 1.11.2 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.11.1-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 7cdc761..97973c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-dependency-analyzer-1.11.1-source-release.zip) = 7d8880bac7cfb5f9f01f0b82e6d1dc1b9a4e0f79e0c76f9d807182fcad5e3e8c57c0c019cb1177b87a1e85f92aff3770585422be691f5cfafb529e633af35600 +SHA512 (maven-dependency-analyzer-1.11.2-source-release.zip) = 290335fae258749da8fab43cc6d7557255ad68330abe5573cc6bc87c45c3e9d8982ddcd7c34b8b8d1e06e250a8db82a18173cc74fb889debe2fcbe23742d66b5 From 3f7c0a03c7ea293b7af4c364812af2b4bbbd70b0 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Sep 2020 13:24:58 +0200 Subject: [PATCH 7/9] Update to upstream version 1.11.3 --- .gitignore | 1 + maven-dependency-analyzer.spec | 10 ++++------ sources | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 13716b8..3944ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /maven-dependency-analyzer-1.8-source-release.zip /maven-dependency-analyzer-1.11.1-source-release.zip /maven-dependency-analyzer-1.11.2-source-release.zip +/maven-dependency-analyzer-1.11.3-source-release.zip diff --git a/maven-dependency-analyzer.spec b/maven-dependency-analyzer.spec index 43f8ddb..5bfab3d 100644 --- a/maven-dependency-analyzer.spec +++ b/maven-dependency-analyzer.spec @@ -1,5 +1,5 @@ Name: maven-dependency-analyzer -Version: 1.11.2 +Version: 1.11.3 Release: 1%{?dist} Summary: Maven dependency analyzer License: ASL 2.0 @@ -36,14 +36,9 @@ Summary: API documentation for %{name} %prep %setup -q -# Needed for tests only. However, the right groupId:artifactId of jmock in -# Fedora is org.jmock:jmock -%pom_remove_dep jmock:jmock - %pom_change_dep :maven-project :maven-core %build -# org.jmock.core package is needed, we don't have it %mvn_build -f %install @@ -56,6 +51,9 @@ Summary: API documentation for %{name} %doc LICENSE NOTICE %changelog +* Fri Sep 11 2020 Marian Koncek - 1.11.3-1 +- Update to upstream version 1.11.3 + * Tue Aug 25 2020 Marian Koncek - 1.11.2-1 - Update to upstream version 1.11.2 diff --git a/sources b/sources index 97973c9..6a0e44a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-dependency-analyzer-1.11.2-source-release.zip) = 290335fae258749da8fab43cc6d7557255ad68330abe5573cc6bc87c45c3e9d8982ddcd7c34b8b8d1e06e250a8db82a18173cc74fb889debe2fcbe23742d66b5 +SHA512 (maven-dependency-analyzer-1.11.3-source-release.zip) = 84a13538660dd877e6ab7b626778267b4ddf06581752235e8e4e282306a6c896e7d737795a81fd05a804e77fa685ddf4891b20c73561bbc741ab671b5ccf75b8 From f6414b82962157b602a924d48a3c5c0e37e6926b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 8/9] Conditionalize buildrequires in bootstrap mode --- maven-dependency-analyzer.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-dependency-analyzer.spec b/maven-dependency-analyzer.spec index 5bfab3d..489432f 100644 --- a/maven-dependency-analyzer.spec +++ b/maven-dependency-analyzer.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-dependency-analyzer Version: 1.11.3 Release: 1%{?dist} @@ -9,6 +11,9 @@ BuildArch: noarch Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildRequires: mvn(org.apache.maven:maven-artifact) @@ -18,6 +23,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.ow2.asm:asm) +%endif %description Analyzes the dependencies of a project for undeclared or unused artifacts. From 4c8666161089251197d2c8cee75671e65d492652 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 9/9] Turn off bootstrap mode by default --- maven-dependency-analyzer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-dependency-analyzer.spec b/maven-dependency-analyzer.spec index 489432f..e6f4448 100644 --- a/maven-dependency-analyzer.spec +++ b/maven-dependency-analyzer.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-dependency-analyzer Version: 1.11.3