summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pom.xml1
-rw-r--r--security-util-lib/pom.xml3
-rw-r--r--versioning-lib/pom.xml12
-rw-r--r--zusammen-lib/pom.xml10
4 files changed, 24 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index a686482..648d3f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<mockito.version>2.26.0</mockito.version>
<lombok.version>1.18.26</lombok.version>
+ <guava.version>32.1.2-jre</guava.version>
<junit-jupiter.version>5.7.2</junit-jupiter.version>
<logging-slf4j.version>1.6.9</logging-slf4j.version>
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
diff --git a/security-util-lib/pom.xml b/security-util-lib/pom.xml
index ec7bb9d..b2de64a 100644
--- a/security-util-lib/pom.xml
+++ b/security-util-lib/pom.xml
@@ -19,12 +19,11 @@
<!-- Nexus related properties -->
<portal.version>2.5.0</portal.version>
<lang3.version>3.3.2</lang3.version>
- <guava.version>30.1.1-jre</guava.version>
<httpclient.version>4.5.13</httpclient.version>
<jersey-bom.version>2.27</jersey-bom.version>
<json-simple.version>1.1</json-simple.version>
<functionaljava.version>4.7</functionaljava.version>
- <jackson.version>2.14.2</jackson.version>
+ <jackson.version>2.15.2</jackson.version>
<esapi.version>2.4.0.0</esapi.version>
<!-- Sonar properties -->
diff --git a/versioning-lib/pom.xml b/versioning-lib/pom.xml
index 9e61338..0be08d0 100644
--- a/versioning-lib/pom.xml
+++ b/versioning-lib/pom.xml
@@ -31,6 +31,12 @@
<dependencies>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.onap.sdc.sdc-be-common</groupId>
<artifactId>session-lib</artifactId>
<version>${project.version}</version>
@@ -39,6 +45,12 @@
<groupId>org.onap.sdc.sdc-be-common</groupId>
<artifactId>zusammen-lib</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/zusammen-lib/pom.xml b/zusammen-lib/pom.xml
index acd75ef..0fe85e4 100644
--- a/zusammen-lib/pom.xml
+++ b/zusammen-lib/pom.xml
@@ -44,6 +44,10 @@
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -63,6 +67,12 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>com.amdocs.zusammen.plugin</groupId>
<artifactId>zusammen-collaboration-cassandra-plugin</artifactId>
<version>${zusammen-collaboration-store.version}</version>