diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 56bb0164..c9023edf 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip \ No newline at end of file +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 6a20ee91..add4d93e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,17 +3,8 @@ # https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments sudo: required dist: trusty - -cache: - directories: - - $HOME/.m2 - +sudo: false language: java - -jdk: - - oraclejdk8 - - before_install: # Parameters used during release - git config user.name "$GH_USER" @@ -29,6 +20,21 @@ install: script: - ./travis/publish.sh +cache: + directories: + - $HOME/.m2 + +matrix: + include: + - os: linux + jdk: oraclejdk8 + addons: + apt: + packages: + - oracle-java8-installer + - os: linux + jdk: openjdk11 + # Don't build release tags. This avoids publish conflicts because the version commit exists both on master and the release tag. # See https://github.com/travis-ci/travis-ci/issues/1532 branches: diff --git a/CHANGELOG.md b/CHANGELOG.md index c26ac659..8dd246a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ ### Version 10.0 * Feign baseline is now JDK 8 -* Removed @Deprecated methods marked for removal on feign 10 -* `RetryException` includes the `Method` used for the offending `Request` + - Feign is now being built and tested with OpenJDK 11 as well. Releases and code base will use JDK 8, we are just testing compatibility with JDK 11. +* Removed @Deprecated methods marked for removal on feign 10. +* `RetryException` includes the `Method` used for the offending `Request`. * `Response` objects now contain the `Request` used. ### Version 9.6 diff --git a/jackson-jaxb/pom.xml b/jackson-jaxb/pom.xml index fbfa7365..b5549c2e 100644 --- a/jackson-jaxb/pom.xml +++ b/jackson-jaxb/pom.xml @@ -69,4 +69,5 @@ test + diff --git a/jackson/src/main/java/feign/jackson/JacksonIteratorDecoder.java b/jackson/src/main/java/feign/jackson/JacksonIteratorDecoder.java index c07b13e9..0ca3f232 100644 --- a/jackson/src/main/java/feign/jackson/JacksonIteratorDecoder.java +++ b/jackson/src/main/java/feign/jackson/JacksonIteratorDecoder.java @@ -15,7 +15,11 @@ package feign.jackson; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.Module; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.RuntimeJsonMappingException; import feign.Response; import feign.Util; import feign.codec.DecodeException; diff --git a/jaxb/pom.xml b/jaxb/pom.xml index f1e265bf..67202e0b 100644 --- a/jaxb/pom.xml +++ b/jaxb/pom.xml @@ -43,4 +43,25 @@ test + + + + + 11 + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + --add-modules java.xml.bind + + + + + + + diff --git a/pom.xml b/pom.xml index 29334914..9357f733 100644 --- a/pom.xml +++ b/pom.xml @@ -27,9 +27,7 @@ gson httpclient hystrix - jackson-jaxb jackson - jaxb jaxrs jaxrs2 okhttp @@ -60,20 +58,20 @@ 2.5 4.12 - - 1.7.1 - 2.6.4 + 2.9.6 + 3.10.0 1.15 - 3.5.1 + 3.8.0 2.5.2 - 3.0.0 - 2.10.3 + 3.0.1 + 3.0.1 3.0 - 2.6 + 3.1.0 2.5.3 3.2.0 0.1.0 + 2.22.0 Feign (Parent) @@ -310,7 +308,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.20 + ${maven-surefire-plugin.version} true @@ -464,6 +462,16 @@ + + + 1.8 + + + + jackson-jaxb + jaxb + + release