diff --git a/SPECS/prometheus-jmx-exporter.spec b/SPECS/prometheus-jmx-exporter.spec index 15028d3..e0e6e7e 100644 --- a/SPECS/prometheus-jmx-exporter.spec +++ b/SPECS/prometheus-jmx-exporter.spec @@ -5,11 +5,12 @@ # Filter requires for the Java Agent as deps are shaded within. %global jmx_or_client io\\.prometheus\\.jmx:.*|io\\.prometheus:simpleclient.*|org\\.yaml:snakeyaml.* %global mvn_requires_filter .*mvn\\(%{jmx_or_client}\\) -%global __requires_exclude ^%{mvn_requires_filter}$ +%global java_headless_filter \\(?.*java-headless.*\\)? +%global __requires_exclude ^%{java_headless_filter}|%{mvn_requires_filter}$ Name: prometheus-jmx-exporter Version: 0.12.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Prometheus JMX Exporter License: ASL 2.0 @@ -20,6 +21,8 @@ Patch1: properly_rewrite_namespace.patch Patch2: 0001-Fix-CVE-2017-18640-and-add-a-test.patch BuildArch: noarch +Requires: %{name}-jdk-binding +Suggests: %{name}-openjdk11 = %{version}-%{release} BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -45,6 +48,36 @@ JMX to Prometheus exporter: a collector that can be configured to scrape and expose MBeans of a JMX target. This exporter is intended to be run as a Java Agent, exposing a HTTP server and serving metrics of the local JVM. +%package openjdk8 +Summary: OpenJDK 1.8.0 binding for %{name} +Provides: %{name}-jdk-binding = %{version}-%{release} +Conflicts: %{name}-jdk-binding +Requires: %{name} = %{version}-%{release} +Requires: java-1.8.0-headless + +%description openjdk8 +OpenJDK 1.8.0 binding package for %{name} + +%package openjdk11 +Summary: OpenJDK 11 binding for %{name} +Provides: %{name}-jdk-binding = %{version}-%{release} +Conflicts: %{name}-jdk-binding +Requires: %{name} = %{version}-%{release} +Requires: java-11-headless + +%description openjdk11 +OpenJDK 11 binding package for %{name} + +%package openjdk17 +Summary: OpenJDK 17 binding for %{name} +Provides: %{name}-jdk-binding = %{version}-%{release} +Conflicts: %{name}-jdk-binding +Requires: %{name} = %{version}-%{release} +Requires: java-17-headless + +%description openjdk17 +OpenJDK 17 binding package for %{name} + %prep %setup -q -n %{upstream_name}-%{version_id}-%{version} @@ -75,7 +108,21 @@ a Java Agent, exposing a HTTP server and serving metrics of the local JVM. %license LICENSE %doc NOTICE +%files openjdk8 +# empty files for the binding package + +%files openjdk11 +# empty files for the binding package + +%files openjdk17 +# empty files for the binding package + %changelog +* Tue Aug 31 2021 Severin Gehwolf - 0.12.0-7 +- Add JDK binding sub-packages so that the package + can be used with either JDK 11 or JDK 17. +- Add requirement on base package for the JDK binding packages. + * Mon Apr 20 2020 Severin Gehwolf - 0.12.0-6 - Fix CVE-2017-18640 by using updated snakeyaml.