Skip to content
This repository has been archived by the owner on Mar 21, 2022. It is now read-only.

build on jdk10, fix java 9+ incompatibilities #1068

Merged
merged 4 commits into from
Oct 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ language: java

jdk:
- oraclejdk8
- openjdk10

env:
global:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ Not yet released

- Change maven-compiler-plugin source and target from 1.7 to 1.8 to prepare for Java 8.
JAR should still be compatible with JRE 1.7.
- Updates to allow docker-client to function on Java 9+ ([1068][])

[1068]: https://github.com/spotify/docker-client/pull/1068

## 8.13.0

Expand Down
7 changes: 6 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@
<artifactId>jersey-media-json-jackson</artifactId>
<version>2.22.2</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
Expand Down Expand Up @@ -390,7 +395,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.5.201505241946</version>
<version>0.8.2</version>
<executions>
<execution>
<id>jacoco-initialize</id>
Expand Down