diff options
| author | gjoranv <gv@oath.com> | 2018-11-29 15:42:19 +0100 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:29 +0100 |
| commit | 8866546da818c2a269fe868443a93012909da9b1 (patch) | |
| tree | fcdca2498a58580cbfa2ede58befbf0d61e96a7f | |
| parent | f57167fb13dcd3a983a8bd557f9c626d9f9ce46f (diff) | |
Do not provide commons-codec at build time.
- We effectively stopped providing it runtime since
https://github.com/vespa-engine/vespa/pull/7696
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 1 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 5 | ||||
| -rw-r--r-- | container-dev/pom.xml | 8 | ||||
| -rw-r--r-- | parent/pom.xml | 5 |
4 files changed, 13 insertions, 6 deletions
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index f6d89c127d1..70c572185dc 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -90,7 +90,6 @@ <include>com.sun.activation:javax.activation:[1.2.0]:jar:provided</include> <include>com.sun.xml.bind:jaxb-core:[${jaxb.version}]:jar:provided</include> <include>com.sun.xml.bind:jaxb-impl:[${jaxb.version}]:jar:provided</include> - <include>commons-codec:commons-codec:[1.4]:jar:provided</include> <include>commons-daemon:commons-daemon:[1.0.3]:jar:provided</include> <include>commons-logging:commons-logging:[1.1.1]:jar:provided</include> <include>javax.annotation:javax.annotation-api:[${javax.annotation-api.version}]:jar:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 53abaa8768d..b6af723670a 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -144,11 +144,6 @@ <version>${guice.version}</version> <classifier>no_aop</classifier> </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.4</version> - </dependency> <dependency> <groupId>commons-daemon</groupId> <artifactId>commons-daemon</artifactId> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index be3f8ae432d..e3837c08701 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -147,6 +147,10 @@ <artifactId>icu4j</artifactId> </exclusion> <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </exclusion> @@ -179,6 +183,10 @@ <version>${project.version}</version> <exclusions> <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </exclusion> diff --git a/parent/pom.xml b/parent/pom.xml index 899834cf5cc..11282f3c36c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -432,6 +432,11 @@ <version>1.3.1</version> </dependency> <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.4</version> + </dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> |