summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cloud-tenant-base-dependencies-enforcer/pom.xml3
-rw-r--r--controller-server/pom.xml3
-rw-r--r--parent/pom.xml7
-rw-r--r--vespa-athenz/pom.xml2
4 files changed, 8 insertions, 7 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 6910fd3a825..115143da82a 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -22,6 +22,7 @@
<!-- MUST BE KEPT IN SYNC WITH parent/pom.xml -->
<athenz.version>1.10.54</athenz.version>
<bouncycastle.version>1.72</bouncycastle.version>
+ <commons-codec.version>1.15</commons-codec.version>
<felix.version>7.0.1</felix.version>
<httpclient5.version>5.1.3</httpclient5.version>
<httpclient.version>4.5.13</httpclient.version>
@@ -174,7 +175,7 @@
<include>com.ibm.icu:icu4j:57.1:jar:test</include>
<include>com.microsoft.onnxruntime:onnxruntime:[${onnxruntime.version}]:jar:test</include>
<include>com.thaiopensource:jing:20091111:jar:test</include>
- <include>commons-codec:commons-codec:1.11:jar:test</include>
+ <include>commons-codec:commons-codec:[${commons-codec.version}]:jar:test</include>
<include>io.airlift:aircompressor:0.17:jar:test</include>
<include>io.airlift:airline:0.7:jar:test</include>
<include>io.prometheus:simpleclient:0.6.0:jar:test</include>
diff --git a/controller-server/pom.xml b/controller-server/pom.xml
index 3e889d926b1..1a8a68be9e0 100644
--- a/controller-server/pom.xml
+++ b/controller-server/pom.xml
@@ -155,15 +155,12 @@
<groupId>com.yahoo.vespa</groupId>
<artifactId>http-utils</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<!-- required by java-jwt -->
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons.codec.version}</version>
- <scope>compile</scope>
</dependency>
<!-- test -->
diff --git a/parent/pom.xml b/parent/pom.xml
index 29be0ab6195..bd9a66acbde 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -593,6 +593,11 @@
<version>1.4</version>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>2.0</version>
@@ -1031,7 +1036,7 @@
-->
<bouncycastle.version>1.72</bouncycastle.version>
<curator.version>5.3.0</curator.version>
- <commons.codec.version>1.15</commons.codec.version>
+ <commons-codec.version>1.15</commons-codec.version>
<commons.math3.version>3.6.1</commons.math3.version>
<eclipse-collections.version>11.0.0</eclipse-collections.version>
<felix.version>7.0.1</felix.version>
diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml
index 758a99b38b9..f1e6738bdb9 100644
--- a/vespa-athenz/pom.xml
+++ b/vespa-athenz/pom.xml
@@ -201,8 +201,6 @@
<!-- required by java-jwt -->
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons.codec.version}</version>
- <scope>compile</scope>
</dependency>
</dependencies>