aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Dudycz <jakub.dudycz@nokia.com>2019-03-05 15:49:04 +0100
committerJakub Dudycz <jakub.dudycz@nokia.com>2019-03-07 11:55:16 +0100
commitf938e8a87a33f8db78115a92f5130d6296171c62 (patch)
treec42f814f8adce3bf6bd09fbbeaa1dd3ceadcc89a
parent78be6c808f0a77c6dc39bd5b0bc9af8f4042febd (diff)
Remove Guava 19 dependency via protobuf-java-util
Change-Id: Ic11cab5bce064817a954a462b3d2eea463198bd8 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com> Issue-ID: DCAEGEN2-1311
-rw-r--r--pom.xml14
-rw-r--r--sources/hv-collector-dcae-app-simulator/pom.xml5
-rw-r--r--sources/hv-collector-utils/pom.xml5
-rw-r--r--sources/hv-collector-ves-message-generator/pom.xml5
-rw-r--r--sources/hv-collector-xnf-simulator/pom.xml7
5 files changed, 34 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index 18c7b6f3..c769dcce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -397,7 +397,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
-
+ <version>27.0.1-jre</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
@@ -513,6 +513,12 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>${protobuf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -540,6 +546,12 @@
<groupId>io.ratpack</groupId>
<artifactId>ratpack-core</artifactId>
<version>1.5.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
diff --git a/sources/hv-collector-dcae-app-simulator/pom.xml b/sources/hv-collector-dcae-app-simulator/pom.xml
index 57c1c12e..8f6b061a 100644
--- a/sources/hv-collector-dcae-app-simulator/pom.xml
+++ b/sources/hv-collector-dcae-app-simulator/pom.xml
@@ -129,6 +129,11 @@
<artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
diff --git a/sources/hv-collector-utils/pom.xml b/sources/hv-collector-utils/pom.xml
index ca24d7c1..e65cbd2f 100644
--- a/sources/hv-collector-utils/pom.xml
+++ b/sources/hv-collector-utils/pom.xml
@@ -94,6 +94,11 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<optional>true</optional>
diff --git a/sources/hv-collector-ves-message-generator/pom.xml b/sources/hv-collector-ves-message-generator/pom.xml
index e676dfa9..7cb7d4ef 100644
--- a/sources/hv-collector-ves-message-generator/pom.xml
+++ b/sources/hv-collector-ves-message-generator/pom.xml
@@ -82,6 +82,11 @@
<artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
diff --git a/sources/hv-collector-xnf-simulator/pom.xml b/sources/hv-collector-xnf-simulator/pom.xml
index 24351191..aae04b42 100644
--- a/sources/hv-collector-xnf-simulator/pom.xml
+++ b/sources/hv-collector-xnf-simulator/pom.xml
@@ -160,5 +160,10 @@
<groupId>io.ratpack</groupId>
<artifactId>ratpack-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
-</project> \ No newline at end of file
+</project>