aboutsummaryrefslogtreecommitdiffstats
path: root/metrics-proxy
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2021-10-18 12:41:52 +0200
committergjoranv <gv@verizonmedia.com>2021-10-19 16:46:30 +0200
commitcaf36396be34230330f41d53b6169659e09fbdf6 (patch)
tree5a3588eae9ea922406483d7531743902d0e94e7c /metrics-proxy
parentf996eb3c39db4c83b856495ec64984ba7fddc344 (diff)
Upgrade from velocity:1.7 to velocity-engine-core:2.3
Diffstat (limited to 'metrics-proxy')
-rw-r--r--metrics-proxy/pom.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml
index 83cab8de366..6e43b6c1d62 100644
--- a/metrics-proxy/pom.xml
+++ b/metrics-proxy/pom.xml
@@ -108,7 +108,14 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- Must use the one provided by Jdisc to prevent two instances of slf4j classes. -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- test scope -->