diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-11 20:02:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-11 20:02:02 +0100 |
| commit | 46fc5ff2264fb1e44a0d620b846403c12b850591 (patch) | |
| tree | eb1e6cca445580448872eb8caba313f47603c374 | |
| parent | bdca1e4dbbc19cc1c87a75445469a334406ff56c (diff) | |
| parent | e1c1e1486d6356c5a8d3b04f8716730b738a7508 (diff) | |
Merge pull request #24841 from vespa-engine/manage-commons-io
Add dep management for commons-io version
| -rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 3 | ||||
| -rw-r--r-- | parent/pom.xml | 6 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index 6a8d1f9b1d6..9cf9e978cca 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -8,8 +8,7 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:27.1-jre com.google.inject:guice:4.2.3:no_aop com.google.j2objc:j2objc-annotations:1.1 -commons-io:commons-io:2.5 -commons-io:commons-io:2.6 +commons-io:commons-io:2.11.0 commons-io:commons-io:2.7 javax.annotation:javax.annotation-api:1.2 javax.annotation:jsr250-api:1.0 diff --git a/parent/pom.xml b/parent/pom.xml index 14e5c2154f5..e81bdb5e661 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -579,6 +579,11 @@ <version>${athenz.version}</version> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> + </dependency> + <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt-api</artifactId> <version>${jjwt.version}</version> @@ -1062,6 +1067,7 @@ <bouncycastle.version>1.72</bouncycastle.version> <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> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 477e1f61622..afc2b8b5699 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -52,8 +52,6 @@ commons-cli:commons-cli:1.4 commons-codec:commons-codec:1.15 commons-fileupload:commons-fileupload:1.4 commons-io:commons-io:2.11.0 -commons-io:commons-io:2.2 -commons-io:commons-io:2.6 commons-logging:commons-logging:1.2 io.airlift:aircompressor:0.21 io.airlift:airline:0.9 |