From 4a147d4e656e3e6061d33dad582ab0156b0f890d49e297d84b8151062e1e98c5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 Mar 2022 12:57:33 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/prometheus-simpleclient-java?expand=0&rev=6 --- prometheus-simpleclient-java.changes | 6 ++++++ prometheus-simpleclient-java.spec | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/prometheus-simpleclient-java.changes b/prometheus-simpleclient-java.changes index 7d5f104..0293ae4 100644 --- a/prometheus-simpleclient-java.changes +++ b/prometheus-simpleclient-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 17 12:56:51 UTC 2022 - Fridrich Strba + +- Build against standalone jaxb-api on distributions that have JDK + without the JavaEE modules + ------------------------------------------------------------------- Tue Feb 22 18:22:41 UTC 2022 - Fridrich Strba diff --git a/prometheus-simpleclient-java.spec b/prometheus-simpleclient-java.spec index be75ee7..3b3edd1 100644 --- a/prometheus-simpleclient-java.spec +++ b/prometheus-simpleclient-java.spec @@ -38,6 +38,9 @@ BuildRequires: mvn(org.eclipse.jetty:jetty-server) BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildArch: noarch +%if 0%{?suse_version} > 1500 +BuildRequires: mvn(javax.xml.bind:jaxb-api) +%endif %description The Prometheus Java Suite: Client Metrics, Exposition, and Examples. @@ -146,6 +149,10 @@ for m in simpleclient_caffeine \ %pom_disable_module $m done +%if 0%{?suse_version} > 1500 +%pom_add_dep javax.xml.bind:jaxb-api::provided simpleclient_pushgateway +%endif + %build %{mvn_build} -f -s -- -Dsource=8