Browse Source

Build feign with java 11 (#707)

* Enable build with java 11
* Added JDK 11 entry to CHANGELOG
pull/754/merge
Marvin Froeder 6 years ago committed by GitHub
parent
commit
b8d1ad97b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .mvn/wrapper/maven-wrapper.properties
  2. 26
      .travis.yml
  3. 5
      CHANGELOG.md
  4. 1
      jackson-jaxb/pom.xml
  5. 6
      jackson/src/main/java/feign/jackson/JacksonIteratorDecoder.java
  6. 21
      jaxb/pom.xml
  7. 28
      pom.xml

2
.mvn/wrapper/maven-wrapper.properties vendored

@ -1 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip

26
.travis.yml

@ -3,17 +3,8 @@
# https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments # https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
sudo: required sudo: required
dist: trusty dist: trusty
sudo: false
cache:
directories:
- $HOME/.m2
language: java language: java
jdk:
- oraclejdk8
before_install: before_install:
# Parameters used during release # Parameters used during release
- git config user.name "$GH_USER" - git config user.name "$GH_USER"
@ -29,6 +20,21 @@ install:
script: script:
- ./travis/publish.sh - ./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. # 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 # See https://github.com/travis-ci/travis-ci/issues/1532
branches: branches:

5
CHANGELOG.md

@ -1,7 +1,8 @@
### Version 10.0 ### Version 10.0
* Feign baseline is now JDK 8 * Feign baseline is now JDK 8
* Removed @Deprecated methods marked for removal on feign 10 - 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.
* `RetryException` includes the `Method` used for the offending `Request` * 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. * `Response` objects now contain the `Request` used.
### Version 9.6 ### Version 9.6

1
jackson-jaxb/pom.xml

@ -69,4 +69,5 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

6
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.JsonParser;
import com.fasterxml.jackson.core.JsonToken; 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.Response;
import feign.Util; import feign.Util;
import feign.codec.DecodeException; import feign.codec.DecodeException;

21
jaxb/pom.xml

@ -43,4 +43,25 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles>
<profile>
<activation>
<jdk>11</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.xml.bind</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

28
pom.xml

@ -27,9 +27,7 @@
<module>gson</module> <module>gson</module>
<module>httpclient</module> <module>httpclient</module>
<module>hystrix</module> <module>hystrix</module>
<module>jackson-jaxb</module>
<module>jackson</module> <module>jackson</module>
<module>jaxb</module>
<module>jaxrs</module> <module>jaxrs</module>
<module>jaxrs2</module> <module>jaxrs2</module>
<module>okhttp</module> <module>okhttp</module>
@ -60,20 +58,20 @@
<gson.version>2.5</gson.version> <gson.version>2.5</gson.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<!-- last version supporting JDK 7 --> <jackson.version>2.9.6</jackson.version>
<assertj.version>1.7.1</assertj.version> <assertj.version>3.10.0</assertj.version>
<jackson.version>2.6.4</jackson.version>
<animal-sniffer-maven-plugin.version>1.15</animal-sniffer-maven-plugin.version> <animal-sniffer-maven-plugin.version>1.15</animal-sniffer-maven-plugin.version>
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version> <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version> <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-source-plugin.version>3.0.0</maven-source-plugin.version> <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version> <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<license-maven-plugin.version>3.0</license-maven-plugin.version> <license-maven-plugin.version>3.0</license-maven-plugin.version>
<maven-jar-plugin.version>2.6</maven-jar-plugin.version> <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version> <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-bundle-plugin.version>3.2.0</maven-bundle-plugin.version> <maven-bundle-plugin.version>3.2.0</maven-bundle-plugin.version>
<centralsync-maven-plugin.version>0.1.0</centralsync-maven-plugin.version> <centralsync-maven-plugin.version>0.1.0</centralsync-maven-plugin.version>
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
</properties> </properties>
<name>Feign (Parent)</name> <name>Feign (Parent)</name>
@ -310,7 +308,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version> <version>${maven-surefire-plugin.version}</version>
<configuration> <configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile> <redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration> </configuration>
@ -464,6 +462,16 @@
</build> </build>
<profiles> <profiles>
<profile>
<activation>
<jdk>1.8</jdk>
</activation>
<modules>
<module>jackson-jaxb</module>
<module>jaxb</module>
</modules>
</profile>
<profile> <profile>
<id>release</id> <id>release</id>
<build> <build>

Loading…
Cancel
Save