Merge modular branch

This commit is contained in:
Mikolaj Izdebski 2021-05-14 07:55:10 +02:00
commit de63085dc4
2 changed files with 30 additions and 26 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -1,28 +1,29 @@
%bcond_with bootstrap
Name: maven-dependency-analyzer
Version: 1.11.3
Release: 2%{?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,48 +33,42 @@ 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
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Sep 11 2020 Marian Koncek <mkoncek@redhat.com> - 1.11.3-1
- Update to upstream version 1.11.3
* Wed Aug 26 2020 Fabio Valentini <decathorpe@gmail.com> - 1.11.3-1
- Update to version 1.11.3.
* Tue Aug 25 2020 Marian Koncek <mkoncek@redhat.com> - 1.11.2-1
- Update to upstream version 1.11.2
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
@ -83,12 +78,21 @@ rm src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDepen
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11.1-2
- Mass rebuild for javapackages-tools 201902
* Sun Aug 18 2019 Fabio Valentini <decathorpe@gmail.com> - 1.11.1-1
- Update to version 1.11.1.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Jun 04 2019 Marian Koncek <mkoncek@redhat.com> - 1.11.1-1
- Update to upstream version 1.11.1
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-3
- Mass rebuild for javapackages-tools 201901
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
@ -169,4 +173,3 @@ rm src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDepen
* Tue Dec 18 2012 Tomas Radej <tradej@redhat.com> - 1.3-1
- Initial package