Added used undeclared jars

velo · Apr 28, 2016 · b16da2b · b16da2b
1 parent 5c7f80b
commit b16da2b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git 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
@@ -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
@@ -41,6 +41,16 @@
       <artifactId>jackson-databind</artifactId>
       <version>2.6.4</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>2.6.4</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>2.6.4</version>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>
@@ -54,6 +64,18 @@
       <version>2.7.5</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>2.7.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okio</groupId>
+      <artifactId>okio</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>

diff --git 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<Module> 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) {