- Re-added module-info.java.

- Force Java 11 on RHEL build.
This commit is contained in:
sbluhm 2021-09-29 09:12:10 +02:00
commit 10792a3143

View file

@ -1,6 +1,6 @@
Name: xmlpull
Version: 1.2.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: XML Pull Parsing API
License: Public Domain
@ -29,12 +29,12 @@ find \( -name \*.jar -o -name \*.class \) -delete
%pom_disable_module xpp3_min
# using java 8, we need to remove the java module
rm xmlpull/src/main/java/module-info.java
%mvn_package :%{name}-xpp3-parent __noinstall
%build
%if 0%{?rhel}
export JAVA_HOME=/usr/lib/jvm/java-11
%endif
%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
%install
@ -45,5 +45,9 @@ rm xmlpull/src/main/java/module-info.java
%doc %{name}/README.adoc
%changelog
* Wed Sep 29 07:07:25 UTC 2021 - Stefan Bluhm <stefan.bluhm@clacee.eu> - 1.2.0-2
- Re-added module-info.java.
- Force Java 11 on RHEL build.
* Wed Aug 11 2021 Didik Supriadi <didiksupriadi41@gmail.com> - 1.2.0-1
- Initial package