diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-09-06 14:12:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 14:12:57 +0200 |
| commit | 50ccd0828a16d8a0c20c289aa854c8b47739e000 (patch) | |
| tree | a79da9d6e1c5d57a3b31d9c16a83118e7d699eeb | |
| parent | 06d760a1b60e0dac0096804c82413d5247c168bb (diff) | |
| parent | c96b5ef5b83264f63dd8c3e61fc89306267156f2 (diff) | |
Merge pull request #3346 from vespa-engine/gjoranv/remove-commons-lang
Remove commons-lang (2+3) as visible deps from container-dev.
| -rw-r--r-- | container-dev/pom.xml | 22 | ||||
| -rw-r--r-- | vespaclient-java/pom.xml | 11 |
2 files changed, 33 insertions, 0 deletions
diff --git a/container-dev/pom.xml b/container-dev/pom.xml index e858ba1c50b..944484e9db5 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -37,6 +37,12 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>jdisc_http_service</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -86,6 +92,12 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>container-disc</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -102,6 +114,12 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -114,6 +132,10 @@ <version>${project.version}</version> <exclusions> <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + <exclusion> <groupId>org.antlr</groupId> <artifactId>antlr4-runtime</artifactId> </exclusion> diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index bb8ed9387fc..8cde41d53d7 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -33,6 +33,7 @@ <version>${project.version}</version> </dependency> <dependency> + <!-- TODO: remove dependency on container-dev, and instead depend directly on what this module needs! --> <groupId>com.yahoo.vespa</groupId> <artifactId>container-dev</artifactId> <version>${project.version}</version> @@ -44,10 +45,20 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_http_service</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>predicate-search-core</artifactId> <version>${project.version}</version> </dependency> <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vespajlib</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> |