| 1 |
Author: Apollon Oikonomopoulos <[email protected]> |
| 2 |
Description: Do not build hibernate, prometheus and micrometer bindings |
| 3 |
Last-Update: 2017-09-13 |
| 4 |
Forwarded: no (debain-specific) |
| 5 |
--- a/pom.xml |
| 6 |
+++ b/pom.xml |
| 7 |
@@ -367,6 +367,11 @@ |
| 8 |
<source>1.8</source> |
| 9 |
<target>1.8</target> |
| 10 |
<compilerArgs>-Xlint</compilerArgs> |
| 11 |
+ <excludes> |
| 12 |
+ <exclude>**/com/zaxxer/hikari/metrics/prometheus/**</exclude> |
| 13 |
+ <exclude>**/com/zaxxer/hikari/metrics/micrometer/**</exclude> |
| 14 |
+ <exclude>**/com/zaxxer/hikari/hibernate/**</exclude> |
| 15 |
+ </excludes> |
| 16 |
</configuration> |
| 17 |
</plugin> |
| 18 |
|
| 19 |
--- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java |
| 20 |
+++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java |
| 21 |
@@ -24,12 +24,10 @@ |
| 22 |
import com.zaxxer.hikari.metrics.PoolStats; |
| 23 |
import com.zaxxer.hikari.metrics.dropwizard.CodahaleHealthChecker; |
| 24 |
import com.zaxxer.hikari.metrics.dropwizard.CodahaleMetricsTrackerFactory; |
| 25 |
-import com.zaxxer.hikari.metrics.micrometer.MicrometerMetricsTrackerFactory; |
| 26 |
import com.zaxxer.hikari.util.ConcurrentBag; |
| 27 |
import com.zaxxer.hikari.util.ConcurrentBag.IBagStateListener; |
| 28 |
import com.zaxxer.hikari.util.SuspendResumeLock; |
| 29 |
import com.zaxxer.hikari.util.UtilityElf.DefaultThreadFactory; |
| 30 |
-import io.micrometer.core.instrument.MeterRegistry; |
| 31 |
import org.slf4j.Logger; |
| 32 |
import org.slf4j.LoggerFactory; |
| 33 |
|
| 34 |
@@ -276,9 +274,6 @@ |
| 35 |
if (metricRegistry != null && safeIsAssignableFrom(metricRegistry, "com.codahale.metrics.MetricRegistry")) { |
| 36 |
setMetricsTrackerFactory(new CodahaleMetricsTrackerFactory((MetricRegistry) metricRegistry)); |
| 37 |
} |
| 38 |
- else if (metricRegistry != null && safeIsAssignableFrom(metricRegistry, "io.micrometer.core.instrument.MeterRegistry")) { |
| 39 |
- setMetricsTrackerFactory(new MicrometerMetricsTrackerFactory((MeterRegistry) metricRegistry)); |
| 40 |
- } |
| 41 |
else { |
| 42 |
setMetricsTrackerFactory(null); |
| 43 |
} |