From fc2ca5df5bcc2b728dfc2bfd8d581eb67d584f01 Mon Sep 17 00:00:00 2001
From: sndyuk <sanada@sndyuk.com>
Date: Sat, 24 Apr 2021 14:09:21 +0900
Subject: [PATCH] Chore

---
 README.md                       | 34 +++++++++++++++++++++++----------
 pom-JAVA9MODULE_SLF4J17.xml     | 18 ++++++++---------
 pom.xml                         | 18 ++++++++---------
 src/java9/java/module-info.java |  5 +++++
 4 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 1d6c8d6..570ecde 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,12 @@ Logback more appenders
 is additional appenders for [Logback](http://logback.qos.ch/) and provide better performance and data consistency without any concern.
 
 ## Appenders
+
 - [CloudWatch](https://aws.amazon.com/cloudwatch/)
-    - depends on [aws-java-sdk-logs](http://aws.amazon.com/sdkforjava/).
+    - depends on [cloudwatchlogs(v2) or aws-java-sdk-logs(v1)](http://aws.amazon.com/sdkforjava/).
 
 - [Kinesis Stream](https://aws.amazon.com/kinesis/data-streams/)
-    - depends on [aws-java-sdk-kinesis](http://aws.amazon.com/sdkforjava/).
+    - depends on [kinesis(v2) or aws-java-sdk-kinesis(v1)](http://aws.amazon.com/sdkforjava/).
 
 - [fluentd](http://fluentd.org/)
     - depends on [fluent-logger for Java](https://github.com/fluent/fluent-logger-java).
@@ -24,7 +25,7 @@ Just add it to your dependency then you can use the slf4j module in your applica
 
 ##### Gradle
 ```
-  implementation 'com.sndyuk:logback-more-appenders:1.8.5-JAVA9MODULE_SLF4J17'
+  implementation 'com.sndyuk:logback-more-appenders:1.8.6-JAVA9MODULE_SLF4J17'
 ```
 
 ##### Maven
@@ -32,7 +33,7 @@ Just add it to your dependency then you can use the slf4j module in your applica
   <dependency>
     <groupId>ch.qos.logback</groupId>
     <artifactId>logback-classic</artifactId>
-    <version>1.8.5-JAVA9MODULE_SLF4J17</version>
+    <version>1.8.6-JAVA9MODULE_SLF4J17</version>
   </dependency>
 ```
 
@@ -44,6 +45,9 @@ Just add it to your dependency then you can use the slf4j module in your applica
 
 ### Latest changes
 
+##### Version 1.8.6
+* Add AWS V2 CloudWatch and Kinesis appenders: https://github.com/sndyuk/logback-more-appenders/pull/64
+
 ##### Version 1.8.5
 * Add option for Fluency appender: `jvmHeapBufferMode`
 
@@ -69,11 +73,6 @@ Just add it to your dependency then you can use the slf4j module in your applica
 * Add options for Fluency appender: `bufferChunkRetentionTimeMillis`
 * Fix bug: Messages were lost sometimes when the messages had been waiting for flushing on shutting down an application.  
 * Fix bug: Fluent appender: Do not raise an error when a fluentd server is down.
-  
-##### Version 1.8.0
-
-* Upgrade Fluency version from 2.2.1 to 2.4.1 https://github.com/sndyuk/logback-more-appenders/pull/48
-* Remove redundant "msg" field from Fluentd request. Use "message" instead.
 
 ## Installing
 
@@ -91,7 +90,14 @@ Configure your pom.xml:
       <dependency>
         <groupId>com.sndyuk</groupId>
         <artifactId>logback-more-appenders</artifactId>
-        <version>1.8.5</version>
+        <version>1.8.6</version>
+      </dependency>
+
+      <!-- [Optional] If you use The CloudWatch V2 appender, You need to add the dependency(cloudwatchlogs). -->
+      <dependency>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>cloudwatchlogs</artifactId>
+        <version>${aws-v2.version}</version>
       </dependency>
 
       <!-- [Optional] If you use The CloudWatch appender, You need to add the dependency(aws-java-sdk-logs). -->
@@ -101,6 +107,14 @@ Configure your pom.xml:
         <version>${aws.version}</version>
       </dependency>
 
+      <!-- [Optional] If you use The Kinesis V2 appender, You need to add the dependency(kinesis). -->
+      <dependency>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>kinesis</artifactId>
+        <version>${aws-v2.version}</version>
+        <optional>true</optional>
+      </dependency>
+
       <!-- [Optional] If you use The Kinesis appender, You need to add the dependency(aws-java-sdk-kinesis). -->
       <dependency>
         <groupId>com.amazonaws</groupId>
diff --git a/pom-JAVA9MODULE_SLF4J17.xml b/pom-JAVA9MODULE_SLF4J17.xml
index 9e9fd8a..ec05e66 100644
--- a/pom-JAVA9MODULE_SLF4J17.xml
+++ b/pom-JAVA9MODULE_SLF4J17.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sndyuk</groupId>
   <artifactId>logback-more-appenders</artifactId>
-  <version>1.8.5-JAVA9MODULE_SLF4J17</version>
+  <version>1.8.6-JAVA9MODULE_SLF4J17</version>
   <name>logback-more-appenders</name>
   <description>logback appenders.</description>
   <url>https://github.com/sndyuk/logback-more-appenders</url>
@@ -181,30 +181,30 @@
     </dependency>
 
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-logs</artifactId>
-      <version>${aws.version}</version>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>cloudwatchlogs</artifactId>
+      <version>${aws-v2.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-kinesis</artifactId>
+      <artifactId>aws-java-sdk-logs</artifactId>
       <version>${aws.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
-      <artifactId>cloudwatchlogs</artifactId>
+      <artifactId>kinesis</artifactId>
       <version>${aws-v2.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>kinesis</artifactId>
-      <version>${aws-v2.version}</version>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>aws-java-sdk-kinesis</artifactId>
+      <version>${aws.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 549bbb6..d8a1e6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sndyuk</groupId>
   <artifactId>logback-more-appenders</artifactId>
-  <version>1.8.5</version>
+  <version>1.8.6</version>
   <name>logback-more-appenders</name>
   <description>logback appenders.</description>
   <url>https://github.com/sndyuk/logback-more-appenders</url>
@@ -144,30 +144,30 @@
     </dependency>
 
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-logs</artifactId>
-      <version>${aws.version}</version>
+        <groupId>software.amazon.awssdk</groupId>
+      <artifactId>cloudwatchlogs</artifactId>
+      <version>${aws-v2.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-kinesis</artifactId>
+      <artifactId>aws-java-sdk-logs</artifactId>
       <version>${aws.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
-      <artifactId>cloudwatchlogs</artifactId>
+      <artifactId>kinesis</artifactId>
       <version>${aws-v2.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>kinesis</artifactId>
-      <version>${aws-v2.version}</version>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>aws-java-sdk-kinesis</artifactId>
+      <version>${aws.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/src/java9/java/module-info.java b/src/java9/java/module-info.java
index 3ead559..1c82586 100644
--- a/src/java9/java/module-info.java
+++ b/src/java9/java/module-info.java
@@ -9,4 +9,9 @@
   requires static aws.java.sdk.core;
   requires static aws.java.sdk.logs;
   requires static aws.java.sdk.kinesis;
+  requires static software.amazon.awssdk.core;
+  requires static software.amazon.awssdk.auth;
+  requires static software.amazon.awssdk.regions;
+  requires static software.amazon.awssdk.services.kinesis;
+  requires static software.amazon.awssdk.services.cloudwatchlogs;
 }