diff --git a/README.md b/README.md index 83196f491fb9..9cdecd51b44c 100644 --- a/README.md +++ b/README.md @@ -222,3 +222,11 @@ environment variable to point to the root of your JDK. Example from a Mac: To build for a different Scala version (e.g. 2.13), run the following script, then build as normal: ./build/change-scala-version.sh 2.13 + +### Building on OS X + +When building on OS X and using Docker Desktop in a non-default configuration, you may need to edit `~/.testcontainers.properties` to contain the following: + +``` +docker.client.strategy=org.testcontainers.dockerclient.UnixSocketClientProviderStrategy +``` diff --git a/build/README.md b/build/README.md index fed45b6233b0..db6bc607eb5d 100644 --- a/build/README.md +++ b/build/README.md @@ -222,3 +222,11 @@ environment variable to point to the root of your JDK. Example from a Mac: To build for a different Scala version (e.g. 2.13), run the following script, then build as normal: ./build/change-scala-version.sh 2.13 + +### Building on OS X + +When building on OS X and using Docker Desktop in a non-default configuration, you may need to edit `~/.testcontainers.properties` to contain the following: + +``` +docker.client.strategy=org.testcontainers.dockerclient.UnixSocketClientProviderStrategy +``` diff --git a/build/cqs.tsv b/build/cqs.tsv index a86cc1db4aa0..2a72c025a8de 100644 --- a/build/cqs.tsv +++ b/build/cqs.tsv @@ -112,6 +112,14 @@ io.opentelemetry:opentelemetry-context 1.15.0 compile io.opentelemetry:opentelemetry-context 1.25.0 compile io.opentelemetry:opentelemetry-semconv 1.15.0-alpha compile io.opentelemetry:opentelemetry-semconv 1.25.0-alpha compile +io.prometheus:simpleclient 0.16.0 compile +io.prometheus:simpleclient_common 0.16.0 compile +io.prometheus:simpleclient_dropwizard 0.16.0 compile +io.prometheus:simpleclient_httpserver 0.16.0 compile +io.prometheus:simpleclient_pushgateway 0.16.0 compile +io.prometheus:simpleclient_tracer_common 0.16.0 compile +io.prometheus:simpleclient_tracer_otel 0.16.0 compile +io.prometheus:simpleclient_tracer_otel_agent 0.16.0 compile io.sgr:s2-geometry-library-java 1.0.1 compile it.geosolutions.jaiext.affine:jt-affine 1.1.24 compile it.geosolutions.jaiext.algebra:jt-algebra 1.1.24 compile @@ -372,7 +380,7 @@ org.slf4j:jul-to-slf4j 1.7.36 test org.specs2:specs2-core_2.12 4.9.2 test org.specs2:specs2-junit_2.12 4.9.2 test org.specs2:specs2-mock_2.12 4.9.2 test -org.testcontainers:kafka 1.17.6 test -org.testcontainers:postgresql 1.17.6 test -org.testcontainers:testcontainers 1.17.6 test +org.testcontainers:kafka 1.19.3 test +org.testcontainers:postgresql 1.19.3 test +org.testcontainers:testcontainers 1.19.3 test org.wololo:jts2geojson 0.16.1 test diff --git a/pom.xml b/pom.xml index dea2cefe17bf..1f453c4a2df8 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ 4.9.2 4.13.1 - 1.17.6 + 1.19.3