@@ -1,3 +1,6 @@
+### Version 10.0
+* Feign baseline is now JDK 8
+
 ### Version 9.6
 * Feign builder now supports flag `doNotCloseAfterDecode` to support lazy iteration of responses.
 * Adds `JacksonIteratorDecoder` and `StreamDecoder` to decode responses as `java.util.Iterator` or `java.util.stream.Stream`.
 
@@ -52,11 +52,6 @@
       <artifactId>feign-jackson</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>feign-java8</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.squareup.okhttp</groupId>
       <artifactId>mockwebserver</artifactId>
 
@@ -56,6 +56,13 @@
       <version>4.2.5.RELEASE</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
 
@@ -18,7 +18,6 @@
 import feign.Feign;
 import feign.RequestLine;
 import feign.Response;
-import feign.jackson.JacksonIteratorDecoder;
 import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.IOException;
@@ -61,7 +60,7 @@ class Car {
       + "]\n";
 
   @Test
-  public void simpleStreamTest() throws IOException, InterruptedException {
+  public void simpleStreamTest() {
     MockWebServer server = new MockWebServer();
     server.enqueue(new MockResponse().setBody("foo\nbar"));
 
@@ -76,23 +75,6 @@ public void simpleStreamTest() throws IOException, InterruptedException {
     }
   }
 
-  @Test
-  public void simpleJsonStreamTest() throws IOException, InterruptedException {
-    MockWebServer server = new MockWebServer();
-    server.enqueue(new MockResponse().setBody(carsJson));
-
-    ObjectMapper mapper = new ObjectMapper();
-
-    StreamInterface api = Feign.builder()
-        .decoder(StreamDecoder.create(JacksonIteratorDecoder.create()))
-        .doNotCloseAfterDecode()
-        .target(StreamInterface.class, server.url("/").toString());
-
-    try (Stream<StreamInterface.Car> stream = api.getCars()) {
-      assertThat(stream.collect(Collectors.toList())).hasSize(2);
-    }
-  }
-
   @Test
   public void shouldCloseIteratorWhenStreamClosed() throws IOException {
     Response response = Response.builder()
@@ -119,7 +101,7 @@ static class TestCloseableIterator implements Iterator<String>, Closeable {
     boolean closed;
 
     @Override
-    public void close() throws IOException {
+    public void close() {
       this.closed = true;
     }
 
 
@@ -155,7 +155,7 @@ public void customEncoder() throws Exception {
     encoder.encode(zones, new TypeReference<List<Zone>>() {}.getType(), template);
 
     assertThat(template).hasBody("" //
-        + "[ {" + System.lineSeparator() 
+        + "[ {" + System.lineSeparator()
         + "  \"name\" : \"DENOMINATOR.IO.\"" + System.lineSeparator()
         + "}, {" + System.lineSeparator()
         + "  \"name\" : \"DENOMINATOR.IO.\"," + System.lineSeparator()
 
@@ -36,7 +36,6 @@
     <module>ribbon</module>
     <module>sax</module>
     <module>slf4j</module>
-    <module>java8</module>
     <module>mock</module>
     <module>benchmark</module>
   </modules>