[hikaricp] 05/07: Do not build micrometer support

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository hikaricp.

commit 1f63d38f8607c6fbc2a4d10f2918d20a7c47422d
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Wed Sep 13 00:40:43 2017 +0300

    Do not build micrometer support
---
 debian/patches/series                              |  2 +-
 debian/patches/skip-hibernate-and-prometheus       | 17 ----------
 .../patches/skip-hibernate-prometheus-micrometer   | 39 ++++++++++++++++++++++
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 4062855..83bdb21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-skip-hibernate-and-prometheus
+skip-hibernate-prometheus-micrometer
diff --git a/debian/patches/skip-hibernate-and-prometheus b/debian/patches/skip-hibernate-and-prometheus
deleted file mode 100644
index 053633c..0000000
--- a/debian/patches/skip-hibernate-and-prometheus
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Apollon Oikonomopoulos <apoikos at debian.org>
-Description: Do not build hibernate and prometheus bindings
-Last-Update: 2017-03-01
-Forwarded: no (debain-specific)
---- a/pom.xml
-+++ b/pom.xml
-@@ -342,6 +342,10 @@
-                <configuration>
-                   <source>1.8</source>
-                   <target>1.8</target>
-+		  <excludes>
-+		      <exclude>**/com/zaxxer/hikari/metrics/prometheus/**</exclude>
-+		      <exclude>**/com/zaxxer/hikari/hibernate/**</exclude>
-+		  </excludes>
-                </configuration>
-             </plugin>
- 
diff --git a/debian/patches/skip-hibernate-prometheus-micrometer b/debian/patches/skip-hibernate-prometheus-micrometer
new file mode 100644
index 0000000..05cd705
--- /dev/null
+++ b/debian/patches/skip-hibernate-prometheus-micrometer
@@ -0,0 +1,39 @@
+Author: Apollon Oikonomopoulos <apoikos at debian.org>
+Description: Do not build hibernate, prometheus and micrometer bindings
+Last-Update: 2017-09-13
+Forwarded: no (debain-specific)
+--- a/pom.xml
++++ b/pom.xml
+@@ -367,6 +367,11 @@
+                <configuration>
+                   <source>1.8</source>
+                   <target>1.8</target>
++		  <excludes>
++		      <exclude>**/com/zaxxer/hikari/metrics/prometheus/**</exclude>
++		      <exclude>**/com/zaxxer/hikari/metrics/micrometer/**</exclude>
++		      <exclude>**/com/zaxxer/hikari/hibernate/**</exclude>
++		  </excludes>
+                </configuration>
+             </plugin>
+ 
+--- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
++++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+@@ -45,8 +45,6 @@
+ import java.util.concurrent.ThreadLocalRandom;
+ import java.util.concurrent.ThreadPoolExecutor;
+ 
+-import com.zaxxer.hikari.metrics.micrometer.MicrometerMetricsTrackerFactory;
+-import io.micrometer.core.instrument.MeterRegistry;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+@@ -275,9 +273,6 @@
+       if (metricRegistry instanceof MetricRegistry) {
+          setMetricsTrackerFactory(new CodahaleMetricsTrackerFactory((MetricRegistry) metricRegistry));
+       }
+-      else if (metricRegistry instanceof MeterRegistry) {
+-         setMetricsTrackerFactory(new MicrometerMetricsTrackerFactory((MeterRegistry) metricRegistry));
+-      }
+       else {
+          setMetricsTrackerFactory(null);
+       }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/hikaricp.git