Remove remaining Jackson

Remove jackson import as jackson shoul dbe removed

Issue-ID: CLAMP-292
Change-Id: Ie638e40b278e747caf5efc30bf6f32bb489c758b
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

diff --git a/pom.xml b/pom.xml
index 6a2d273..3a0cc25 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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 c80fd0e..45c945c 100644 (file)
--- 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");
     }
 }