Using the latest Java environment for build

i8 changed/i8/prometheus-jmx-exporter-0.12.0-10.el8.inferit
Sergey Cherevko 1 year ago
parent 42e4adc058
commit 5ffb2acbfb
Signed by: scherevko
GPG Key ID: D87CBBC16D2E4A72

@ -0,0 +1,27 @@
From 7785162241123e185bda5d50556d286bd1df9f89 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Wed, 8 Nov 2023 11:11:04 +0300
Subject: [PATCH] MSVSphere change source version
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 71f777e..c7e7e43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
--
2.39.3

@ -10,7 +10,7 @@
Name: prometheus-jmx-exporter
Version: 0.12.0
Release: 10%{?dist}
Release: 10%{?dist}.inferit
Summary: Prometheus JMX Exporter
License: ASL 2.0
@ -20,6 +20,8 @@ Source0: https://github.com/prometheus/jmx_exporter/archive/%{version_id}
Patch1: properly_rewrite_namespace.patch
Patch2: 0001-Fix-CVE-2017-18640-and-add-a-test.patch
Patch3: 0001-Fix-CVE-2022-1471-and-add-a-test.patch
# MSVSphere
Patch100: 0001-MSVSphere-change-source-version.patch
BuildArch: noarch
Requires: %{name}-jdk-binding
@ -85,6 +87,7 @@ OpenJDK 17 binding package for %{name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch100 -p1
%pom_remove_plugin org.vafer:jdeb jmx_prometheus_httpserver
%pom_remove_plugin org.apache.maven.plugins:maven-failsafe-plugin jmx_prometheus_javaagent
@ -101,7 +104,7 @@ OpenJDK 17 binding package for %{name}
%build
# ignore spurious test errors with: -Dmaven.test.failure.ignore=true
%mvn_build -j
%mvn_build -jf
%install
%mvn_install
@ -120,7 +123,8 @@ OpenJDK 17 binding package for %{name}
# empty files for the binding package
%changelog
* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 0.12.0-10
* Wed Nov 08 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 0.12.0-10.inferit
- Using the latest Java environment for build
- Rebuilt for MSVSphere 8.8
* Wed Dec 07 2022 Severin Gehwolf <sgehwolf@redhat.com> - 0.12.0-10

Loading…
Cancel
Save