diff options
| author | gjoranv <gjoranv@gmail.com> | 2017-09-15 17:47:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 17:47:23 +0200 |
| commit | 49ddfc889623fdeb5c255f349389f924eb62e783 (patch) | |
| tree | cb8bce47f2723b42cc52abf684d59d22af56c833 | |
| parent | ce5d1377aa00d3885769986f873a7a7d04d1db8c (diff) | |
| parent | d5896eda61a96c2135ed6618dacd1c9bd9695f5a (diff) | |
Merge pull request #3428 from vespa-engine/gjoranv/exclude-commons-collections
Exclude commons-collections from provided classpath.
| -rw-r--r-- | application/pom.xml | 4 | ||||
| -rw-r--r-- | container-dev/pom.xml | 17 |
2 files changed, 20 insertions, 1 deletions
diff --git a/application/pom.xml b/application/pom.xml index 3ea1b8270f4..311eb4fa2b6 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -85,6 +85,10 @@ for user projects must be added in compile scope here. These dependencies are explicitly excluded (or set to non-compile scope) in the container-dev module. --> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> </dependency> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 1d6f3331461..46b68f5a592 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -142,6 +142,10 @@ <version>${project.version}</version> <exclusions> <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + <exclusion> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </exclusion> @@ -166,7 +170,18 @@ <!-- Dependencies below are added explicitly to exclude transitive deps that are not provided runtime by the container, and hence make them invisible to user projects' build classpath. - Excluded artifacts should be added explicitly to the application module to make then visible in users' test classpath. --> + Excluded artifacts should be added explicitly to the application module to make then visible in users' test classpath. --> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>document</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>predicate-search-core</artifactId> |