From 87d7ed2be091ba9285497f4250ebd1c43035c0b0 Mon Sep 17 00:00:00 2001
From: Yan Babitski <yan.babitski@gmail.com>
Date: Wed, 27 Mar 2019 01:01:34 -0700
Subject: [PATCH] all: update copyrights and configure license plugin

Update copyrights to include current year and also configure license plugin to work with current year

Fixes #515
---
 etc/checkstyle.xml                            |  2 +-
 etc/license-formatting.xml                    | 30 +++++++++++++++++++
 etc/license.txt                               |  2 +-
 etc/mvn-deploy-settings.xml                   |  4 +--
 etc/versions-rules.xml                        |  2 +-
 jetcd-all/pom.xml                             |  2 +-
 .../main/java/io/etcd/jetcd/all/JetcdAll.java |  4 +--
 .../java/io/etcd/jetcd/all/package-info.java  |  4 +--
 jetcd-common/pom.xml                          |  2 +-
 .../exception/ClosedClientException.java      |  4 +--
 .../ClosedKeepAliveListenerException.java     |  4 +--
 .../exception/ClosedSnapshotException.java    |  4 +--
 .../exception/ClosedWatcherException.java     |  4 +--
 .../common/exception/CompactedException.java  |  4 +--
 .../jetcd/common/exception/EtcdException.java |  4 +--
 .../exception/EtcdExceptionFactory.java       |  4 +--
 jetcd-core/pom.xml                            |  2 +-
 .../java/io/etcd/jetcd/AbstractResponse.java  |  4 +--
 .../src/main/java/io/etcd/jetcd/Auth.java     |  4 +--
 .../src/main/java/io/etcd/jetcd/AuthImpl.java |  4 +--
 .../main/java/io/etcd/jetcd/ByteSequence.java |  4 +--
 .../src/main/java/io/etcd/jetcd/Client.java   |  4 +--
 .../java/io/etcd/jetcd/ClientBuilder.java     |  4 +--
 .../etcd/jetcd/ClientConnectionManager.java   |  4 +--
 .../main/java/io/etcd/jetcd/ClientImpl.java   |  4 +--
 .../java/io/etcd/jetcd/CloseableClient.java   |  4 +--
 .../src/main/java/io/etcd/jetcd/Cluster.java  |  4 +--
 .../main/java/io/etcd/jetcd/ClusterImpl.java  |  4 +--
 .../main/java/io/etcd/jetcd/Constants.java    |  4 +--
 .../src/main/java/io/etcd/jetcd/KV.java       |  4 +--
 .../src/main/java/io/etcd/jetcd/KVImpl.java   |  4 +--
 .../src/main/java/io/etcd/jetcd/KeyValue.java |  4 +--
 .../src/main/java/io/etcd/jetcd/Lease.java    |  4 +--
 .../main/java/io/etcd/jetcd/LeaseImpl.java    |  4 +--
 .../src/main/java/io/etcd/jetcd/Lock.java     |  4 +--
 .../src/main/java/io/etcd/jetcd/LockImpl.java |  4 +--
 .../main/java/io/etcd/jetcd/Maintenance.java  |  4 +--
 .../java/io/etcd/jetcd/MaintenanceImpl.java   |  4 +--
 .../main/java/io/etcd/jetcd/Observers.java    |  4 +--
 .../src/main/java/io/etcd/jetcd/Response.java |  4 +--
 .../src/main/java/io/etcd/jetcd/Txn.java      |  4 +--
 .../src/main/java/io/etcd/jetcd/Util.java     |  4 +--
 .../src/main/java/io/etcd/jetcd/Watch.java    |  4 +--
 .../main/java/io/etcd/jetcd/WatchImpl.java    |  4 +--
 .../etcd/jetcd/auth/AuthDisableResponse.java  |  4 +--
 .../etcd/jetcd/auth/AuthEnableResponse.java   |  4 +--
 .../etcd/jetcd/auth/AuthRoleAddResponse.java  |  4 +--
 .../jetcd/auth/AuthRoleDeleteResponse.java    |  4 +--
 .../etcd/jetcd/auth/AuthRoleGetResponse.java  |  4 +--
 .../auth/AuthRoleGrantPermissionResponse.java |  4 +--
 .../etcd/jetcd/auth/AuthRoleListResponse.java |  4 +--
 .../AuthRoleRevokePermissionResponse.java     |  4 +--
 .../etcd/jetcd/auth/AuthUserAddResponse.java  |  4 +--
 .../auth/AuthUserChangePasswordResponse.java  |  4 +--
 .../jetcd/auth/AuthUserDeleteResponse.java    |  4 +--
 .../etcd/jetcd/auth/AuthUserGetResponse.java  |  4 +--
 .../jetcd/auth/AuthUserGrantRoleResponse.java |  4 +--
 .../etcd/jetcd/auth/AuthUserListResponse.java |  4 +--
 .../auth/AuthUserRevokeRoleResponse.java      |  4 +--
 .../java/io/etcd/jetcd/auth/Permission.java   |  4 +--
 .../java/io/etcd/jetcd/cluster/Member.java    |  4 +--
 .../etcd/jetcd/cluster/MemberAddResponse.java |  4 +--
 .../jetcd/cluster/MemberListResponse.java     |  4 +--
 .../jetcd/cluster/MemberRemoveResponse.java   |  4 +--
 .../jetcd/cluster/MemberUpdateResponse.java   |  4 +--
 .../main/java/io/etcd/jetcd/cluster/Util.java |  4 +--
 .../io/etcd/jetcd/kv/CompactResponse.java     |  4 +--
 .../java/io/etcd/jetcd/kv/DeleteResponse.java |  4 +--
 .../java/io/etcd/jetcd/kv/GetResponse.java    |  4 +--
 .../java/io/etcd/jetcd/kv/PutResponse.java    |  4 +--
 .../java/io/etcd/jetcd/kv/TxnResponse.java    |  4 +--
 .../etcd/jetcd/lease/LeaseGrantResponse.java  |  4 +--
 .../jetcd/lease/LeaseKeepAliveResponse.java   |  4 +--
 .../LeaseKeepAliveResponseWithError.java      |  4 +--
 .../etcd/jetcd/lease/LeaseRevokeResponse.java |  4 +--
 .../jetcd/lease/LeaseTimeToLiveResponse.java  |  4 +--
 .../jetcd/lease/NoSuchLeaseException.java     |  4 +--
 .../java/io/etcd/jetcd/lock/LockResponse.java |  4 +--
 .../io/etcd/jetcd/lock/UnlockResponse.java    |  4 +--
 .../etcd/jetcd/maintenance/AlarmMember.java   |  4 +--
 .../etcd/jetcd/maintenance/AlarmResponse.java |  4 +--
 .../io/etcd/jetcd/maintenance/AlarmType.java  |  4 +--
 .../jetcd/maintenance/DefragmentResponse.java |  4 +--
 .../jetcd/maintenance/HashKVResponse.java     |  4 +--
 .../jetcd/maintenance/MoveLeaderResponse.java |  4 +--
 .../SnapshotReaderResponseWithError.java      |  4 +--
 .../jetcd/maintenance/SnapshotResponse.java   |  4 +--
 .../jetcd/maintenance/StatusResponse.java     |  4 +--
 .../src/main/java/io/etcd/jetcd/op/Cmp.java   |  4 +--
 .../main/java/io/etcd/jetcd/op/CmpTarget.java |  4 +--
 .../src/main/java/io/etcd/jetcd/op/Op.java    |  4 +--
 .../main/java/io/etcd/jetcd/op/TxnImpl.java   |  4 +--
 .../io/etcd/jetcd/options/CompactOption.java  |  4 +--
 .../io/etcd/jetcd/options/DeleteOption.java   |  4 +--
 .../java/io/etcd/jetcd/options/GetOption.java |  4 +--
 .../io/etcd/jetcd/options/LeaseOption.java    |  4 +--
 .../io/etcd/jetcd/options/OptionsUtil.java    |  4 +--
 .../java/io/etcd/jetcd/options/PutOption.java |  4 +--
 .../io/etcd/jetcd/options/WatchOption.java    |  4 +--
 .../java/io/etcd/jetcd/watch/WatchEvent.java  |  4 +--
 .../io/etcd/jetcd/watch/WatchResponse.java    |  4 +--
 .../jetcd/watch/WatchResponseWithError.java   |  4 +--
 jetcd-core/src/main/proto/auth.proto          |  2 +-
 jetcd-core/src/main/proto/kv.proto            |  2 +-
 jetcd-core/src/main/proto/lock.proto          |  2 +-
 jetcd-core/src/main/proto/rpc.proto           |  2 +-
 .../java/io/etcd/jetcd/AuthClientTest.java    |  5 ++--
 .../java/io/etcd/jetcd/ClientBuilderTest.java |  5 ++--
 .../jetcd/ClientConnectionManagerTest.java    |  5 ++--
 .../java/io/etcd/jetcd/ClusterClientTest.java |  5 ++--
 .../java/io/etcd/jetcd/KVNamespaceTest.java   |  5 ++--
 .../src/test/java/io/etcd/jetcd/KVTest.java   |  5 ++--
 .../test/java/io/etcd/jetcd/LeaseTest.java    |  5 ++--
 .../java/io/etcd/jetcd/LeaseUnitTest.java     |  5 ++--
 .../java/io/etcd/jetcd/LoadBalancerTest.java  |  5 ++--
 .../src/test/java/io/etcd/jetcd/LockTest.java |  5 ++--
 .../java/io/etcd/jetcd/MaintenanceTest.java   |  5 ++--
 .../io/etcd/jetcd/MaintenanceUnitTest.java    |  5 ++--
 .../src/test/java/io/etcd/jetcd/SslTest.java  |  5 ++--
 .../src/test/java/io/etcd/jetcd/TestUtil.java |  5 ++--
 .../java/io/etcd/jetcd/TxnResponseTest.java   |  5 ++--
 .../java/io/etcd/jetcd/WatchResumeTest.java   |  5 ++--
 .../test/java/io/etcd/jetcd/WatchTest.java    |  5 ++--
 .../java/io/etcd/jetcd/WatchUnitTest.java     |  5 ++--
 .../test/java/io/etcd/jetcd/op/TxnTest.java   |  5 ++--
 jetcd-core/src/test/resources/log4j2.xml      |  2 +-
 jetcd-examples/jetcd-ctl/pom.xml              |  2 +-
 .../etcd/jetcd/examples/ctl/CommandGet.java   |  4 +--
 .../etcd/jetcd/examples/ctl/CommandPut.java   |  4 +--
 .../etcd/jetcd/examples/ctl/CommandWatch.java |  4 +--
 .../java/io/etcd/jetcd/examples/ctl/Main.java |  4 +--
 .../jetcd-ctl/src/main/resources/log4j2.xml   |  2 +-
 jetcd-examples/jetcd-watch/pom.xml            |  2 +-
 .../io/etcd/jetcd/examples/watch/Main.java    |  4 +--
 .../jetcd-watch/src/main/resources/log4j2.xml |  2 +-
 jetcd-examples/pom.xml                        |  2 +-
 jetcd-extensions/pom.xml                      |  2 +-
 .../io/etcd/jetcd/extensions/Extensions.java  |  4 +--
 jetcd-launcher-maven-plugin-test/pom.xml      |  2 +-
 .../launcher/maven/test/MavenPluginTest.java  |  4 +--
 jetcd-launcher-maven-plugin/pom.xml           |  2 +-
 .../etcd/jetcd/launcher/maven/Singleton.java  |  4 +--
 .../etcd/jetcd/launcher/maven/StartMojo.java  |  4 +--
 .../etcd/jetcd/launcher/maven/StopMojo.java   |  4 +--
 .../m2e/lifecycle-mapping-metadata.xml        |  2 +-
 jetcd-launcher/pom.xml                        |  2 +-
 .../io/etcd/jetcd/launcher/EtcdCluster.java   |  4 +--
 .../jetcd/launcher/EtcdClusterFactory.java    |  4 +--
 .../io/etcd/jetcd/launcher/EtcdContainer.java |  4 +--
 .../launcher/junit4/EtcdClusterResource.java  |  4 +--
 .../launcher/junit5/EtcdClusterExtension.java |  4 +--
 jetcd-osgi/jetcd-karaf/pom.xml                |  2 +-
 .../io/etcd/jetcd/karaf/package-info.java     |  4 +--
 .../src/main/resources/features.xml           |  2 +-
 .../etcd/jetcd/osgi/ClientServiceChecks.java  |  4 +--
 .../etcd/jetcd/osgi/PaxExamWrapperTest.java   |  4 +--
 .../java/io/etcd/jetcd/osgi/TestSupport.java  |  4 +--
 jetcd-osgi/jetcd-osgi/pom.xml                 |  2 +-
 .../io/etcd/jetcd/osgi/ClientService.java     |  4 +--
 .../jetcd/osgi/DnsSrvResolverService.java     |  4 +--
 jetcd-osgi/pom.xml                            |  2 +-
 jetcd-resolver-dns-srv/pom.xml                |  2 +-
 .../resolver/dnssrv/DnsSrvUriResolver.java    |  4 +--
 .../resolver/dnssrv/NameResolverTest.java     |  5 ++--
 .../src/test/resources/log4j2.xml             |  2 +-
 jetcd-resolver/pom.xml                        |  2 +-
 .../jetcd/resolver/DirectUriResolver.java     |  4 +--
 .../jetcd/resolver/SmartNameResolver.java     |  4 +--
 .../resolver/SmartNameResolverFactory.java    |  4 +--
 .../io/etcd/jetcd/resolver/URIResolver.java   |  4 +--
 .../jetcd/resolver/URIResolverLoader.java     |  4 +--
 .../etcd/jetcd/resolver/NameResolverTest.java |  5 ++--
 pom.xml                                       | 17 ++++++++++-
 173 files changed, 380 insertions(+), 316 deletions(-)
 create mode 100644 etc/license-formatting.xml

diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
index 8a5652dd0..ec31aff80 100644
--- a/etc/checkstyle.xml
+++ b/etc/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/etc/license-formatting.xml b/etc/license-formatting.xml
new file mode 100644
index 000000000..70e25f0ef
--- /dev/null
+++ b/etc/license-formatting.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2016-2019 The jetcd authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<additionalHeaders>
+    <SLASHSTART_WITH_BLANKLINE_STYLE>
+        <firstLine><![CDATA[/*]]></firstLine>
+        <beforeEachLine><![CDATA[ * ]]></beforeEachLine>
+        <endLine><![CDATA[ */EOL]]></endLine>
+        <firstLineDetectionPattern><![CDATA[(EOL)*(\s|\t)*/\*.*$]]></firstLineDetectionPattern>
+        <lastLineDetectionPattern><![CDATA[.*\*/(\s|\t)*$]]></lastLineDetectionPattern>
+        <allowBlankLines>false</allowBlankLines>
+        <isMultiline>true</isMultiline>
+        <padLines>false</padLines>
+    </SLASHSTART_WITH_BLANKLINE_STYLE>
+</additionalHeaders>
diff --git a/etc/license.txt b/etc/license.txt
index 0f263d249..e47455a1c 100644
--- a/etc/license.txt
+++ b/etc/license.txt
@@ -1,4 +1,4 @@
-Copyright 2017 The jetcd authors
+Copyright ${license.git.copyrightYears} The jetcd authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/etc/mvn-deploy-settings.xml b/etc/mvn-deploy-settings.xml
index bff92a392..e37948fa0 100644
--- a/etc/mvn-deploy-settings.xml
+++ b/etc/mvn-deploy-settings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,7 +16,6 @@
     limitations under the License.
 
 -->
-
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="
diff --git a/etc/versions-rules.xml b/etc/versions-rules.xml
index 01e03ac0e..be00c08ba 100644
--- a/etc/versions-rules.xml
+++ b/etc/versions-rules.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-all/pom.xml b/jetcd-all/pom.xml
index c24c99683..924f68823 100644
--- a/jetcd-all/pom.xml
+++ b/jetcd-all/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-all/src/main/java/io/etcd/jetcd/all/JetcdAll.java b/jetcd-all/src/main/java/io/etcd/jetcd/all/JetcdAll.java
index da1bd8910..8e579bda1 100644
--- a/jetcd-all/src/main/java/io/etcd/jetcd/all/JetcdAll.java
+++ b/jetcd-all/src/main/java/io/etcd/jetcd/all/JetcdAll.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-all/src/main/java/io/etcd/jetcd/all/package-info.java b/jetcd-all/src/main/java/io/etcd/jetcd/all/package-info.java
index 508feb800..fdf72d30b 100644
--- a/jetcd-all/src/main/java/io/etcd/jetcd/all/package-info.java
+++ b/jetcd-all/src/main/java/io/etcd/jetcd/all/package-info.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-common/pom.xml b/jetcd-common/pom.xml
index a3d09dc8d..577d043da 100644
--- a/jetcd-common/pom.xml
+++ b/jetcd-common/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedClientException.java b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedClientException.java
index 72d5a6f28..701e4c8e1 100644
--- a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedClientException.java
+++ b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedClientException.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedKeepAliveListenerException.java b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedKeepAliveListenerException.java
index 0c2adac2e..6816c2f1a 100644
--- a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedKeepAliveListenerException.java
+++ b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedKeepAliveListenerException.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedSnapshotException.java b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedSnapshotException.java
index ee83570bd..f708fafc3 100644
--- a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedSnapshotException.java
+++ b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedSnapshotException.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedWatcherException.java b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedWatcherException.java
index 1d72af1dc..884796d63 100644
--- a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedWatcherException.java
+++ b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/ClosedWatcherException.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/CompactedException.java b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/CompactedException.java
index d965408b5..6c559d084 100644
--- a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/CompactedException.java
+++ b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/CompactedException.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/EtcdException.java b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/EtcdException.java
index 46c9b238b..3c42491b9 100644
--- a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/EtcdException.java
+++ b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/EtcdException.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/EtcdExceptionFactory.java b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/EtcdExceptionFactory.java
index 45a7b2581..0076c86e3 100644
--- a/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/EtcdExceptionFactory.java
+++ b/jetcd-common/src/main/java/io/etcd/jetcd/common/exception/EtcdExceptionFactory.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/pom.xml b/jetcd-core/pom.xml
index 517f9c1ff..f45980cd1 100644
--- a/jetcd-core/pom.xml
+++ b/jetcd-core/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/AbstractResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/AbstractResponse.java
index 57a39abab..1baed24a5 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/AbstractResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/AbstractResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Auth.java b/jetcd-core/src/main/java/io/etcd/jetcd/Auth.java
index 70dcb2751..d487d3b6d 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Auth.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Auth.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/AuthImpl.java b/jetcd-core/src/main/java/io/etcd/jetcd/AuthImpl.java
index 950fca28e..94712b55e 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/AuthImpl.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/AuthImpl.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/ByteSequence.java b/jetcd-core/src/main/java/io/etcd/jetcd/ByteSequence.java
index 4e791cfde..604661a9c 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/ByteSequence.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/ByteSequence.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Client.java b/jetcd-core/src/main/java/io/etcd/jetcd/Client.java
index 37b488faa..c70ef8105 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Client.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Client.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/ClientBuilder.java b/jetcd-core/src/main/java/io/etcd/jetcd/ClientBuilder.java
index f1b80c953..2ea518692 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/ClientBuilder.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/ClientBuilder.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/ClientConnectionManager.java b/jetcd-core/src/main/java/io/etcd/jetcd/ClientConnectionManager.java
index a7b9e0ec9..341db3a23 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/ClientConnectionManager.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/ClientConnectionManager.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/ClientImpl.java b/jetcd-core/src/main/java/io/etcd/jetcd/ClientImpl.java
index 8664fca0c..ad2558fde 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/ClientImpl.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/ClientImpl.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/CloseableClient.java b/jetcd-core/src/main/java/io/etcd/jetcd/CloseableClient.java
index 1aba1ac12..6345c615b 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/CloseableClient.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/CloseableClient.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Cluster.java b/jetcd-core/src/main/java/io/etcd/jetcd/Cluster.java
index cc1efc185..007c83e62 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Cluster.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Cluster.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/ClusterImpl.java b/jetcd-core/src/main/java/io/etcd/jetcd/ClusterImpl.java
index 006f8bf16..57415012b 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/ClusterImpl.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/ClusterImpl.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Constants.java b/jetcd-core/src/main/java/io/etcd/jetcd/Constants.java
index 5a1f3c85e..8953d91a7 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Constants.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Constants.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/KV.java b/jetcd-core/src/main/java/io/etcd/jetcd/KV.java
index a05a7c6dd..987d00fd6 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/KV.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/KV.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/KVImpl.java b/jetcd-core/src/main/java/io/etcd/jetcd/KVImpl.java
index 73a5b360e..8a5f7e289 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/KVImpl.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/KVImpl.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/KeyValue.java b/jetcd-core/src/main/java/io/etcd/jetcd/KeyValue.java
index 144e1100a..f492cadc2 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/KeyValue.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/KeyValue.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Lease.java b/jetcd-core/src/main/java/io/etcd/jetcd/Lease.java
index 98de8b3a2..898f74b4a 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Lease.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Lease.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/LeaseImpl.java b/jetcd-core/src/main/java/io/etcd/jetcd/LeaseImpl.java
index 682a23160..aaa334d54 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/LeaseImpl.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/LeaseImpl.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Lock.java b/jetcd-core/src/main/java/io/etcd/jetcd/Lock.java
index 2d17b5830..4fb689134 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Lock.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Lock.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/LockImpl.java b/jetcd-core/src/main/java/io/etcd/jetcd/LockImpl.java
index a3370cf45..8caee0f0d 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/LockImpl.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/LockImpl.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Maintenance.java b/jetcd-core/src/main/java/io/etcd/jetcd/Maintenance.java
index 91a1b5eed..23e463d3b 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Maintenance.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Maintenance.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/MaintenanceImpl.java b/jetcd-core/src/main/java/io/etcd/jetcd/MaintenanceImpl.java
index 23055a81f..36e986bd9 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/MaintenanceImpl.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/MaintenanceImpl.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Observers.java b/jetcd-core/src/main/java/io/etcd/jetcd/Observers.java
index 513d8e0be..a9411ceb8 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Observers.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Observers.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Response.java b/jetcd-core/src/main/java/io/etcd/jetcd/Response.java
index d4aeba601..3352d3c6c 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Response.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Response.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Txn.java b/jetcd-core/src/main/java/io/etcd/jetcd/Txn.java
index 894de229c..b52a05b9f 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Txn.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Txn.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Util.java b/jetcd-core/src/main/java/io/etcd/jetcd/Util.java
index 5a46d4a19..76738e080 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Util.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Util.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/Watch.java b/jetcd-core/src/main/java/io/etcd/jetcd/Watch.java
index 9575dafdf..ac10da1d1 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/Watch.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/Watch.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/WatchImpl.java b/jetcd-core/src/main/java/io/etcd/jetcd/WatchImpl.java
index 82f55c7e1..88ef17b38 100755
--- a/jetcd-core/src/main/java/io/etcd/jetcd/WatchImpl.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/WatchImpl.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthDisableResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthDisableResponse.java
index 4c73db49d..239385b1c 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthDisableResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthDisableResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthEnableResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthEnableResponse.java
index 9e0a27346..77594d833 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthEnableResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthEnableResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleAddResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleAddResponse.java
index 3c71cec9b..9c823f9e7 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleAddResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleAddResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleDeleteResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleDeleteResponse.java
index 4dec89924..5a32c3285 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleDeleteResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleDeleteResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleGetResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleGetResponse.java
index 4473a2b7a..df2b5ab8a 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleGetResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleGetResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleGrantPermissionResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleGrantPermissionResponse.java
index 3342d27df..c5a118dc1 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleGrantPermissionResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleGrantPermissionResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleListResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleListResponse.java
index e806409c2..830012a51 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleListResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleListResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleRevokePermissionResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleRevokePermissionResponse.java
index ca2d4b807..3ce41d762 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleRevokePermissionResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthRoleRevokePermissionResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserAddResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserAddResponse.java
index e1e3ef655..bc17802d6 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserAddResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserAddResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserChangePasswordResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserChangePasswordResponse.java
index 770d8f5b2..95e7e8b54 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserChangePasswordResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserChangePasswordResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserDeleteResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserDeleteResponse.java
index b21916cb7..52bc35486 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserDeleteResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserDeleteResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserGetResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserGetResponse.java
index e704cca5f..df5110e00 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserGetResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserGetResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserGrantRoleResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserGrantRoleResponse.java
index 43e6a5a8b..0cfa6904b 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserGrantRoleResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserGrantRoleResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserListResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserListResponse.java
index 386355a0f..b676da184 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserListResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserListResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserRevokeRoleResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserRevokeRoleResponse.java
index c186e6a21..f9a2665d3 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserRevokeRoleResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/AuthUserRevokeRoleResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/auth/Permission.java b/jetcd-core/src/main/java/io/etcd/jetcd/auth/Permission.java
index 8fa0e8481..de8029d81 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/auth/Permission.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/auth/Permission.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/Member.java b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/Member.java
index 271dd4d9a..30eb12aa8 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/Member.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/Member.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberAddResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberAddResponse.java
index 5934d5d20..53e19cc28 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberAddResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberAddResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberListResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberListResponse.java
index 935aea8ae..542fbd272 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberListResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberListResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberRemoveResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberRemoveResponse.java
index 8d906d7b6..3f9bda05c 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberRemoveResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberRemoveResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberUpdateResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberUpdateResponse.java
index 8a7378536..890ed41d9 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberUpdateResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/MemberUpdateResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/Util.java b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/Util.java
index 6a2ecc37c..c6321a073 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/cluster/Util.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/cluster/Util.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/kv/CompactResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/kv/CompactResponse.java
index a0dccbdf1..714083dab 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/kv/CompactResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/kv/CompactResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/kv/DeleteResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/kv/DeleteResponse.java
index 3ef74774c..747750753 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/kv/DeleteResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/kv/DeleteResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/kv/GetResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/kv/GetResponse.java
index b4b721e4e..8ccdc8755 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/kv/GetResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/kv/GetResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/kv/PutResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/kv/PutResponse.java
index 5493f2cf5..e1ea995bb 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/kv/PutResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/kv/PutResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/kv/TxnResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/kv/TxnResponse.java
index 269a0029e..5d2353f76 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/kv/TxnResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/kv/TxnResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseGrantResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseGrantResponse.java
index bebe7c37c..5b2e408d6 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseGrantResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseGrantResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseKeepAliveResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseKeepAliveResponse.java
index 6f318caee..6d37cdab7 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseKeepAliveResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseKeepAliveResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseKeepAliveResponseWithError.java b/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseKeepAliveResponseWithError.java
index 8ec586c1d..3f647ade8 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseKeepAliveResponseWithError.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseKeepAliveResponseWithError.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseRevokeResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseRevokeResponse.java
index 1395872c9..952ad2493 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseRevokeResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseRevokeResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseTimeToLiveResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseTimeToLiveResponse.java
index 22eb4196c..e42667e59 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseTimeToLiveResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/lease/LeaseTimeToLiveResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/lease/NoSuchLeaseException.java b/jetcd-core/src/main/java/io/etcd/jetcd/lease/NoSuchLeaseException.java
index 04b5c6868..6a982ae56 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/lease/NoSuchLeaseException.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/lease/NoSuchLeaseException.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/lock/LockResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/lock/LockResponse.java
index ffd59726d..2f6260610 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/lock/LockResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/lock/LockResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/lock/UnlockResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/lock/UnlockResponse.java
index 486737257..de0ab5e07 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/lock/UnlockResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/lock/UnlockResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmMember.java b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmMember.java
index 915dcf277..746a19d6d 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmMember.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmMember.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmResponse.java
index d2ad05331..ab4041933 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmType.java b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmType.java
index 192e426ac..4827a5229 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmType.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/AlarmType.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/DefragmentResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/DefragmentResponse.java
index d79012afb..b4a12fe5a 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/DefragmentResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/DefragmentResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/HashKVResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/HashKVResponse.java
index 8060bc6a1..71afad37c 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/HashKVResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/HashKVResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/MoveLeaderResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/MoveLeaderResponse.java
index c7b27bf86..fae672bc6 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/MoveLeaderResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/MoveLeaderResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/SnapshotReaderResponseWithError.java b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/SnapshotReaderResponseWithError.java
index e00e46139..4127c67ad 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/SnapshotReaderResponseWithError.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/SnapshotReaderResponseWithError.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/SnapshotResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/SnapshotResponse.java
index ff28067e0..1f8154069 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/SnapshotResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/SnapshotResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/StatusResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/StatusResponse.java
index 371c3fee6..e1ee30e23 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/StatusResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/maintenance/StatusResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/op/Cmp.java b/jetcd-core/src/main/java/io/etcd/jetcd/op/Cmp.java
index 13e9f5687..9db66fd34 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/op/Cmp.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/op/Cmp.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/op/CmpTarget.java b/jetcd-core/src/main/java/io/etcd/jetcd/op/CmpTarget.java
index 67f67a651..6c777afc5 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/op/CmpTarget.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/op/CmpTarget.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/op/Op.java b/jetcd-core/src/main/java/io/etcd/jetcd/op/Op.java
index 1d8afd7e5..f1c204e39 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/op/Op.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/op/Op.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/op/TxnImpl.java b/jetcd-core/src/main/java/io/etcd/jetcd/op/TxnImpl.java
index e3cf8ff85..a7a11b891 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/op/TxnImpl.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/op/TxnImpl.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/options/CompactOption.java b/jetcd-core/src/main/java/io/etcd/jetcd/options/CompactOption.java
index 3cc60da3b..bd88fa75e 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/options/CompactOption.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/options/CompactOption.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/options/DeleteOption.java b/jetcd-core/src/main/java/io/etcd/jetcd/options/DeleteOption.java
index 691fb144e..17759402d 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/options/DeleteOption.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/options/DeleteOption.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/options/GetOption.java b/jetcd-core/src/main/java/io/etcd/jetcd/options/GetOption.java
index 22bb5843f..7c85ef47b 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/options/GetOption.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/options/GetOption.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/options/LeaseOption.java b/jetcd-core/src/main/java/io/etcd/jetcd/options/LeaseOption.java
index eb57b862b..7a023c771 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/options/LeaseOption.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/options/LeaseOption.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/options/OptionsUtil.java b/jetcd-core/src/main/java/io/etcd/jetcd/options/OptionsUtil.java
index 9944734ee..9d8cf0d55 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/options/OptionsUtil.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/options/OptionsUtil.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/options/PutOption.java b/jetcd-core/src/main/java/io/etcd/jetcd/options/PutOption.java
index b2538e3f9..c6ecaf1ca 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/options/PutOption.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/options/PutOption.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/options/WatchOption.java b/jetcd-core/src/main/java/io/etcd/jetcd/options/WatchOption.java
index 0c3ba2420..918ff757b 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/options/WatchOption.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/options/WatchOption.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchEvent.java b/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchEvent.java
index 73a0b06a4..6b873c9d2 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchEvent.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchEvent.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchResponse.java b/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchResponse.java
index 52d84e256..531e83959 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchResponse.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchResponse.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchResponseWithError.java b/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchResponseWithError.java
index 4ba48bce2..b0aeffea5 100644
--- a/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchResponseWithError.java
+++ b/jetcd-core/src/main/java/io/etcd/jetcd/watch/WatchResponseWithError.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/proto/auth.proto b/jetcd-core/src/main/proto/auth.proto
index 4f49719cc..5dd3f1e81 100644
--- a/jetcd-core/src/main/proto/auth.proto
+++ b/jetcd-core/src/main/proto/auth.proto
@@ -1,5 +1,5 @@
 //
-// Copyright 2017 The jetcd authors
+// Copyright 2016-2019 The jetcd authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/proto/kv.proto b/jetcd-core/src/main/proto/kv.proto
index f42708a08..3faa50ce4 100644
--- a/jetcd-core/src/main/proto/kv.proto
+++ b/jetcd-core/src/main/proto/kv.proto
@@ -1,5 +1,5 @@
 //
-// Copyright 2017 The jetcd authors
+// Copyright 2016-2019 The jetcd authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/proto/lock.proto b/jetcd-core/src/main/proto/lock.proto
index dd13ffbf2..0682e6223 100644
--- a/jetcd-core/src/main/proto/lock.proto
+++ b/jetcd-core/src/main/proto/lock.proto
@@ -1,5 +1,5 @@
 //
-// Copyright 2017 The jetcd authors
+// Copyright 2016-2019 The jetcd authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/main/proto/rpc.proto b/jetcd-core/src/main/proto/rpc.proto
index 2a1f20310..e9ee904da 100644
--- a/jetcd-core/src/main/proto/rpc.proto
+++ b/jetcd-core/src/main/proto/rpc.proto
@@ -1,5 +1,5 @@
 //
-// Copyright 2017 The jetcd authors
+// Copyright 2016-2019 The jetcd authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/AuthClientTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/AuthClientTest.java
index 106d412c3..ab1e940b5 100755
--- a/jetcd-core/src/test/java/io/etcd/jetcd/AuthClientTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/AuthClientTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static io.etcd.jetcd.TestUtil.bytesOf;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/ClientBuilderTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/ClientBuilderTest.java
index d2f934e89..2a15f9adf 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/ClientBuilderTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/ClientBuilderTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static io.etcd.jetcd.TestUtil.bytesOf;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/ClientConnectionManagerTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/ClientConnectionManagerTest.java
index 8f8b24b96..735b0e3cb 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/ClientConnectionManagerTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/ClientConnectionManagerTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static io.etcd.jetcd.TestUtil.bytesOf;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/ClusterClientTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/ClusterClientTest.java
index e161b4700..67d9868d1 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/ClusterClientTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/ClusterClientTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/KVNamespaceTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/KVNamespaceTest.java
index e2646b381..8c8457081 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/KVNamespaceTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/KVNamespaceTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import com.google.protobuf.ByteString;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/KVTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/KVTest.java
index f91115d66..fb684e551 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/KVTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/KVTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static com.google.common.base.Charsets.UTF_8;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/LeaseTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/LeaseTest.java
index 64d3323cb..175a50b16 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/LeaseTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/LeaseTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/LeaseUnitTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/LeaseUnitTest.java
index d23014f89..cbfcb786e 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/LeaseUnitTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/LeaseUnitTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static io.etcd.jetcd.common.exception.EtcdExceptionFactory.toEtcdException;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/LoadBalancerTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/LoadBalancerTest.java
index f1a92b4af..ec3318ddd 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/LoadBalancerTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/LoadBalancerTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/LockTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/LockTest.java
index c33484083..0170217f4 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/LockTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/LockTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import com.google.common.base.Charsets;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/MaintenanceTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/MaintenanceTest.java
index df732555e..d69d69e44 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/MaintenanceTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/MaintenanceTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/MaintenanceUnitTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/MaintenanceUnitTest.java
index 5f5efeccc..b82085d9b 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/MaintenanceUnitTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/MaintenanceUnitTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/SslTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/SslTest.java
index 3c11ef3b5..7bbc32f0a 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/SslTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/SslTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static io.etcd.jetcd.TestUtil.bytesOf;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/TestUtil.java b/jetcd-core/src/test/java/io/etcd/jetcd/TestUtil.java
index 84debb858..6f29a55c2 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/TestUtil.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/TestUtil.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/TxnResponseTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/TxnResponseTest.java
index 9a50775c4..e378e2781 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/TxnResponseTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/TxnResponseTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/WatchResumeTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/WatchResumeTest.java
index ce4ac7b5b..2cfe1ce3b 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/WatchResumeTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/WatchResumeTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/WatchTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/WatchTest.java
index 017140b24..0ae3ed43a 100755
--- a/jetcd-core/src/test/java/io/etcd/jetcd/WatchTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/WatchTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static io.etcd.jetcd.TestUtil.bytesOf;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/WatchUnitTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/WatchUnitTest.java
index 3a0d357f4..a75382f3a 100755
--- a/jetcd-core/src/test/java/io/etcd/jetcd/WatchUnitTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/WatchUnitTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd;
 
 import static io.etcd.jetcd.TestUtil.bytesOf;
diff --git a/jetcd-core/src/test/java/io/etcd/jetcd/op/TxnTest.java b/jetcd-core/src/test/java/io/etcd/jetcd/op/TxnTest.java
index fde8548ca..7f38a07ff 100644
--- a/jetcd-core/src/test/java/io/etcd/jetcd/op/TxnTest.java
+++ b/jetcd-core/src/test/java/io/etcd/jetcd/op/TxnTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd.op;
 
 import static io.etcd.jetcd.TestUtil.bytesOf;
diff --git a/jetcd-core/src/test/resources/log4j2.xml b/jetcd-core/src/test/resources/log4j2.xml
index 8efad6bb0..d2a44c1ec 100644
--- a/jetcd-core/src/test/resources/log4j2.xml
+++ b/jetcd-core/src/test/resources/log4j2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-examples/jetcd-ctl/pom.xml b/jetcd-examples/jetcd-ctl/pom.xml
index 06e656b76..01440a9d8 100644
--- a/jetcd-examples/jetcd-ctl/pom.xml
+++ b/jetcd-examples/jetcd-ctl/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandGet.java b/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandGet.java
index 75fc87094..c6f7c857d 100644
--- a/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandGet.java
+++ b/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandGet.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandPut.java b/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandPut.java
index edd620d1b..93f99c121 100644
--- a/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandPut.java
+++ b/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandPut.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandWatch.java b/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandWatch.java
index 10216f3a8..0c0790c05 100644
--- a/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandWatch.java
+++ b/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/CommandWatch.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/Main.java b/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/Main.java
index d587895e6..99717ddbf 100644
--- a/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/Main.java
+++ b/jetcd-examples/jetcd-ctl/src/main/java/io/etcd/jetcd/examples/ctl/Main.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-examples/jetcd-ctl/src/main/resources/log4j2.xml b/jetcd-examples/jetcd-ctl/src/main/resources/log4j2.xml
index f93f04e70..cc77d34c1 100644
--- a/jetcd-examples/jetcd-ctl/src/main/resources/log4j2.xml
+++ b/jetcd-examples/jetcd-ctl/src/main/resources/log4j2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-examples/jetcd-watch/pom.xml b/jetcd-examples/jetcd-watch/pom.xml
index d4242fdc1..b1bda6f8c 100644
--- a/jetcd-examples/jetcd-watch/pom.xml
+++ b/jetcd-examples/jetcd-watch/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-examples/jetcd-watch/src/main/java/io/etcd/jetcd/examples/watch/Main.java b/jetcd-examples/jetcd-watch/src/main/java/io/etcd/jetcd/examples/watch/Main.java
index 342efb201..20788fd87 100644
--- a/jetcd-examples/jetcd-watch/src/main/java/io/etcd/jetcd/examples/watch/Main.java
+++ b/jetcd-examples/jetcd-watch/src/main/java/io/etcd/jetcd/examples/watch/Main.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-examples/jetcd-watch/src/main/resources/log4j2.xml b/jetcd-examples/jetcd-watch/src/main/resources/log4j2.xml
index abd3ca3e7..87c9f34f8 100644
--- a/jetcd-examples/jetcd-watch/src/main/resources/log4j2.xml
+++ b/jetcd-examples/jetcd-watch/src/main/resources/log4j2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-examples/pom.xml b/jetcd-examples/pom.xml
index 813149c20..bf0aade07 100644
--- a/jetcd-examples/pom.xml
+++ b/jetcd-examples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-extensions/pom.xml b/jetcd-extensions/pom.xml
index dab9085b8..3b785dd15 100644
--- a/jetcd-extensions/pom.xml
+++ b/jetcd-extensions/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-extensions/src/main/java/io/etcd/jetcd/extensions/Extensions.java b/jetcd-extensions/src/main/java/io/etcd/jetcd/extensions/Extensions.java
index 5438aecff..25899eaef 100644
--- a/jetcd-extensions/src/main/java/io/etcd/jetcd/extensions/Extensions.java
+++ b/jetcd-extensions/src/main/java/io/etcd/jetcd/extensions/Extensions.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher-maven-plugin-test/pom.xml b/jetcd-launcher-maven-plugin-test/pom.xml
index 6639d2e7e..77c7cfb8f 100644
--- a/jetcd-launcher-maven-plugin-test/pom.xml
+++ b/jetcd-launcher-maven-plugin-test/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher-maven-plugin-test/src/test/java/io/etcd/jetcd/launcher/maven/test/MavenPluginTest.java b/jetcd-launcher-maven-plugin-test/src/test/java/io/etcd/jetcd/launcher/maven/test/MavenPluginTest.java
index a9f4facde..a2969d270 100644
--- a/jetcd-launcher-maven-plugin-test/src/test/java/io/etcd/jetcd/launcher/maven/test/MavenPluginTest.java
+++ b/jetcd-launcher-maven-plugin-test/src/test/java/io/etcd/jetcd/launcher/maven/test/MavenPluginTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher-maven-plugin/pom.xml b/jetcd-launcher-maven-plugin/pom.xml
index e22d3875b..8c453e6de 100644
--- a/jetcd-launcher-maven-plugin/pom.xml
+++ b/jetcd-launcher-maven-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/Singleton.java b/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/Singleton.java
index 49cc1dbd1..886b1ca77 100644
--- a/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/Singleton.java
+++ b/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/Singleton.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/StartMojo.java b/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/StartMojo.java
index 6e704a9be..93a0d1e0c 100644
--- a/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/StartMojo.java
+++ b/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/StartMojo.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/StopMojo.java b/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/StopMojo.java
index 7db681693..8f1c628f8 100644
--- a/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/StopMojo.java
+++ b/jetcd-launcher-maven-plugin/src/main/java/io/etcd/jetcd/launcher/maven/StopMojo.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/jetcd-launcher-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
index 115a92b54..3576e3899 100644
--- a/jetcd-launcher-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
+++ b/jetcd-launcher-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher/pom.xml b/jetcd-launcher/pom.xml
index 928e844b8..d9e0e6026 100644
--- a/jetcd-launcher/pom.xml
+++ b/jetcd-launcher/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdCluster.java b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdCluster.java
index c9fef3edd..d75f4f64a 100644
--- a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdCluster.java
+++ b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdCluster.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdClusterFactory.java b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdClusterFactory.java
index 73e0eaa4e..8d7c6c7a7 100644
--- a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdClusterFactory.java
+++ b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdClusterFactory.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdContainer.java b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdContainer.java
index bafbf1c6f..65b3cb4e7 100644
--- a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdContainer.java
+++ b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/EtcdContainer.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/junit4/EtcdClusterResource.java b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/junit4/EtcdClusterResource.java
index 25cf64564..727461abb 100644
--- a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/junit4/EtcdClusterResource.java
+++ b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/junit4/EtcdClusterResource.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/junit5/EtcdClusterExtension.java b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/junit5/EtcdClusterExtension.java
index 712d5f59a..b04ce9612 100644
--- a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/junit5/EtcdClusterExtension.java
+++ b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/junit5/EtcdClusterExtension.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-osgi/jetcd-karaf/pom.xml b/jetcd-osgi/jetcd-karaf/pom.xml
index 2362235ee..ca5b40df7 100644
--- a/jetcd-osgi/jetcd-karaf/pom.xml
+++ b/jetcd-osgi/jetcd-karaf/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-osgi/jetcd-karaf/src/main/java/io/etcd/jetcd/karaf/package-info.java b/jetcd-osgi/jetcd-karaf/src/main/java/io/etcd/jetcd/karaf/package-info.java
index a859c69d0..1c027b308 100644
--- a/jetcd-osgi/jetcd-karaf/src/main/java/io/etcd/jetcd/karaf/package-info.java
+++ b/jetcd-osgi/jetcd-karaf/src/main/java/io/etcd/jetcd/karaf/package-info.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-osgi/jetcd-karaf/src/main/resources/features.xml b/jetcd-osgi/jetcd-karaf/src/main/resources/features.xml
index 0f776c174..981db0604 100644
--- a/jetcd-osgi/jetcd-karaf/src/main/resources/features.xml
+++ b/jetcd-osgi/jetcd-karaf/src/main/resources/features.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/ClientServiceChecks.java b/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/ClientServiceChecks.java
index 53cf08740..90b460d9b 100644
--- a/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/ClientServiceChecks.java
+++ b/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/ClientServiceChecks.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/PaxExamWrapperTest.java b/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/PaxExamWrapperTest.java
index 05405bbca..4acc7b362 100644
--- a/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/PaxExamWrapperTest.java
+++ b/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/PaxExamWrapperTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/TestSupport.java b/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/TestSupport.java
index 31e4eff4c..27c1c1808 100644
--- a/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/TestSupport.java
+++ b/jetcd-osgi/jetcd-karaf/src/test/java/io/etcd/jetcd/osgi/TestSupport.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-osgi/jetcd-osgi/pom.xml b/jetcd-osgi/jetcd-osgi/pom.xml
index 888d910b1..77c2df310 100644
--- a/jetcd-osgi/jetcd-osgi/pom.xml
+++ b/jetcd-osgi/jetcd-osgi/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-osgi/jetcd-osgi/src/main/java/io/etcd/jetcd/osgi/ClientService.java b/jetcd-osgi/jetcd-osgi/src/main/java/io/etcd/jetcd/osgi/ClientService.java
index 08eaf0ae4..bf69f20f4 100644
--- a/jetcd-osgi/jetcd-osgi/src/main/java/io/etcd/jetcd/osgi/ClientService.java
+++ b/jetcd-osgi/jetcd-osgi/src/main/java/io/etcd/jetcd/osgi/ClientService.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-osgi/jetcd-osgi/src/main/java/io/etcd/jetcd/osgi/DnsSrvResolverService.java b/jetcd-osgi/jetcd-osgi/src/main/java/io/etcd/jetcd/osgi/DnsSrvResolverService.java
index 74c5b1248..8b7eef4eb 100644
--- a/jetcd-osgi/jetcd-osgi/src/main/java/io/etcd/jetcd/osgi/DnsSrvResolverService.java
+++ b/jetcd-osgi/jetcd-osgi/src/main/java/io/etcd/jetcd/osgi/DnsSrvResolverService.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-osgi/pom.xml b/jetcd-osgi/pom.xml
index 223ff1e18..d3d9fff1f 100644
--- a/jetcd-osgi/pom.xml
+++ b/jetcd-osgi/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-resolver-dns-srv/pom.xml b/jetcd-resolver-dns-srv/pom.xml
index f07d2a173..931fc1336 100644
--- a/jetcd-resolver-dns-srv/pom.xml
+++ b/jetcd-resolver-dns-srv/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-resolver-dns-srv/src/main/java/io/etcd/jetcd/resolver/dnssrv/DnsSrvUriResolver.java b/jetcd-resolver-dns-srv/src/main/java/io/etcd/jetcd/resolver/dnssrv/DnsSrvUriResolver.java
index 00a38e326..3ec9b38cc 100644
--- a/jetcd-resolver-dns-srv/src/main/java/io/etcd/jetcd/resolver/dnssrv/DnsSrvUriResolver.java
+++ b/jetcd-resolver-dns-srv/src/main/java/io/etcd/jetcd/resolver/dnssrv/DnsSrvUriResolver.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-resolver-dns-srv/src/test/java/io/etcd/jetcd/resolver/dnssrv/NameResolverTest.java b/jetcd-resolver-dns-srv/src/test/java/io/etcd/jetcd/resolver/dnssrv/NameResolverTest.java
index 78f48e7b4..1afd1df59 100644
--- a/jetcd-resolver-dns-srv/src/test/java/io/etcd/jetcd/resolver/dnssrv/NameResolverTest.java
+++ b/jetcd-resolver-dns-srv/src/test/java/io/etcd/jetcd/resolver/dnssrv/NameResolverTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd.resolver.dnssrv;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/jetcd-resolver-dns-srv/src/test/resources/log4j2.xml b/jetcd-resolver-dns-srv/src/test/resources/log4j2.xml
index abd3ca3e7..87c9f34f8 100644
--- a/jetcd-resolver-dns-srv/src/test/resources/log4j2.xml
+++ b/jetcd-resolver-dns-srv/src/test/resources/log4j2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-resolver/pom.xml b/jetcd-resolver/pom.xml
index 1fc0ccd92..6d917154f 100644
--- a/jetcd-resolver/pom.xml
+++ b/jetcd-resolver/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/DirectUriResolver.java b/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/DirectUriResolver.java
index adc131de5..09b78a0f5 100644
--- a/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/DirectUriResolver.java
+++ b/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/DirectUriResolver.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/SmartNameResolver.java b/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/SmartNameResolver.java
index dfa211c6b..175528f57 100644
--- a/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/SmartNameResolver.java
+++ b/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/SmartNameResolver.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/SmartNameResolverFactory.java b/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/SmartNameResolverFactory.java
index 166dd79b0..7bbc98a66 100644
--- a/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/SmartNameResolverFactory.java
+++ b/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/SmartNameResolverFactory.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/URIResolver.java b/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/URIResolver.java
index 8730bc7b4..75b497a4d 100644
--- a/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/URIResolver.java
+++ b/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/URIResolver.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/URIResolverLoader.java b/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/URIResolverLoader.java
index 08d86c877..3afd6b051 100644
--- a/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/URIResolverLoader.java
+++ b/jetcd-resolver/src/main/java/io/etcd/jetcd/resolver/URIResolverLoader.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jetcd-resolver/src/test/java/io/etcd/jetcd/resolver/NameResolverTest.java b/jetcd-resolver/src/test/java/io/etcd/jetcd/resolver/NameResolverTest.java
index 2f3165db4..42b9a575f 100644
--- a/jetcd-resolver/src/test/java/io/etcd/jetcd/resolver/NameResolverTest.java
+++ b/jetcd-resolver/src/test/java/io/etcd/jetcd/resolver/NameResolverTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright 2017 The jetcd authors
+/*
+ * Copyright 2016-2019 The jetcd authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.etcd.jetcd.resolver;
 
 import io.etcd.jetcd.common.exception.EtcdException;
diff --git a/pom.xml b/pom.xml
index b32d7938f..c2181e557 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017 The jetcd authors
+    Copyright 2016-2019 The jetcd authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -708,6 +708,9 @@
                 <artifactId>license-maven-plugin</artifactId>
                 <version>${license-maven-plugin.version}</version>
                 <configuration>
+                    <properties>
+                        <project.inceptionYear>2016</project.inceptionYear>
+                    </properties>
                     <header>${jetcd.project.root}/etc/license.txt</header>
                     <excludes>
                         <exclude>**/ErrorCode.java</exclude>
@@ -729,10 +732,22 @@
                         <exclude>target-ide/**</exclude>
                         <exclude>.factorypath</exclude>
                     </excludes>
+                    <headerDefinitions>
+                        <headerDefinition>${jetcd.project.root}/etc/license-formatting.xml</headerDefinition>
+                    </headerDefinitions>
                     <mapping>
                         <proto>DOUBLESLASH_STYLE</proto>
+                        <java>SLASHSTART_WITH_BLANKLINE_STYLE</java>
                     </mapping>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.mycila</groupId>
+                        <artifactId>license-maven-plugin-git</artifactId>
+                        <!-- make sure you use the same version as license-maven-plugin -->
+                        <version>${license-maven-plugin.version}</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <goals>