summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2017-09-11 12:43:05 +0200
committergjoranv <gv@oath.com>2017-09-11 12:43:05 +0200
commit00d4cb5e20a844cbd58f1485e283da363146f203 (patch)
tree61e83217bf067008de59129dc294800adb1e5091
parentcb8cbd3f6a2308060ce5ebcaa4a2cbf379ef8019 (diff)
Expose HdrHistogram in test scope instead of provided for users.
- It's not provided runtime, but we should consider doing so, as simplemetric:UntypedMetric exposes a public method that returns an org.HdrHistogram.DoubleHistogram.
-rw-r--r--application/pom.xml4
-rw-r--r--container-dev/pom.xml6
-rw-r--r--pom.xml5
-rw-r--r--simplemetrics/pom.xml1
4 files changed, 15 insertions, 1 deletions
diff --git a/application/pom.xml b/application/pom.xml
index c5e8136628d..b03c1aa8eed 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -92,6 +92,10 @@
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hdrhistogram</groupId>
+ <artifactId>HdrHistogram</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index 7eef70f59e0..c819a478a9b 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -42,6 +42,12 @@
<groupId>com.yahoo.vespa</groupId>
<artifactId>simplemetrics</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hdrhistogram</groupId>
+ <artifactId>HdrHistogram</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.yahoo.vespa</groupId>
diff --git a/pom.xml b/pom.xml
index a5101861f58..fc62bd5350f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -738,6 +738,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hdrhistogram</groupId>
+ <artifactId>HdrHistogram</artifactId>
+ <version>2.1.8</version>
+ </dependency>
+ <dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20090211</version>
diff --git a/simplemetrics/pom.xml b/simplemetrics/pom.xml
index 1e06726e18d..d027fda82ce 100644
--- a/simplemetrics/pom.xml
+++ b/simplemetrics/pom.xml
@@ -20,7 +20,6 @@
<dependency>
<groupId>org.hdrhistogram</groupId>
<artifactId>HdrHistogram</artifactId>
- <version>2.1.8</version>
<scope>compile</scope>
</dependency>
<dependency>