Merge branch 'java8' into requested-shutdown-fix

This commit is contained in:
Pfifer, Justin 2017-06-08 07:20:23 -07:00
commit a3e4df6433
2 changed files with 6 additions and 6 deletions

View file

@ -1,6 +1,6 @@
language: java language: java
jdk: jdk:
- openjdk7 - openjdk8
- oraclejdk7
- oraclejdk8 - oraclejdk8
sudo: false sudo: false
dist: trusty

View file

@ -6,7 +6,7 @@
<artifactId>amazon-kinesis-client</artifactId> <artifactId>amazon-kinesis-client</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Amazon Kinesis Client Library for Java</name> <name>Amazon Kinesis Client Library for Java</name>
<version>1.7.5</version> <version>1.8.0-SNAPSHOT</version>
<description>The Amazon Kinesis Client Library for Java enables Java developers to easily consume and process data <description>The Amazon Kinesis Client Library for Java enables Java developers to easily consume and process data
from Amazon Kinesis. from Amazon Kinesis.
</description> </description>
@ -131,8 +131,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version> <version>3.2</version>
<configuration> <configuration>
<source>1.7</source> <source>1.8</source>
<target>1.7</target> <target>1.8</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>