Merge modular branch

This commit is contained in:
Mikolaj Izdebski 2021-05-13 20:58:24 +02:00
commit bca8a8c3b4
2 changed files with 20 additions and 5 deletions

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
felix-parent-1.2.1.tar.bz2
/felix-parent-2.1-source-release.tar.gz
/felix-parent-4-source-release.tar.gz
/felix-parent-6-source-release.tar.gz
/felix-parent-7-source-release.tar.gz

View File

@ -1,18 +1,20 @@
%bcond_with bootstrap
Name: felix-parent
Version: 7
Release: 4%{?dist}
Summary: Parent POM file for Apache Felix Specs
License: ASL 2.0
URL: https://felix.apache.org/
Source0: https://repo1.maven.org/maven2/org/apache/felix/%{name}/%{version}/%{name}-%{version}-source-release.tar.gz
Source0: https://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{version}/%{name}-%{version}-source-release.tar.gz
BuildArch: noarch
BuildRequires: maven-local
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: mvn(org.apache:apache:pom:)
# FIXME auto-requires are not generated
Requires: mvn(org.easymock:easymock)
Requires: mvn(org.mockito:mockito-all)
%endif
%description
Parent POM file for Apache Felix Specs.
@ -44,6 +46,9 @@ Parent POM file for Apache Felix Specs.
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 7-1
- Update to upstream version 7
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
@ -56,9 +61,18 @@ Parent POM file for Apache Felix Specs.
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 6-2
- Mass rebuild for javapackages-tools 201902
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jul 18 2019 Marian Koncek <mkoncek@redhat.com> - 6-1
- Update to upstream version 6
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4-6
- Mass rebuild for javapackages-tools 201901
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild