JAMES-2617 Use new version of elastic search reporter (WIP: snapshot version while waiting for release)
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f9d6bd62 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f9d6bd62 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f9d6bd62 Branch: refs/heads/master Commit: f9d6bd621423e0c18c94dc0609d465f0e59274f7 Parents: 5dc4d64 Author: Raphael Ouazana <[email protected]> Authored: Wed Dec 5 15:12:30 2018 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Thu Dec 6 11:24:20 2018 +0100 ---------------------------------------------------------------------- pom.xml | 6 +++--- server/container/metrics/metrics-es-reporter/pom.xml | 2 +- .../java/org/apache/james/metrics/es/ESMetricReporter.java | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f9d6bd62/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 300a18b..1ff7ee8 100644 --- a/pom.xml +++ b/pom.xml @@ -634,7 +634,7 @@ <testcontainers.version>1.9.0</testcontainers.version> <assertj.version>3.3.0</assertj.version> <es.version>2.2.1</es.version> - <es-reporter.version>2.2.0</es-reporter.version> + <es-reporter.version>6.0.0-SNAPSHOT</es-reporter.version> <guava.version>25.1-jre</guava.version> <jutf7.version>1.0.0</jutf7.version> @@ -2376,9 +2376,9 @@ <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.elasticsearch</groupId> + <groupId>com.linagora</groupId> <artifactId>metrics-elasticsearch-reporter</artifactId> - <version>2.2.0</version> + <version>${es-reporter.version}</version> </dependency> <dependency> <groupId>org.hamcrest</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/f9d6bd62/server/container/metrics/metrics-es-reporter/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/metrics/metrics-es-reporter/pom.xml b/server/container/metrics/metrics-es-reporter/pom.xml index 802547c..bbe6afc 100644 --- a/server/container/metrics/metrics-es-reporter/pom.xml +++ b/server/container/metrics/metrics-es-reporter/pom.xml @@ -71,7 +71,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.elasticsearch</groupId> + <groupId>com.linagora</groupId> <artifactId>metrics-elasticsearch-reporter</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/f9d6bd62/server/container/metrics/metrics-es-reporter/src/main/java/org/apache/james/metrics/es/ESMetricReporter.java ---------------------------------------------------------------------- diff --git a/server/container/metrics/metrics-es-reporter/src/main/java/org/apache/james/metrics/es/ESMetricReporter.java b/server/container/metrics/metrics-es-reporter/src/main/java/org/apache/james/metrics/es/ESMetricReporter.java index d527c33..2be9542 100644 --- a/server/container/metrics/metrics-es-reporter/src/main/java/org/apache/james/metrics/es/ESMetricReporter.java +++ b/server/container/metrics/metrics-es-reporter/src/main/java/org/apache/james/metrics/es/ESMetricReporter.java @@ -26,10 +26,9 @@ import java.util.concurrent.TimeUnit; import javax.annotation.PreDestroy; import javax.inject.Inject; -import org.elasticsearch.metrics.ElasticsearchReporter; - import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.ScheduledReporter; +import com.linagora.elasticsearch.metrics.ElasticsearchReporter; public class ESMetricReporter { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
