diff --git a/.travis.yml b/.travis.yml index 8ece9f7..277eebf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,16 @@ +dist: xenial + language: java matrix: include: - os: linux - jdk: oraclejdk8 + jdk: openjdk8 - os: linux - jdk: oraclejdk9 + jdk: openjdk9 - os: linux - dist: xenial jdk: openjdk10 - os: linux - dist: xenial jdk: openjdk11 - os: osx osx_image: xcode9.3 # JDK 8 diff --git a/pom.xml b/pom.xml index bb0a49a..83ba703 100644 --- a/pom.xml +++ b/pom.xml @@ -228,10 +228,6 @@ org.fusesource.leveldbjni leveldbjni-all - - com.sun.jersey - jersey-core - com.sun.jersey jersey-server @@ -474,6 +470,14 @@ mozilla ${shadeBase}.org.apache.http.mozilla + + javax.ws.rs + ${shadeBase}.javax.ws.rs + + + com.sun.jersey + ${shadeBase}.com.sun.jersey + io.netty ${shadeBase}.io.netty @@ -569,6 +573,13 @@ META-INF/io.netty.versions.properties + + com.sun.jersey:jersey-core + + META-INF/services/** + META-INF/jersey-module-version + + com.fasterxml.jackson.*:*