diff --git a/.gitignore b/.gitignore index 7731b0f..111224c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ /maven-dependency-analyzer-1.8-source-release.zip /maven-dependency-analyzer-1.10-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 9724062..a0d809c 100644 --- a/maven-dependency-analyzer.spec +++ b/maven-dependency-analyzer.spec @@ -1,28 +1,33 @@ +# 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-analyzer Version: 1.11.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Maven dependency analyzer License: ASL 2.0 - URL: https://maven.apache.org/shared/maven-dependency-analyzer/ -Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip - BuildArch: noarch +Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip + BuildRequires: maven-local -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-tools) -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-model) -BuildRequires: mvn(org.apache.maven:maven-project) +%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) +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) -BuildRequires: mvn(org.ow2.asm:asm) >= 8.0.0 +BuildRequires: mvn(org.ow2.asm:asm) +%endif %description Analyzes the dependencies of a project for undeclared or unused artifacts. @@ -32,51 +37,49 @@ not detected (constants, annotations with source-only retention, links in javadoc) which can lead to wrong result if they are the only use of a dependency. - %package javadoc Summary: API documentation for %{name} %description javadoc %{summary} - %prep %setup -q -# missing maven-artifact dependency in tests: -# org.apache.maven.artifact.handler.DefaultArtifactHandler -%pom_add_dep org.apache.maven:maven-artifact:3.6.0:test - -# failing test in our build environment -rm src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java - +%pom_change_dep :maven-project :maven-core %build -%mvn_build - +%mvn_build -f %install %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 - 1.11.3-3 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 1.11.3-4 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 1.11.3-3 +- Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 1.11.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Fri Sep 11 2020 Marian Koncek - 1.11.3-1 +- Update to upstream version 1.11.3 + * Wed Aug 26 2020 Fabio Valentini - 1.11.3-1 - Update to version 1.11.3. +* Tue Aug 25 2020 Marian Koncek - 1.11.2-1 +- Update to upstream version 1.11.2 + * Tue Jul 28 2020 Fedora Release Engineering - 1.11.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -86,12 +89,21 @@ rm src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDepen * Wed Jan 29 2020 Fedora Release Engineering - 1.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 1.11.1-2 +- Mass rebuild for javapackages-tools 201902 + * Sun Aug 18 2019 Fabio Valentini - 1.11.1-1 - Update to version 1.11.1. * Thu Jul 25 2019 Fedora Release Engineering - 1.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* 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 + * Fri Feb 01 2019 Fedora Release Engineering - 1.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -172,4 +184,3 @@ rm src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDepen * Tue Dec 18 2012 Tomas Radej - 1.3-1 - Initial package -