summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKajur, Harish (vk250x) <vk250x@att.com>2018-04-19 09:31:36 -0400
committerKajur, Harish (vk250x) <vk250x@att.com>2018-04-19 13:22:12 -0400
commitcaac2b0ea280a67e5b2bc82ac368bea2c3b9b0da (patch)
tree472ea9a87776798d4469901b731a3050dd2aeb25
parent235f7eb30eb3eea9bf9e56e0e4bc2bee458abbd4 (diff)
Fix the spring core and netty handler issue
Issue-ID: AAI-586 Change-Id: I69efb05f9fb82ffe1a97042e493c754b55bfb269 Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
-rw-r--r--aai-auth/pom.xml16
-rw-r--r--aai-client-loadbalancer/pom.xml27
-rw-r--r--aai-core/pom.xml20
-rw-r--r--aai-schema-ingest/pom.xml11
-rw-r--r--aai-utils/pom.xml11
5 files changed, 71 insertions, 14 deletions
diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml
index 1bc20005..b113e95f 100644
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -40,16 +40,20 @@
<dependencies>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.8.7</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.8.11</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.8.11</version>
+ </dependency>
</dependencies>
<build>
diff --git a/aai-client-loadbalancer/pom.xml b/aai-client-loadbalancer/pom.xml
index 6279eb34..59905cc6 100644
--- a/aai-client-loadbalancer/pom.xml
+++ b/aai-client-loadbalancer/pom.xml
@@ -56,6 +56,16 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -73,6 +83,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>4.3.16.RELEASE</version>
+ </dependency>
+ <dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
<version>1.0.0</version>
@@ -80,7 +95,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
- <version>4.0.29.Final</version>
+ <version>4.1.9.Final</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -97,6 +112,16 @@
<artifactId>logback-access</artifactId>
<version>${logback.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.8.11</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.8.11</version>
+ </dependency>
</dependencies>
<dependencyManagement>
diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 6d6814f7..c7f4686e 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -514,11 +514,6 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
@@ -635,6 +630,21 @@
<artifactId>spring-jms</artifactId>
<version>4.3.16.RELEASE</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.8.11</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.8.11</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.8.11</version>
+ </dependency>
</dependencies>
<!-- Plugins and repositories -->
diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml
index d5ea87e3..e3178b67 100644
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -68,7 +68,16 @@
<version>1.5.1.RELEASE</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.8.11</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.8.11</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml
index 0afd77b9..691569b0 100644
--- a/aai-utils/pom.xml
+++ b/aai-utils/pom.xml
@@ -73,7 +73,16 @@
<artifactId>spring-core</artifactId>
<version>4.3.10.RELEASE</version>
</dependency>
-
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.8.11</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.8.11</version>
+ </dependency>
<dependency>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-schema</artifactId>