diff options
| author | gjoranv <gv@oath.com> | 2018-07-19 15:23:01 +0200 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2018-07-19 15:23:01 +0200 |
| commit | 40eb9f953fa30815c7655eb0c033dc3d7909c9b8 (patch) | |
| tree | 0bede9ae765e9a9a65bdcdb31903402aa1e5e2bd | |
| parent | 1505beb7e4cff4e6dbe456b38a41d7d8b0bd27d0 (diff) | |
Use the guava version from container-dep-versions everywhere.
| -rw-r--r-- | config-model-api/pom.xml | 1 | ||||
| -rw-r--r-- | config-model/pom.xml | 2 | ||||
| -rwxr-xr-x | config/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 6 | ||||
| -rw-r--r-- | node-maintainer/pom.xml | 1 | ||||
| -rw-r--r-- | parent/pom.xml | 5 | ||||
| -rw-r--r-- | searchlib/pom.xml | 1 | ||||
| -rw-r--r-- | zkfacade/pom.xml | 1 |
8 files changed, 6 insertions, 13 deletions
diff --git a/config-model-api/pom.xml b/config-model-api/pom.xml index 743164afb16..109093beda9 100644 --- a/config-model-api/pom.xml +++ b/config-model-api/pom.xml @@ -72,7 +72,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava-testlib</artifactId> - <version>17.0</version> <scope>test</scope> </dependency> </dependencies> diff --git a/config-model/pom.xml b/config-model/pom.xml index bab2f37e667..e78c7f5c0fd 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -43,7 +43,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava-testlib</artifactId> - <version>17.0</version> <scope>test</scope> </dependency> <dependency> @@ -53,7 +52,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>13.0.1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/config/pom.xml b/config/pom.xml index 612541899b2..e1e04e17033 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -65,13 +65,11 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>13.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava-testlib</artifactId> - <version>17.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 2f12ceaa2d0..ccb8a9c311c 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -417,6 +417,12 @@ </dependency> <dependency> <!-- NOT provided from jdisc runtime --> + <groupId>com.google.guava</groupId> + <artifactId>guava-testlib</artifactId> + <version>${guava.version}</version> + </dependency> + <dependency> + <!-- NOT provided from jdisc runtime --> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-continuation</artifactId> <version>${jetty.version}</version> diff --git a/node-maintainer/pom.xml b/node-maintainer/pom.xml index 743e92f7f7d..f4e1b399cfa 100644 --- a/node-maintainer/pom.xml +++ b/node-maintainer/pom.xml @@ -71,7 +71,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> </dependency> </dependencies> diff --git a/parent/pom.xml b/parent/pom.xml index 34f6a4e1523..51f6bc52da3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -407,11 +407,6 @@ <version>${asm.version}</version> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava-testlib</artifactId> - <version>18.0</version> - </dependency> - <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> <version>3.4.0</version> diff --git a/searchlib/pom.xml b/searchlib/pom.xml index fb9a81b51a5..0202f8510bb 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -17,7 +17,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>13.0.1</version> <scope>provided</scope> </dependency> <dependency> diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index 0aa689d896d..3a4e9232d83 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -53,7 +53,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>13.0.1</version> <scope>provided</scope> </dependency> <dependency> |