Merge modular branch

This commit is contained in:
Mikolaj Izdebski 2021-05-14 09:45:54 +02:00
commit 2a7556cc92

View File

@ -1,3 +1,5 @@
%bcond_with bootstrap
Name: plexus-sec-dispatcher Name: plexus-sec-dispatcher
Version: 1.4 Version: 1.4
Release: 32%{?dist} Release: 32%{?dist}
@ -14,31 +16,33 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
# Removed maven-compiler-plugin configuration version in the pom as annotations isn't available in version 1.4. # Removed maven-compiler-plugin configuration version in the pom as annotations isn't available in version 1.4.
Patch0: %{name}-pom.patch Patch0: %{name}-pom.patch
BuildRequires: maven-local BuildRequires: maven-local-openjdk8
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.sonatype.plexus:plexus-cipher) BuildRequires: %{?module_prefix}mvn(org.sonatype.plexus:plexus-cipher)
BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:) %endif
%description %description
Plexus Security Dispatcher Component Plexus Security Dispatcher Component
%package javadoc %{?module_package}
Summary: Javadoc for %{name} %{?javadoc_package}
%description javadoc
API documentation for %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
cp %{SOURCE1} . cp %{SOURCE1} .
%pom_remove_parent
%pom_xpath_inject "pom:dependency[pom:artifactId='junit']" "<scope>test</scope>"
%mvn_file : plexus/%{name} %mvn_file : plexus/%{name}
%build %build
@ -47,10 +51,7 @@ cp %{SOURCE1} .
%install %install
%mvn_install %mvn_install
%files -f .mfiles %files -n %{?module_prefix}%{name} -f .mfiles
%license LICENSE-2.0.txt
%files javadoc -f .mfiles-javadoc
%license LICENSE-2.0.txt %license LICENSE-2.0.txt
%changelog %changelog
@ -66,9 +67,18 @@ cp %{SOURCE1} .
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-29 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-29
- Build with OpenJDK 8
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-28
- Mass rebuild for javapackages-tools 201902
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-28 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-28
- 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> - 1.4-27
- Mass rebuild for javapackages-tools 201901
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-27 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild