#8 Explicitly override JAVA_HOME to check if xmvn javadoc java toolchain is wrong
Merged 2 years ago by didiksupriadi41. Opened 2 years ago by didiksupriadi41.
rpms/ didiksupriadi41/apache-ivy rawhide  into  rawhide

file modified
+6 -2
@@ -7,7 +7,7 @@ 

  

  Name:           apache-%{jarname}

  Version:        2.5.0

- Release:        6%{?dist}

+ Release:        7%{?dist}

  Summary:        Java-based dependency manager

  License:        ASL 2.0

  URL:            https://ant.apache.org/ivy
@@ -24,7 +24,7 @@ 

  Patch0:         00-global-settings.patch

  

  BuildRequires:  gnupg2

- BuildRequires:  maven-local

+ BuildRequires:  maven-local-openjdk11

  BuildRequires:  mvn(org.apache.ant:ant)

  BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)

  BuildRequires:  mvn(org.bouncycastle:bcpg-jdk15on)
@@ -210,6 +210,7 @@ 

  rm -rf asciidoc

  

  %build

+ export JAVA_HOME=%{_jvmdir}/java-11

  %mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8

  

  %install
@@ -224,6 +225,9 @@ 

  %{_sysconfdir}/ant.d/%{name}

  

  %changelog

+ * Wed Dec 01 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 2.5.0-7

+ - Change BR: maven-local-openjdk11

+ 

  * Wed Nov 17 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 2.5.0-6

  - Re-add global settings

  

no initial comment

rebased onto 10edeff

2 years ago

Pull-Request has been merged by didiksupriadi41

2 years ago
Metadata