From b16da2b0f8a6435f7972b5e9893f95734ad75d2b Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Fri, 29 Apr 2016 11:27:55 +1200 Subject: [PATCH] Added used undeclared jars --- .travis.yml | 2 ++ appveyor.yml | 1 + pom.xml | 22 +++++++++++++++++++ .../java/feign/jackson/JacksonEncoder.java | 6 ++--- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9d08b3..b4202f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ os: - linux jdk: + - openjdk7 + - oraclejdk7 - oraclejdk8 install: diff --git a/appveyor.yml b/appveyor.yml index 5be1c1c..30eb54f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,6 +18,7 @@ version: '{build}' environment: matrix: + - JAVA_HOME: C:\Program Files\Java\jdk1.7.0 - JAVA_HOME: C:\Program Files\Java\jdk1.8.0 os: Windows Server 2012 diff --git a/pom.xml b/pom.xml index 8e2637b..10910e7 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,16 @@ jackson-databind 2.6.4 + + com.fasterxml.jackson.core + jackson-annotations + 2.6.4 + + + com.fasterxml.jackson.core + jackson-core + 2.6.4 + junit @@ -54,6 +64,18 @@ 2.7.5 test + + com.squareup.okhttp + okhttp + 2.7.5 + test + + + com.squareup.okio + okio + 1.6.0 + test + org.assertj assertj-core diff --git a/src/main/java/feign/jackson/JacksonEncoder.java b/src/main/java/feign/jackson/JacksonEncoder.java index d4e04fb..0a59691 100644 --- a/src/main/java/feign/jackson/JacksonEncoder.java +++ b/src/main/java/feign/jackson/JacksonEncoder.java @@ -39,9 +39,9 @@ public JacksonEncoder() { public JacksonEncoder(Iterable modules) { this(new ObjectMapper() - .setSerializationInclusion(JsonInclude.Include.NON_NULL) - .configure(SerializationFeature.INDENT_OUTPUT, true) - .registerModules(modules)); + .setSerializationInclusion(JsonInclude.Include.NON_NULL) + .configure(SerializationFeature.INDENT_OUTPUT, true) + .registerModules(modules)); } public JacksonEncoder(ObjectMapper mapper) {