diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2018-03-14 09:22:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-14 09:22:15 +0000 |
| commit | 09f3630ea990197e9d7b669aa2d6a63ec397bf3e (patch) | |
| tree | 6625d3e9ac31600d86bf54a50e75dba61cc2c82a /aria | |
| parent | a56de0e221751debd038aca5b6d20d8f9325d294 (diff) | |
| parent | 38f720752af4d4aad8c4e467a288d9048659f688 (diff) | |
Merge "AT&T 1712 and 1802 release code"
Diffstat (limited to 'aria')
3 files changed, 33 insertions, 2 deletions
diff --git a/aria/aria-rest-java-client/pom.xml b/aria/aria-rest-java-client/pom.xml index adfc25348f..a9e5567350 100755 --- a/aria/aria-rest-java-client/pom.xml +++ b/aria/aria-rest-java-client/pom.xml @@ -45,6 +45,37 @@ <artifactId>jersey-media-json-jackson1</artifactId> <version>2.26-b03</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.8.7</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>2.8.7</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.8.7</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-base</artifactId> + <version>2.9.2</version> + </dependency> +<dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>2.9.2</version> +</dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-providers</artifactId> + <version>2.9.2</version> + <type>pom</type> + </dependency> </dependencies> </project> diff --git a/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/ExecutionImpl.java b/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/ExecutionImpl.java index 8e420cc16c..3aac2a2ca9 100644 --- a/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/ExecutionImpl.java +++ b/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/ExecutionImpl.java @@ -17,7 +17,7 @@ */ package com.gigaspaces.aria.rest.client; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Created by DeWayne on 7/17/2017. diff --git a/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/NodeTemplateImpl.java b/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/NodeTemplateImpl.java index 43338c952d..9190671c7a 100644 --- a/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/NodeTemplateImpl.java +++ b/aria/aria-rest-java-client/src/main/java/com/gigaspaces/aria/rest/client/NodeTemplateImpl.java @@ -17,7 +17,7 @@ */ package com.gigaspaces.aria.rest.client; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Created by DeWayne on 7/18/2017. |