Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394322 )

Change subject: Depend on jre-headless and its versioned names.
......................................................................


Depend on jre-headless and its versioned names.

Change-Id: I395fcc65818e8b670ef658399586a0c9c9cb3f13
---
M debian/changelog
M debian/control
2 files changed, 11 insertions(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index 57a60ee..e3bbd75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+prometheus-jmx-exporter (0.10-3) stretch-wikimedia; urgency=medium
+
+  * Swith to (and depend on) jre-headless and its versioned names. This avoids
+    prometheus-jmx-exporter having to drag multiple jre versions if some are
+    already installed on the system.
+
+ -- Filippo Giunchedi <[email protected]>  Thu, 30 Nov 2017 16:36:31 +0100
+
 prometheus-jmx-exporter (0.10-2) stretch-wikimedia; urgency=low
 
   * Versionless .jar symlink fix
diff --git a/debian/control b/debian/control
index 6819359..50b1439 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,9 @@
 
 Package: prometheus-jmx-exporter
 Architecture: all
-Depends: default-jre
+Depends: default-jre-headless | default-jre
+         | openjdk-8-jre-headless | openjdk-8-jre
+         | openjdk-9-jre-headless | openjdk-9-jre
 Description: JMX to Prometheus exporter
  .
  A Collector that can configurably scrape and expose mBeans of a JMX target.

-- 
To view, visit https://gerrit.wikimedia.org/r/394322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I395fcc65818e8b670ef658399586a0c9c9cb3f13
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/prometheus-jmx-exporter
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to