From 5b30cb0eebee782283c01f4431a29a772711e28f Mon Sep 17 00:00:00 2001
From: "Pfifer, Justin" <pfifer@amazon.com>
Date: Tue, 13 Mar 2018 10:02:54 -0700
Subject: [PATCH] Added Logback configuration

Added configuration for Logback.
  * For amazon-kinesis-client the configuration is only in test.
  * For amazon-kinesis-client-multilang the configuration is both for
    test, and normal use.

Some additional dependency fighting.  IntelliJ was really confused.
---
 amazon-kinesis-client-multilang/pom.xml       |  7 -----
 .../src/main/resources/logback.xml            | 26 +++++++++++++++++++
 .../src/test/resources/logback.xml            | 26 +++++++++++++++++++
 amazon-kinesis-client/pom.xml                 |  4 ++-
 .../src/test/resources/logback.xml            | 26 +++++++++++++++++++
 pom.xml                                       | 12 +++++++++
 6 files changed, 93 insertions(+), 8 deletions(-)
 create mode 100644 amazon-kinesis-client-multilang/src/main/resources/logback.xml
 create mode 100644 amazon-kinesis-client-multilang/src/test/resources/logback.xml
 create mode 100644 amazon-kinesis-client/src/test/resources/logback.xml

diff --git a/amazon-kinesis-client-multilang/pom.xml b/amazon-kinesis-client-multilang/pom.xml
index 15d90773..a3f8f014 100644
--- a/amazon-kinesis-client-multilang/pom.xml
+++ b/amazon-kinesis-client-multilang/pom.xml
@@ -83,13 +83,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>DynamoDBLocal</artifactId>
-      <version>1.11.86</version>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/amazon-kinesis-client-multilang/src/main/resources/logback.xml b/amazon-kinesis-client-multilang/src/main/resources/logback.xml
new file mode 100644
index 00000000..46b45182
--- /dev/null
+++ b/amazon-kinesis-client-multilang/src/main/resources/logback.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~
+  ~  Licensed under the Amazon Software License (the "License").
+  ~  You may not use this file except in compliance with the License.
+  ~  A copy of the License is located at
+  ~
+  ~  http://aws.amazon.com/asl/
+  ~
+  ~  or in the "license" file accompanying this file. This file 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.
+  -->
+<configuration>
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d [%thread] %-5level %logger{36} [%mdc{ShardId:-NONE}] - %msg %n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/amazon-kinesis-client-multilang/src/test/resources/logback.xml b/amazon-kinesis-client-multilang/src/test/resources/logback.xml
new file mode 100644
index 00000000..46b45182
--- /dev/null
+++ b/amazon-kinesis-client-multilang/src/test/resources/logback.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~
+  ~  Licensed under the Amazon Software License (the "License").
+  ~  You may not use this file except in compliance with the License.
+  ~  A copy of the License is located at
+  ~
+  ~  http://aws.amazon.com/asl/
+  ~
+  ~  or in the "license" file accompanying this file. This file 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.
+  -->
+<configuration>
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d [%thread] %-5level %logger{36} [%mdc{ShardId:-NONE}] - %msg %n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/amazon-kinesis-client/pom.xml b/amazon-kinesis-client/pom.xml
index 32dc38c2..d1a4f020 100644
--- a/amazon-kinesis-client/pom.xml
+++ b/amazon-kinesis-client/pom.xml
@@ -49,6 +49,7 @@
     <sqlite4java.version>1.0.392</sqlite4java.version>
     <sqlite4java.native>libsqlite4java</sqlite4java.native>
     <sqlite4java.libpath>${project.build.directory}/test-lib</sqlite4java.libpath>
+    <slf4j.version>1.7.25</slf4j.version>
   </properties>
 
   <dependencies>
@@ -85,7 +86,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
+      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
@@ -129,6 +130,7 @@
       <version>1.1.7</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <repositories>
diff --git a/amazon-kinesis-client/src/test/resources/logback.xml b/amazon-kinesis-client/src/test/resources/logback.xml
new file mode 100644
index 00000000..46b45182
--- /dev/null
+++ b/amazon-kinesis-client/src/test/resources/logback.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~
+  ~  Licensed under the Amazon Software License (the "License").
+  ~  You may not use this file except in compliance with the License.
+  ~  A copy of the License is located at
+  ~
+  ~  http://aws.amazon.com/asl/
+  ~
+  ~  or in the "license" file accompanying this file. This file 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.
+  -->
+<configuration>
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d [%thread] %-5level %logger{36} [%mdc{ShardId:-NONE}] - %msg %n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5a9e1508..65fb3d1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,11 +41,23 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+
   <modules>
     <module>amazon-kinesis-client</module>
     <module>amazon-kinesis-client-multilang</module>
   </modules>
 
+  <developers>
+    <developer>
+      <id>amazonwebservices</id>
+      <organization>Amazon Web Services</organization>
+      <organizationUrl>https://aws.amazon.com</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+
   <build>
     <pluginManagement>
       <plugins>