Implement bootstrap mode

This commit is contained in:
Mikolaj Izdebski 2021-05-17 09:31:36 +02:00
parent 1d88c9a3ef
commit d650ec85b8

View File

@ -1,3 +1,5 @@
%bcond_with bootstrap
# Don't generate requires on jpackage-utils and java-headless for
# provided pseudo-artifacts: com.sun:tools and sun.jdk:jconsole.
%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}/maven-metadata/javapackages-metadata.xml$
@ -10,7 +12,7 @@
Name: javapackages-tools
Version: 6.0.0~alpha
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Macros and scripts for Java packaging support
License: BSD
URL: https://github.com/fedora-java/javapackages
@ -63,20 +65,16 @@ install their content.
Summary: Macros and scripts for Maven packaging support
Requires: %{name} = %{version}-%{release}
Requires: javapackages-local = %{version}-%{release}
#Requires: (%{_bindir}/xmvn or javapackages-bootstrap)
#Requires: (mvn(org.fedoraproject.xmvn:xmvn-mojo) or javapackages-bootstrap)
%if %{without bootstrap}
Requires: %{_bindir}/xmvn
Requires: mvn(org.fedoraproject.xmvn:xmvn-mojo)
# Common Maven plugins required by almost every build. It wouldn't make
# sense to explicitly require them in every package built with Maven.
#Requires: (mvn(org.apache.maven.plugins:maven-compiler-plugin) or javapackages-bootstrap)
#Requires: (mvn(org.apache.maven.plugins:maven-jar-plugin) or javapackages-bootstrap)
#Requires: (mvn(org.apache.maven.plugins:maven-resources-plugin) or javapackages-bootstrap)
#Requires: (mvn(org.apache.maven.plugins:maven-surefire-plugin) or javapackages-bootstrap)
Requires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
Requires: mvn(org.apache.maven.plugins:maven-jar-plugin)
Requires: mvn(org.apache.maven.plugins:maven-resources-plugin)
Requires: mvn(org.apache.maven.plugins:maven-surefire-plugin)
%endif
%description -n maven-local
This package provides macros and scripts to support packaging Maven artifacts.
@ -103,14 +101,15 @@ packaging in Linux distributions
%package -n javapackages-local
Summary: Non-essential macros and scripts for Java packaging support
Requires: javapackages-generators = %{version}-%{release}
#Requires: (%{_bindir}/xmvn-install or javapackages-bootstrap)
#Requires: (%{_bindir}/xmvn-subst or javapackages-bootstrap)
#Requires: (%{_bindir}/xmvn-resolve or javapackages-bootstrap)
%if %{with bootstrap}
Requires: javapackages-bootstrap
%else
Requires: %{_bindir}/xmvn-install
Requires: %{_bindir}/xmvn-subst
Requires: %{_bindir}/xmvn-resolve
# Java build systems don't have hard requirement on java-devel, so it should be there
Requires: java-11-openjdk-devel
%endif
%description -n javapackages-local
This package provides non-essential macros and scripts to support Java packaging.
@ -183,6 +182,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
%license LICENSE
%changelog
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-5
- Implement bootstrap mode
* Thu May 13 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-4
- Disable skippedPlugins for now