diff options
| author |   Gervais-Martial Ngueko <gervais-martial.ngueko@intl.att.com> | 2019-02-15 14:49:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-15 14:49:17 +0000 |
| commit | c6d3c50cb1c3b662c2481d31c7b91b9787bd1a29 (patch) | |
| tree | 4302407dbdfd8e9eba21774ca73a0dd1aecc5703 | |
| parent | 9065b82b0148752305ef71f4386b8b781e2a155c (diff) | |
| parent | 00109a0ca24bf94d6f97a567c49e0ba945739f5c (diff) | |
Merge "Remove remaining Jackson"
| -rw-r--r-- | pom.xml | 16 | ||||
| -rw-r--r-- | src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java | 15 |
2 files changed, 14 insertions, 17 deletions
@@ -265,8 +265,8 @@ <artifactId>camel-servlet-starter</artifactId> </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jackson-starter</artifactId> + <groupId>org.apache.camel</groupId> + <artifactId>camel-gson-starter</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -280,6 +280,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-ext</artifactId> </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -576,13 +580,7 @@ <dependency> <groupId>org.onap.sdc.sdc-tosca</groupId> <artifactId>sdc-tosca</artifactId> - <version>1.4.1</version> - <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - </exclusions> + <version>1.5.0</version> </dependency> <!-- TESTING --> <dependency> diff --git a/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java b/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java index c80fd0ec..45c945c4 100644 --- a/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java +++ b/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java @@ -31,13 +31,12 @@ public class CamelConfiguration extends RouteBuilder { @Override public void configure() { - restConfiguration().component("servlet").bindingMode(RestBindingMode.json) - .dataFormatProperty("prettyPrint", "true")//.enableCORS(true) - // turn on swagger api-doc - .apiContextPath("api-doc") - .apiVendorExtension(true) - .apiProperty("api.title", "Clamp Rest API").apiProperty("api.version", ClampVersioning.getCldsVersionFromProps()) - .apiProperty("base.path", "/restservices/clds/v1/"); - //.apiProperty("cors", "true"); + restConfiguration().component("servlet").bindingMode(RestBindingMode.json).jsonDataFormat("json-gson") + .dataFormatProperty("prettyPrint", "true")// .enableCORS(true) + // turn on swagger api-doc + .apiContextPath("api-doc").apiVendorExtension(true).apiProperty("api.title", "Clamp Rest API") + .apiProperty("api.version", ClampVersioning.getCldsVersionFromProps()) + .apiProperty("base.path", "/restservices/clds/v1/"); + // .apiProperty("cors", "true"); } } |