aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-12-06 14:56:23 +0100
committerGitHub <noreply@github.com>2022-12-06 14:56:23 +0100
commit8379322093e419c792337b45625f085efe07aad4 (patch)
tree5f91d61912e5f98ee05a655e8238f1451ce805ec
parent8d3d4cfd8629bbf1af2b14483bce759ac20f61e4 (diff)
parenta50706d4d137b142066bab306fcc0c305f1910b4 (diff)
Merge pull request #25122 from vespa-engine/balder/gc-unused-commons-dependencies
commons-text, commons-net and commons-pool are not used in the project.
-rw-r--r--maven-plugins/allowed-maven-dependencies.txt4
-rw-r--r--parent/pom.xml27
-rw-r--r--vespa-dependencies-enforcer/allowed-maven-dependencies.txt8
3 files changed, 14 insertions, 25 deletions
diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt
index 4c0304fbc71..cab4de7817d 100644
--- a/maven-plugins/allowed-maven-dependencies.txt
+++ b/maven-plugins/allowed-maven-dependencies.txt
@@ -14,8 +14,8 @@ com.google.j2objc:j2objc-annotations:1.1
commons-io:commons-io:2.11.0
javax.annotation:javax.annotation-api:1.2
javax.inject:javax.inject:1
-org.apache.commons:commons-compress:1.21
-org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-compress:1.22
+org.apache.commons:commons-lang3:3.12.0
org.apache.maven:maven-archiver:3.6.0
org.apache.maven:maven-artifact:3.8.6
org.apache.maven:maven-builder-support:3.8.6
diff --git a/parent/pom.xml b/parent/pom.xml
index 01babcb9020..2f61600424d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -609,7 +609,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.11</version>
+ <version>3.12.0</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
@@ -627,24 +627,24 @@
<version>${jjwt.version}</version>
</dependency>
<dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.12.2</version>
+ </dependency>
+ <dependency>
<groupId>net.openhft</groupId>
<artifactId>zero-allocation-hashing</artifactId>
<version>${zero-allocation-hashing.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>${commons-text.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>${commons.math3.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.4</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -652,16 +652,6 @@
<version>${commons-codec.version}</version>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
<version>${aircompressor.version}</version>
@@ -729,7 +719,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.21</version>
+ <version>1.22</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -1126,7 +1116,6 @@
<curator.version>5.3.0</curator.version>
<commons-codec.version>1.15</commons-codec.version>
<commons-io.version>2.11.0</commons-io.version>
- <commons-text.version>1.10.0</commons-text.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-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index dafbe695498..030c51b93dc 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -47,7 +47,7 @@ com.yahoo.athenz:athenz-zms-core:1.10.54
com.yahoo.athenz:athenz-zpe-java-client:1.10.54
com.yahoo.athenz:athenz-zts-core:1.10.54
com.yahoo.rdl:rdl-java:1.5.4
-commons-cli:commons-cli:1.4
+commons-cli:commons-cli:1.5.0
commons-codec:commons-codec:1.15
commons-fileupload:commons-fileupload:1.4
commons-io:commons-io:2.11.0
@@ -77,16 +77,16 @@ javax.servlet:javax.servlet-api:3.1.0
javax.validation:validation-api:1.1.0.Final
javax.ws.rs:javax.ws.rs-api:2.0.1
javax.xml.bind:jaxb-api:2.3.0
-joda-time:joda-time:2.8.1
+joda-time:joda-time:2.12.2
net.java.dev.jna:jna:5.11.0
net.openhft:zero-allocation-hashing:0.16
org.antlr:antlr-runtime:3.5.2
org.antlr:antlr4-runtime:4.9.3
org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.5
-org.apache.commons:commons-compress:1.21
+org.apache.commons:commons-compress:1.22
org.apache.commons:commons-csv:1.8
org.apache.commons:commons-exec:1.3
-org.apache.commons:commons-lang3:3.11
+org.apache.commons:commons-lang3:3.12.0
org.apache.commons:commons-math3:3.6.1
org.apache.curator:curator-client:5.3.0
org.apache.curator:curator-framework:5.3.0