diff --git a/Makefile b/Makefile index 83e10b76eb..a8ae3612d3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ GIT_HEAD_ARG = --build-arg=GIT_HEAD=$(shell git rev-parse HEAD) +export DOCKER_BUILDKIT = 0 .PHONY: build build: diff --git a/build.gradle b/build.gradle index 87f9b0ab62..c329ad6634 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,7 @@ buildscript { repositories { - mavenLocal() - jcenter() - maven { - url "https://plugins.gradle.org/m2/" - } + mavenCentral() + maven { url "https://plugins.gradle.org/m2/" } } dependencies { diff --git a/core/build.gradle b/core/build.gradle index fbac5449e8..97ccbac2ff 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -8,7 +8,6 @@ defaultTasks 'build' repositories { mavenCentral() - jcenter() maven { url "https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts" } maven { url "https://repo.osgeo.org/repository/release/" } } @@ -141,7 +140,6 @@ dependencies { "io.dropwizard.metrics:metrics-jvm:4.2.12", "io.dropwizard.metrics:metrics-jmx:4.2.12", "io.dropwizard.metrics:metrics-logback:4.2.12", - 'com.readytalk:metrics3-statsd:4.2.0' ) geotools( "org.geotools:gt-epsg-hsql:27.2", diff --git a/core/src/main/java/org/mapfish/print/metrics/StatsDReporterInit.java b/core/src/main/java/org/mapfish/print/metrics/StatsDReporterInit.java index 5d03d69c86..6225d8e360 100644 --- a/core/src/main/java/org/mapfish/print/metrics/StatsDReporterInit.java +++ b/core/src/main/java/org/mapfish/print/metrics/StatsDReporterInit.java @@ -1,7 +1,6 @@ package org.mapfish.print.metrics; import com.codahale.metrics.MetricRegistry; -import com.readytalk.metrics.StatsDReporter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,10 +10,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.UnknownHostException; -import java.util.concurrent.TimeUnit; import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; /** * Will start a StatsD reporter if configured. Using those environment variables or Java system properties: - @@ -31,8 +28,6 @@ public class StatsDReporterInit { @Autowired private MetricRegistry metricRegistry; - private StatsDReporter reporter = null; - private static String getHostname() { String hostname = System.getenv("HOSTNAME"); // should work on Unix if (hostname == null) { @@ -71,21 +66,6 @@ public final void init() throws URISyntaxException { final int period = Integer.parseInt(getConfig(PERIOD, "10")); LOGGER.info("Starting a StatsD reporter targeting {} with prefix {} and period {}s", uri, prefix, period); - this.reporter = StatsDReporter.forRegistry(this.metricRegistry) - .prefixedWith(prefix) - .build(uri.getHost(), uri.getPort()); - this.reporter.start(period, TimeUnit.SECONDS); - } - } - - /** - * Stop the StatsD reporter, if configured. - */ - @PreDestroy - public final void shutdown() { - if (this.reporter != null) { - LOGGER.info("Stopping the StatsD reporter"); - this.reporter.stop(); } } } diff --git a/docs/build.gradle b/docs/build.gradle index 93b966fb7f..6df4b7aed6 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -6,7 +6,6 @@ defaultTasks 'build' repositories { mavenCentral() - jcenter() maven { url "https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts" } maven { url "https://repo.osgeo.org/repository/release/" } } diff --git a/examples/build.gradle b/examples/build.gradle index 1fe97fea8e..185ca736da 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -2,7 +2,6 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent repositories { mavenCentral() - jcenter() maven { url 'https://maven.restlet.org' } maven { url "https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts" } maven { url "https://repo.osgeo.org/repository/release/" }