Merge modular branch
This commit is contained in:
commit
0bac94e4f9
@ -1,3 +1,5 @@
|
|||||||
|
%bcond_with bootstrap
|
||||||
|
|
||||||
Name: maven-dependency-tree
|
Name: maven-dependency-tree
|
||||||
Version: 3.0.1
|
Version: 3.0.1
|
||||||
Release: 6%{?dist}
|
Release: 6%{?dist}
|
||||||
@ -8,15 +10,18 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{v
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
|
%if %{with bootstrap}
|
||||||
|
BuildRequires: javapackages-bootstrap
|
||||||
|
%else
|
||||||
BuildRequires: mvn(org.apache.maven:maven-compat)
|
BuildRequires: mvn(org.apache.maven:maven-compat)
|
||||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
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-plugin-testing-harness)
|
||||||
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
|
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-annotations)
|
||||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
|
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
|
||||||
BuildRequires: mvn(org.eclipse.aether:aether-api)
|
BuildRequires: mvn(org.eclipse.aether:aether-api)
|
||||||
BuildRequires: mvn(org.eclipse.aether:aether-util)
|
BuildRequires: mvn(org.eclipse.aether:aether-util)
|
||||||
|
%endif
|
||||||
|
|
||||||
Provides: maven-shared-dependency-tree = %{version}-%{release}
|
Provides: maven-shared-dependency-tree = %{version}-%{release}
|
||||||
|
|
||||||
@ -36,6 +41,7 @@ find -name Maven3DependencyGraphBuilder.java -delete
|
|||||||
%pom_remove_dep org.sonatype.aether:
|
%pom_remove_dep org.sonatype.aether:
|
||||||
|
|
||||||
%pom_remove_plugin :apache-rat-plugin
|
%pom_remove_plugin :apache-rat-plugin
|
||||||
|
%pom_remove_plugin :maven-invoker-plugin
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Incompatible version of jMock (Fedora has 2.x, upstream uses 1.x)
|
# Incompatible version of jMock (Fedora has 2.x, upstream uses 1.x)
|
||||||
@ -45,7 +51,6 @@ find -name Maven3DependencyGraphBuilder.java -delete
|
|||||||
%mvn_install
|
%mvn_install
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -f .mfiles
|
||||||
%dir %{_javadir}/%{name}
|
|
||||||
%doc LICENSE NOTICE
|
%doc LICENSE NOTICE
|
||||||
|
|
||||||
%files javadoc -f .mfiles-javadoc
|
%files javadoc -f .mfiles-javadoc
|
||||||
@ -64,9 +69,15 @@ find -name Maven3DependencyGraphBuilder.java -delete
|
|||||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-3
|
||||||
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-2
|
||||||
|
- Mass rebuild for javapackages-tools 201901
|
||||||
|
|
||||||
* Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-1
|
* Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.1-1
|
||||||
- Update to upstream version 3.0.1
|
- Update to upstream version 3.0.1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user