From 92628698e8959ea632ca9ac83d9a98ab9d7f9ef1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 22 May 2020 11:06:29 +0200 Subject: [PATCH] Make built packages require JDK 8 or 11 --- javapackages-config.json | 19 +++++++++++++++++++ javapackages-tools.spec | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 javapackages-config.json diff --git a/javapackages-config.json b/javapackages-config.json new file mode 100644 index 0000000..28f6648 --- /dev/null +++ b/javapackages-config.json @@ -0,0 +1,19 @@ +{ + "maven.req": { + "always_generate": [ + "javapackages-filesystem", + "(java-headless or java-11-headless)" + ], + "java_requires": { + "skip": true + }, + "java_devel_requires": { + "skip": true + } + }, + "javadoc.req": { + "always_generate": [ + "javapackages-filesystem" + ] + } +} diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 00c1680..70ccc8c 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -33,6 +33,7 @@ BuildArch: noarch Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz Source1: module-config.xml Source2: toolchains-openjdk8.xml +Source3: javapackages-config.json Patch1: 0001-Move-python-modules-under-java-utils-directory.patch Patch2: 0002-Enable-namespaced-dependency-generation.patch @@ -178,6 +179,8 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 mkdir -p %{buildroot}%{_datadir}/xmvn/conf/ cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml +install -p -m 644 %{SOURCE3} %{buildroot}%{_javaconfdir}/javapackages-config.json + %check ./check