intesens · lxhoan · May 11, 2018 · Jun 13, 2017 · Jun 15, 2017 · Jun 15, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,18 @@
-language: java
 sudo: required
 
-jdk:
-  - oraclejdk8
-
-addons:
-  apt:
-    packages:
-      - oracle-java8-installer # Updates JDK 8 to the latest available.
-
 services:
   - docker
+
+# We test against all influxdb versions with the most actual JDK.
+# Test only the most recent influxdb version with JDK8 which will be legacy soon.
+env:
+  - MAVEN_JAVA_VERSION=3-jdk-10-slim INFLUXDB_VERSION=1.5
+  - MAVEN_JAVA_VERSION=3-jdk-10-slim INFLUXDB_VERSION=1.4
+  - MAVEN_JAVA_VERSION=3-jdk-10-slim INFLUXDB_VERSION=1.3
+  - MAVEN_JAVA_VERSION=3-jdk-10-slim INFLUXDB_VERSION=1.2
+  - MAVEN_JAVA_VERSION=3-jdk-10-slim INFLUXDB_VERSION=1.1
+  - MAVEN_JAVA_VERSION=3-jdk-8-slim INFLUXDB_VERSION=1.5
+
 script: ./compile-and-test.sh
 
 after_success:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,98 +1,135 @@
-## v2.7 [unreleased]
+# Changelog
 
-#### Features
+## 2.10 [unreleased]
 
- - Simplify write() methods for use cases writing all points to same database and retention policy [PR #327](https://github.com/influxdata/influxdb-java/pull/327)
+### Features
 
-#### Fixes
+- Support for parameter binding in queries ("prepared statements") [PR #429](https://github.com/influxdata/influxdb-java/pull/429)
 
- - Replace RuntimeException with InfluxDBException [Issue #323](https://github.com/influxdata/influxdb-java/issues/323)
+## 2.9 [2018-02-27]
 
-#### Improvements
+### Features
 
- - Significant (~35%) performance improvements for write speed with less memory footprint. [PR #330](https://github.com/influxdata/influxdb-java/pull/330)
- - Drop guava runtime dependency which reduces jar size from 1MB -> 49KB [PR #322](https://github.com/influxdata/influxdb-java/pull/322)
+- New extensible API to configure batching properties.  [PR #409] 
+- New configuration property 'jitter interval' to avoid multiple clients hit the server periodically at the same time. [PR #409] 
+- New strategy on handling errors, client performs retries writes when server gets overloaded [PR #410]
+- New exceptions give the client user easier way to classify errors reported by the server. [PR #410] 
 
-## v2.6 [2017.06-08]
+## 2.8 [2017-12-06]
 
-#### Features
+### Fixes
 
- - Switch to Java 1.8
- - Support chunking
- - Add a databaseExists method to InfluxDB interface
- - [Issue #289](https://github.com/influxdata/influxdb-java/issues/289) Batching enhancements: Pending asynchronous writes can be explicitly flushed via `InfluxDB.flush()`.
- - Add a listener to notify asynchronous errors during batch flushes [PR #318](https://github.com/influxdata/influxdb-java/pull/318).
+- InfluxDBResultMapper now is able to process QueryResult created when a GROUP BY clause was used [PR #345](https://github.com/influxdata/influxdb-java/pull/345)
+- InfluxDB will now handle the timestamp on its own if none is provided [PR#350](https://github.com/influxdata/influxdb-java/pull/350)
 
-#### Fixes
+### Features
 
- - [Issue #263](https://github.com/influxdata/influxdb-java/issues/263) Add databaseExists method to InfluxDB interface.
+- API: add InfluxDB#createRetentionPolicy and InfluxDB#dropRetentionPolicy to be able to create and drop Retention Policies [PR #351](https://github.com/influxdata/influxdb-java/pull/351)
+- API: add InfluxDB#query that uses callbacks
 
-#### Improvements
+### Improvements
 
- - Update retrofit from 2.1 to 2.2
- - Update slf4j from 1.7.22 to 1.7.24
- - Update okhttp3 from 3.5 to 3.6
- - automatically adjust batch processor capacity [PR #282](https://github.com/influxdata/influxdb-java/pull/282)
+- Build: all unit and integration test are now running with jdk8 and jdk9.
+- Test: migration to junit5
+
+## v2.7 [2017-06-26]
+
+### Features
+
+- Simplify write() methods for use cases writing all points to same database and retention policy [PR #327](https://github.com/influxdata/influxdb-java/pull/327)
+- QueryResult to Object mapper added [PR #341](https://github.com/influxdata/influxdb-java/pull/341)
+
+### Fixes
+
+- Replace RuntimeException with InfluxDBException [Issue #323](https://github.com/influxdata/influxdb-java/issues/323)
+
+### Improvements
+
+- Significant (~35%) performance improvements for write speed with less memory footprint. [PR #330](https://github.com/influxdata/influxdb-java/pull/330)
+- Drop guava runtime dependency which reduces jar size from 1MB -> 49KB [PR #322](https://github.com/influxdata/influxdb-java/pull/322)
+
+## v2.6 [2017-06-08]
+
+### Features
+
+- Switch to Java 1.8
+- Support chunking
+- Add a databaseExists method to InfluxDB interface
+- [Issue #289](https://github.com/influxdata/influxdb-java/issues/289) Batching enhancements: Pending asynchronous writes can be explicitly flushed via `InfluxDB.flush()`.
+- Add a listener to notify asynchronous errors during batch flushes [PR #318](https://github.com/influxdata/influxdb-java/pull/318).
+
+### Fixes
+
+- [Issue #263](https://github.com/influxdata/influxdb-java/issues/263) Add databaseExists method to InfluxDB interface.
+
+### Improvements
+
+- Update retrofit from 2.1 to 2.2
+- Update slf4j from 1.7.22 to 1.7.24
+- Update okhttp3 from 3.5 to 3.6
+- automatically adjust batch processor capacity [PR #282](https://github.com/influxdata/influxdb-java/pull/282)
 
 ## v2.5 [2016-12-05]
 
-#### Features
+### Features
 
- - Support writing by UDP protocal.
- - Support gzip compress for http request body.
- - Support setting thread factory for batch processor.
- - Support chunking
+- Support writing by UDP protocal.
+- Support gzip compress for http request body.
+- Support setting thread factory for batch processor.
+- Support chunking
 
-#### Fixes
+### Fixes
 
- - [Issue #162](https://github.com/influxdb/influxdb-java/issues/162) Write point using async batch mode with different rp will use same rp.
- - [Issue #214](https://github.com/influxdb/influxdb-java/issues/214) Send multiple queries in one query statement will get only one result.  
- - Write can't be always async if batch is enabled.
+- [Issue #162](https://github.com/influxdb/influxdb-java/issues/162) Write point using async batch mode with different rp will use same rp.
+- [Issue #214](https://github.com/influxdb/influxdb-java/issues/214) Send multiple queries in one query statement will get only one result.  
+- Write can't be always async if batch is enabled.
 
-#### Improvements
+### Improvements
 
- - Remove the limit for database name: not contain '-'.
- - Support creating influxdb instance without username and password.
- - Add time related util methods for converting influxdb timestamp or unix epoch time.
- - correct exception type when disable batch twice.
+- Remove the limit for database name: not contain '-'.
+- Support creating influxdb instance without username and password.
+- Add time related util methods for converting influxdb timestamp or unix epoch time.
+- correct exception type when disable batch twice.
 
 ## v2.4 [2016-10-24]
-#### Features
 
- - now uses okhttp3 and retrofit2. As a result, you can now pass an OkHttpClient.Builder to the InfluxDBFactory.connect if you wish to add more interceptors, etc, to OkHttp.
- - in InfluxDB 1.0.0, some queries now require a POST instead of GET. There is a flag on Query that allow this to be specified (default is still GET).
+### Features
+
+- now uses okhttp3 and retrofit2. As a result, you can now pass an OkHttpClient.Builder to the InfluxDBFactory.connect if you wish to add more interceptors, etc, to OkHttp.
+- in InfluxDB 1.0.0, some queries now require a POST instead of GET. There is a flag on Query that allow this to be specified (default is still GET).
 
 ## v2.2 [2016-04-11]
 
-#### Features
+### Features
+
+- Allow writing of pre-constructed line protocol strings
 
- - Allow writing of pre-constructed line protocol strings
+### Fixes
 
-#### Fixes
+- Correct escaping of database names for create and delete database actions
+- Many bug fixes / improvements in general
 
- - Correct escaping of database names for create and delete database actions
- - Many bug fixes / improvements in general
+### Other
 
-#### Other
- - Deprecated `field()` method in preference for `addField()` methods.
+- Deprecated `field()` method in preference for `addField()` methods.
 
 ## v2.1 [2015-12-05]
 
-#### Features
+### Features
 
- - Extensions to fluent builder classes
- - Convenience methods for building Points
- - Allow integer types as field values
+- Extensions to fluent builder classes
+- Convenience methods for building Points
+- Allow integer types as field values
 
-#### Fixes
+### Fixes
 
- - Fixed escaping of tag and field values
- - Always uses nanosecond precision for time
- - Uses NumberFormat class for safer formatting of large numbers.
+- Fixed escaping of tag and field values
+- Always uses nanosecond precision for time
+- Uses NumberFormat class for safer formatting of large numbers.
 
 ## v2.0 [2015-07-17]
 
-#### Features
+### Features
 
 - Compatible with InfluxDB version 0.9+
 - Support for lineprotocol
@@ -104,7 +141,7 @@ No major functional changes or improvements. Mainly library updates and code str
 
 ## v1.3 [2014-10-22]
 
-#### Features
+### Features
 
 - Compatible with InfluxDB Version up to 0.8
 - API: add a InfluxDB#createDatabase(DatabaseConfiguration) to be able to create a new Database with ShardSpaces defined.
@@ -117,12 +154,12 @@ No major functional changes or improvements. Mainly library updates and code str
 
 ## v1.2 [2014-06-28]
 
-#### Features
+### Features
 
 - [Issue #2](https://github.com/influxdb/influxdb-java/issues/2) Implement the last missing api calls ( interfaces, sync, forceCompaction, servers, shards)
 - use (http://square.github.io/okhttp/, okhttp) instead of java builtin httpconnection to get failover for the http endpoint.
 
-#### Tasks
+### Tasks
 
 - [Issue #8](https://github.com/influxdb/influxdb-java/issues/8) Use com.github.docker-java which replaces com.kpelykh for Integration tests.
 - [Issue #6](https://github.com/influxdb/influxdb-java/issues/6) Update Retrofit to 1.6.0
@@ -131,12 +168,12 @@ No major functional changes or improvements. Mainly library updates and code str
 
 ## v1.1 [2014-05-31]
 
-#### Features
+### Features
 
 - Add InfluxDB#version() to get the InfluxDB Server version information.
 - Changed InfluxDB#createDatabase() to match [Issue #489](https://github.com/influxdb/influxdb/issues/489) without replicationFactor.
 - Updated Retrofit from 1.5.0 -> 1.5.1
 
 ## v1.0 [2014-05-6]
 
-  * Initial Release
+- Initial Release
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) {{{year}}} {{{fullname}}}
+Copyright (c) 2014-2017 Stefan Majer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal