From 7597b69edc37c791ce66a58d175c2270d774355c Mon Sep 17 00:00:00 2001
From: Justin Pfifer <pfifer@amazon.com>
Date: Mon, 14 Nov 2016 07:38:22 -0800
Subject: [PATCH] Upgrade Versions of the Amazon Kinesis Client Library, and
 AWS SDK (#77)

* Upgrade KCL, and AWS SDK

Upgrade the Amazon Kinesis Client Library to 1.7.2, and upgraded the AWS
SDK to 1.11.14.

* Rework Samples to Use Maven

Reworked the samples to use Maven, and create launch scripts in Maven
---
 pom.xml                                       |  62 +++++----
 samples/pom.xml                               | 119 ++++++++++++++++++
 .../java}/samples/BatchedStreamSource.java    |   3 +
 .../samples/KinesisConnectorExecutor.java     |   0
 .../KinesisConnectorMetricsExecutor.java      |   0
 .../java}/samples/KinesisMessageModel.java    |   0
 .../src/main/java}/samples/StreamSource.java  |   0
 .../samples/dynamodb/DynamoDBExecutor.java    |   0
 .../DynamoDBMessageModelPipeline.java         |   0
 ...inesisMessageModelDynamoDBTransformer.java |   0
 .../src/main/java}/samples/dynamodb/build.xml |  10 +-
 ...sMessageModelElasticsearchTransformer.java |   0
 .../elasticsearch/ElasticsearchExecutor.java  |   0
 .../elasticsearch/ElasticsearchPipeline.java  |   0
 ...sMessageModelElasticsearchTransformer.java |   0
 .../java}/samples/elasticsearch/README.md     |   0
 ...sMessageModelElasticsearchTransformer.java |   0
 .../java}/samples/elasticsearch/build.xml     |  10 +-
 ...inesisMessageModelRedshiftTransformer.java |   0
 .../redshiftbasic/RedshiftBasicExecutor.java  |   0
 .../redshiftbasic/RedshiftBasicPipeline.java  |   0
 .../java}/samples/redshiftbasic/build.xml     |  10 +-
 .../RedshiftManifestExecutor.java             |   0
 .../RedshiftManifestPipeline.java             |   0
 .../redshiftmanifest/S3ManifestExecutor.java  |   0
 .../redshiftmanifest/S3ManifestPipeline.java  |   0
 .../java}/samples/redshiftmanifest/build.xml  |  10 +-
 .../src/main/java}/samples/s3/S3Executor.java |   0
 .../src/main/java}/samples/s3/S3Pipeline.java |   0
 .../src/main/java}/samples/s3/build.xml       |  10 +-
 .../src/main/java}/samples/shared-build.xml   |   0
 .../samples/utils/CloudFormationUtils.java    |   0
 .../java}/samples/utils/DynamoDBUtils.java    |   0
 .../main/java}/samples/utils/EC2Utils.java    |   0
 .../java}/samples/utils/KinesisUtils.java     |   0
 .../java}/samples/utils/RedshiftUtils.java    |   0
 .../src/main/java}/samples/utils/S3Utils.java |   0
 .../main/resources}/DynamoDBSample.properties |   0
 .../main/resources}/Elasticsearch.template    |   0
 .../resources}/ElasticsearchSample.properties |   0
 .../resources}/RedshiftBasicSample.properties |   0
 .../RedshiftManifestSample.properties         |   0
 .../resources}/S3ManifestSample.properties    |   0
 .../src/main/resources}/S3Sample.properties   |   2 +-
 .../src/main/resources}/users.txt             |   0
 ...ClientLibraryPipelinedRecordProcessor.java |   2 +-
 ...ibraryPipelinedRecordProcessorFactory.java |   2 +-
 .../KinesisConnectorRecordProcessor.java      |   2 +-
 .../KinesisConnectorRecordProcessorTests.java |   2 +-
 49 files changed, 188 insertions(+), 56 deletions(-)
 create mode 100644 samples/pom.xml
 rename {src/main => samples/src/main/java}/samples/BatchedStreamSource.java (98%)
 rename {src/main => samples/src/main/java}/samples/KinesisConnectorExecutor.java (100%)
 rename {src/main => samples/src/main/java}/samples/KinesisConnectorMetricsExecutor.java (100%)
 rename {src/main => samples/src/main/java}/samples/KinesisMessageModel.java (100%)
 rename {src/main => samples/src/main/java}/samples/StreamSource.java (100%)
 rename {src/main => samples/src/main/java}/samples/dynamodb/DynamoDBExecutor.java (100%)
 rename {src/main => samples/src/main/java}/samples/dynamodb/DynamoDBMessageModelPipeline.java (100%)
 rename {src/main => samples/src/main/java}/samples/dynamodb/KinesisMessageModelDynamoDBTransformer.java (100%)
 rename {src/main => samples/src/main/java}/samples/dynamodb/build.xml (91%)
 rename {src/main => samples/src/main/java}/samples/elasticsearch/BatchedKinesisMessageModelElasticsearchTransformer.java (100%)
 rename {src/main => samples/src/main/java}/samples/elasticsearch/ElasticsearchExecutor.java (100%)
 rename {src/main => samples/src/main/java}/samples/elasticsearch/ElasticsearchPipeline.java (100%)
 rename {src/main => samples/src/main/java}/samples/elasticsearch/KinesisMessageModelElasticsearchTransformer.java (100%)
 rename {src/main => samples/src/main/java}/samples/elasticsearch/README.md (100%)
 rename {src/main => samples/src/main/java}/samples/elasticsearch/SingleKinesisMessageModelElasticsearchTransformer.java (100%)
 rename {src/main => samples/src/main/java}/samples/elasticsearch/build.xml (91%)
 rename {src/main => samples/src/main/java}/samples/redshiftbasic/KinesisMessageModelRedshiftTransformer.java (100%)
 rename {src/main => samples/src/main/java}/samples/redshiftbasic/RedshiftBasicExecutor.java (100%)
 rename {src/main => samples/src/main/java}/samples/redshiftbasic/RedshiftBasicPipeline.java (100%)
 rename {src/main => samples/src/main/java}/samples/redshiftbasic/build.xml (91%)
 rename {src/main => samples/src/main/java}/samples/redshiftmanifest/RedshiftManifestExecutor.java (100%)
 rename {src/main => samples/src/main/java}/samples/redshiftmanifest/RedshiftManifestPipeline.java (100%)
 rename {src/main => samples/src/main/java}/samples/redshiftmanifest/S3ManifestExecutor.java (100%)
 rename {src/main => samples/src/main/java}/samples/redshiftmanifest/S3ManifestPipeline.java (100%)
 rename {src/main => samples/src/main/java}/samples/redshiftmanifest/build.xml (91%)
 rename {src/main => samples/src/main/java}/samples/s3/S3Executor.java (100%)
 rename {src/main => samples/src/main/java}/samples/s3/S3Pipeline.java (100%)
 rename {src/main => samples/src/main/java}/samples/s3/build.xml (91%)
 rename {src/main => samples/src/main/java}/samples/shared-build.xml (100%)
 rename {src/main => samples/src/main/java}/samples/utils/CloudFormationUtils.java (100%)
 rename {src/main => samples/src/main/java}/samples/utils/DynamoDBUtils.java (100%)
 rename {src/main => samples/src/main/java}/samples/utils/EC2Utils.java (100%)
 rename {src/main => samples/src/main/java}/samples/utils/KinesisUtils.java (100%)
 rename {src/main => samples/src/main/java}/samples/utils/RedshiftUtils.java (100%)
 rename {src/main => samples/src/main/java}/samples/utils/S3Utils.java (100%)
 rename {src/main/samples/dynamodb => samples/src/main/resources}/DynamoDBSample.properties (100%)
 rename {src/main/samples/elasticsearch => samples/src/main/resources}/Elasticsearch.template (100%)
 rename {src/main/samples/elasticsearch => samples/src/main/resources}/ElasticsearchSample.properties (100%)
 rename {src/main/samples/redshiftbasic => samples/src/main/resources}/RedshiftBasicSample.properties (100%)
 rename {src/main/samples/redshiftmanifest => samples/src/main/resources}/RedshiftManifestSample.properties (100%)
 rename {src/main/samples/redshiftmanifest => samples/src/main/resources}/S3ManifestSample.properties (100%)
 rename {src/main/samples/s3 => samples/src/main/resources}/S3Sample.properties (98%)
 rename {src/main/samples => samples/src/main/resources}/users.txt (100%)

diff --git a/pom.xml b/pom.xml
index ba50222..d198afc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>amazon-kinesis-connectors</artifactId>
     <packaging>jar</packaging>
     <name>Amazon Kinesis Connector Library</name>
-    <version>1.2.0</version>
+    <version>1.3.0-SNAPSHOT</version>
     <description>The Amazon Kinesis Connector Library helps Java developers integrate Amazon Kinesis with other AWS and non-AWS services.</description>
     <url>https://aws.amazon.com/kinesis</url>
 
@@ -23,10 +23,10 @@
     </licenses>
 
     <properties>
-        <amazon-kinesis-client.version>1.4.0</amazon-kinesis-client.version>
-        <aws-java-sdk.version>1.9.37</aws-java-sdk.version>
+        <amazon-kinesis-client.version>1.7.2</amazon-kinesis-client.version>
+        <aws-java-sdk.version>1.11.14</aws-java-sdk.version>
         <elasticsearch.version>1.2.1</elasticsearch.version>
-        <fasterxml-jackson.version>2.3.2</fasterxml-jackson.version>
+        <fasterxml-jackson.version>2.6.6</fasterxml-jackson.version>
     </properties>
 
     <dependencies>
@@ -58,12 +58,7 @@
             <version>${aws-java-sdk.version}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>${elasticsearch.version}</version>
-            <optional>true</optional>
-        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -74,6 +69,12 @@
             <artifactId>jackson-databind</artifactId>
             <version>${fasterxml-jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>${elasticsearch.version}</version>
+            <optional>true</optional>
+        </dependency>
 
         <!-- Test -->
         <dependency>
@@ -133,23 +134,32 @@
             </plugins>
         </pluginManagement>
 
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.5</version>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
+
     </build>
 
+    <profiles>
+        <profile>
+            <id>publish</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.5</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>
 
diff --git a/samples/pom.xml b/samples/pom.xml
new file mode 100644
index 0000000..ebc6c72
--- /dev/null
+++ b/samples/pom.xml
@@ -0,0 +1,119 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.amazonaws</groupId>
+  <artifactId>amazon-kinesis-connectors-samples</artifactId>
+  <packaging>jar</packaging>
+  <name>Amazon Kinesis Connector Library Samples</name>
+  <version>1.0.0-SNAPSHOT</version>
+  <description>Samples for the Amazon Kinesis Connector Library.</description>
+  <url>https://aws.amazon.com/kinesis</url>
+
+  <scm>
+    <url>https://github.com/awslabs/amazon-kinesis-connectors.git</url>
+  </scm>
+
+  <licenses>
+    <license>
+      <name>Amazon Software License</name>
+      <url>https://aws.amazon.com/asl</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <properties>
+    <kinesis-connector.version>1.3.0-SNAPSHOT</kinesis-connector.version>
+    <aws-java-sdk.version>1.11.14</aws-java-sdk.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>amazon-kinesis-connectors</artifactId>
+      <version>${kinesis-connector.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>aws-java-sdk</artifactId>
+      <version>${aws-java-sdk.version}</version>
+    </dependency>
+
+    <!-- Sample Dependencies -->
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>9.3-1101-jdbc41</version>
+    </dependency>
+    <dependency>
+      <groupId>org.elasticsearch</groupId>
+      <artifactId>elasticsearch</artifactId>
+      <version>1.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>4.8.1</version>
+    </dependency>
+
+
+  </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.2</version>
+          <configuration>
+            <source>1.7</source>
+            <target>1.7</target>
+            <encoding>UTF-8</encoding>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>appassembler-maven-plugin</artifactId>
+        <version>1.10</version>
+        <executions>
+          <execution>
+            <id>generate-scripts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>assemble</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <programs>
+            <program>
+              <mainClass>samples.dynamodb.DynamoDBExecutor</mainClass>
+              <id>dynamodb-sample</id>
+            </program>
+            <program>
+              <mainClass>samples.s3.S3Executor</mainClass>
+              <id>s3-sample</id>
+            </program>
+            <program>
+              <mainClass>samples.elasticsearch.ElasticsearchExecutor</mainClass>
+              <id>elastic-search-sample</id>
+            </program>
+            <program>
+              <mainClass>samples.redshiftbasic.RedshiftBasicExecutor</mainClass>
+              <id>redshift-basic-sample</id>
+            </program>
+            <program>
+              <mainClass>samples.redshiftmanifest.RedshiftManifestExecutor</mainClass>
+              <id>redshift-manifest-sample</id>
+            </program>
+          </programs>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/src/main/samples/BatchedStreamSource.java b/samples/src/main/java/samples/BatchedStreamSource.java
similarity index 98%
rename from src/main/samples/BatchedStreamSource.java
rename to samples/src/main/java/samples/BatchedStreamSource.java
index 487cc21..d32e851 100644
--- a/src/main/samples/BatchedStreamSource.java
+++ b/samples/src/main/java/samples/BatchedStreamSource.java
@@ -12,6 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
+
 package samples;
 
 import java.io.BufferedReader;
@@ -30,6 +31,8 @@
 
 import com.amazonaws.services.kinesis.connectors.KinesisConnectorConfiguration;
 import com.amazonaws.services.kinesis.model.PutRecordRequest;
+import samples.KinesisMessageModel;
+import samples.StreamSource;
 
 /**
  * This class is a data source for supplying input to the Amazon Kinesis stream. It reads lines from the
diff --git a/src/main/samples/KinesisConnectorExecutor.java b/samples/src/main/java/samples/KinesisConnectorExecutor.java
similarity index 100%
rename from src/main/samples/KinesisConnectorExecutor.java
rename to samples/src/main/java/samples/KinesisConnectorExecutor.java
diff --git a/src/main/samples/KinesisConnectorMetricsExecutor.java b/samples/src/main/java/samples/KinesisConnectorMetricsExecutor.java
similarity index 100%
rename from src/main/samples/KinesisConnectorMetricsExecutor.java
rename to samples/src/main/java/samples/KinesisConnectorMetricsExecutor.java
diff --git a/src/main/samples/KinesisMessageModel.java b/samples/src/main/java/samples/KinesisMessageModel.java
similarity index 100%
rename from src/main/samples/KinesisMessageModel.java
rename to samples/src/main/java/samples/KinesisMessageModel.java
diff --git a/src/main/samples/StreamSource.java b/samples/src/main/java/samples/StreamSource.java
similarity index 100%
rename from src/main/samples/StreamSource.java
rename to samples/src/main/java/samples/StreamSource.java
diff --git a/src/main/samples/dynamodb/DynamoDBExecutor.java b/samples/src/main/java/samples/dynamodb/DynamoDBExecutor.java
similarity index 100%
rename from src/main/samples/dynamodb/DynamoDBExecutor.java
rename to samples/src/main/java/samples/dynamodb/DynamoDBExecutor.java
diff --git a/src/main/samples/dynamodb/DynamoDBMessageModelPipeline.java b/samples/src/main/java/samples/dynamodb/DynamoDBMessageModelPipeline.java
similarity index 100%
rename from src/main/samples/dynamodb/DynamoDBMessageModelPipeline.java
rename to samples/src/main/java/samples/dynamodb/DynamoDBMessageModelPipeline.java
diff --git a/src/main/samples/dynamodb/KinesisMessageModelDynamoDBTransformer.java b/samples/src/main/java/samples/dynamodb/KinesisMessageModelDynamoDBTransformer.java
similarity index 100%
rename from src/main/samples/dynamodb/KinesisMessageModelDynamoDBTransformer.java
rename to samples/src/main/java/samples/dynamodb/KinesisMessageModelDynamoDBTransformer.java
diff --git a/src/main/samples/dynamodb/build.xml b/samples/src/main/java/samples/dynamodb/build.xml
similarity index 91%
rename from src/main/samples/dynamodb/build.xml
rename to samples/src/main/java/samples/dynamodb/build.xml
index 0b0ccef..b43eac4 100644
--- a/src/main/samples/dynamodb/build.xml
+++ b/samples/src/main/java/samples/dynamodb/build.xml
@@ -1,7 +1,7 @@
 <!-- Ant build script for compiling and running the Amazon Kinesis Connector to Amazon DynamoDB sample.
  Don't forget to fill in your AWS access credentials in AwsCredentials.properties
  before trying to run it.  -->
-<project name="Amazon Kinesis Connector to Amazon DynamoDB Sample" default="run" basedir="../../">
+<project name="Amazon Kinesis Connector to Amazon DynamoDB Sample" default="run" basedir="../../../..//">
     <property name="src.dir" location="${basedir}/../" />
     <property name="kcl.dir" location="${src.dir}/KinesisClientLibrary" />
     <property name="external.dir" location="${src.dir}/external" />
@@ -13,14 +13,14 @@
         <fileset dir="${kcl.dir}" includes="**/*.jar" />
         <fileset dir="${external.dir}" includes="**/*.jar" />
         <pathelement location="${basedir}/build" />
-        <pathelement location="." />
-        <pathelement location="${basedir}/samples" />
-        <pathelement location="${basedir}/samples/dynamodb" />
+        <pathelement location="../../" />
+        <pathelement location="/src/main/java/samples" />
+        <pathelement location="/src/main/java/samples/dynamodb" />
     </path>
     
     <target name="clean">
         <delete includeEmptyDirs="true" failOnError="false">
-            <fileset dir="." includes="**/*.class" />
+            <fileset dir="../../" includes="**/*.class" />
             <fileset dir="${basedir}/build"/>
             <fileset dir="${kcl.dir}"/>
             <fileset dir="${external.dir}"/>
diff --git a/src/main/samples/elasticsearch/BatchedKinesisMessageModelElasticsearchTransformer.java b/samples/src/main/java/samples/elasticsearch/BatchedKinesisMessageModelElasticsearchTransformer.java
similarity index 100%
rename from src/main/samples/elasticsearch/BatchedKinesisMessageModelElasticsearchTransformer.java
rename to samples/src/main/java/samples/elasticsearch/BatchedKinesisMessageModelElasticsearchTransformer.java
diff --git a/src/main/samples/elasticsearch/ElasticsearchExecutor.java b/samples/src/main/java/samples/elasticsearch/ElasticsearchExecutor.java
similarity index 100%
rename from src/main/samples/elasticsearch/ElasticsearchExecutor.java
rename to samples/src/main/java/samples/elasticsearch/ElasticsearchExecutor.java
diff --git a/src/main/samples/elasticsearch/ElasticsearchPipeline.java b/samples/src/main/java/samples/elasticsearch/ElasticsearchPipeline.java
similarity index 100%
rename from src/main/samples/elasticsearch/ElasticsearchPipeline.java
rename to samples/src/main/java/samples/elasticsearch/ElasticsearchPipeline.java
diff --git a/src/main/samples/elasticsearch/KinesisMessageModelElasticsearchTransformer.java b/samples/src/main/java/samples/elasticsearch/KinesisMessageModelElasticsearchTransformer.java
similarity index 100%
rename from src/main/samples/elasticsearch/KinesisMessageModelElasticsearchTransformer.java
rename to samples/src/main/java/samples/elasticsearch/KinesisMessageModelElasticsearchTransformer.java
diff --git a/src/main/samples/elasticsearch/README.md b/samples/src/main/java/samples/elasticsearch/README.md
similarity index 100%
rename from src/main/samples/elasticsearch/README.md
rename to samples/src/main/java/samples/elasticsearch/README.md
diff --git a/src/main/samples/elasticsearch/SingleKinesisMessageModelElasticsearchTransformer.java b/samples/src/main/java/samples/elasticsearch/SingleKinesisMessageModelElasticsearchTransformer.java
similarity index 100%
rename from src/main/samples/elasticsearch/SingleKinesisMessageModelElasticsearchTransformer.java
rename to samples/src/main/java/samples/elasticsearch/SingleKinesisMessageModelElasticsearchTransformer.java
diff --git a/src/main/samples/elasticsearch/build.xml b/samples/src/main/java/samples/elasticsearch/build.xml
similarity index 91%
rename from src/main/samples/elasticsearch/build.xml
rename to samples/src/main/java/samples/elasticsearch/build.xml
index 2b2d4a5..a98366b 100644
--- a/src/main/samples/elasticsearch/build.xml
+++ b/samples/src/main/java/samples/elasticsearch/build.xml
@@ -1,7 +1,7 @@
 <!-- Ant build script for compiling and running the Amazon Kinesis Connector to Elasticsearch sample.
  Don't forget to fill in your AWS access credentials in AwsCredentials.properties
  before trying to run it.  -->
-<project name="Amazon Kinesis Connector to Elasticsearch Sample" default="run" basedir="../../">
+<project name="Amazon Kinesis Connector to Elasticsearch Sample" default="run" basedir="../../../..//">
     <property name="src.dir" location="${basedir}/../" />
     <property name="kcl.dir" location="${src.dir}/KinesisClientLibrary" />
     <property name="external.dir" location="${src.dir}/external" />
@@ -13,14 +13,14 @@
         <fileset dir="${kcl.dir}" includes="**/*.jar" />
         <fileset dir="${external.dir}" includes="**/*.jar" />
         <pathelement location="${basedir}/build" />
-        <pathelement location="." />
-        <pathelement location="${basedir}/samples" />
-        <pathelement location="${basedir}/samples/elasticsearch" />
+        <pathelement location="../../" />
+        <pathelement location="/src/main/java/samples" />
+        <pathelement location="/src/main/java/samples/elasticsearch" />
     </path>
 
     <target name="clean">
         <delete includeEmptyDirs="true" failOnError="false">
-            <fileset dir="." includes="**/*.class" />
+            <fileset dir="../../" includes="**/*.class" />
             <fileset dir="${basedir}/build"/>
             <fileset dir="${kcl.dir}"/>
             <fileset dir="${external.dir}"/>
diff --git a/src/main/samples/redshiftbasic/KinesisMessageModelRedshiftTransformer.java b/samples/src/main/java/samples/redshiftbasic/KinesisMessageModelRedshiftTransformer.java
similarity index 100%
rename from src/main/samples/redshiftbasic/KinesisMessageModelRedshiftTransformer.java
rename to samples/src/main/java/samples/redshiftbasic/KinesisMessageModelRedshiftTransformer.java
diff --git a/src/main/samples/redshiftbasic/RedshiftBasicExecutor.java b/samples/src/main/java/samples/redshiftbasic/RedshiftBasicExecutor.java
similarity index 100%
rename from src/main/samples/redshiftbasic/RedshiftBasicExecutor.java
rename to samples/src/main/java/samples/redshiftbasic/RedshiftBasicExecutor.java
diff --git a/src/main/samples/redshiftbasic/RedshiftBasicPipeline.java b/samples/src/main/java/samples/redshiftbasic/RedshiftBasicPipeline.java
similarity index 100%
rename from src/main/samples/redshiftbasic/RedshiftBasicPipeline.java
rename to samples/src/main/java/samples/redshiftbasic/RedshiftBasicPipeline.java
diff --git a/src/main/samples/redshiftbasic/build.xml b/samples/src/main/java/samples/redshiftbasic/build.xml
similarity index 91%
rename from src/main/samples/redshiftbasic/build.xml
rename to samples/src/main/java/samples/redshiftbasic/build.xml
index 935ab0b..6a01846 100644
--- a/src/main/samples/redshiftbasic/build.xml
+++ b/samples/src/main/java/samples/redshiftbasic/build.xml
@@ -3,7 +3,7 @@
  before trying to run it.
  Please include PostgreSQL driver in the classpath. If you use the download target, this will be done for you.
  -->
-<project name="Amazon Kinesis Connector to Amazon Redshift Basic Sample" default="run" basedir="../../">
+<project name="Amazon Kinesis Connector to Amazon Redshift Basic Sample" default="run" basedir="../../../..//">
     <property name="src.dir" location="${basedir}/../" />
     <property name="kcl.dir" location="${src.dir}/KinesisClientLibrary" />
     <property name="external.dir" location="${src.dir}/external" />
@@ -15,14 +15,14 @@
         <fileset dir="${kcl.dir}" includes="**/*.jar" />
         <fileset dir="${external.dir}" includes="**/*.jar" />
         <pathelement location="${basedir}/build" />
-        <pathelement location="." />
-        <pathelement location="${basedir}/samples" />
-        <pathelement location="${basedir}/samples/redshiftbasic" />
+        <pathelement location="../../" />
+        <pathelement location="/src/main/java/samples" />
+        <pathelement location="/src/main/java/samples/redshiftbasic" />
     </path>
     
     <target name="clean">
         <delete includeEmptyDirs="true" failOnError="false">
-            <fileset dir="." includes="**/*.class" />
+            <fileset dir="../../" includes="**/*.class" />
             <fileset dir="${basedir}/build"/>
             <fileset dir="${kcl.dir}"/>
             <fileset dir="${external.dir}"/>
diff --git a/src/main/samples/redshiftmanifest/RedshiftManifestExecutor.java b/samples/src/main/java/samples/redshiftmanifest/RedshiftManifestExecutor.java
similarity index 100%
rename from src/main/samples/redshiftmanifest/RedshiftManifestExecutor.java
rename to samples/src/main/java/samples/redshiftmanifest/RedshiftManifestExecutor.java
diff --git a/src/main/samples/redshiftmanifest/RedshiftManifestPipeline.java b/samples/src/main/java/samples/redshiftmanifest/RedshiftManifestPipeline.java
similarity index 100%
rename from src/main/samples/redshiftmanifest/RedshiftManifestPipeline.java
rename to samples/src/main/java/samples/redshiftmanifest/RedshiftManifestPipeline.java
diff --git a/src/main/samples/redshiftmanifest/S3ManifestExecutor.java b/samples/src/main/java/samples/redshiftmanifest/S3ManifestExecutor.java
similarity index 100%
rename from src/main/samples/redshiftmanifest/S3ManifestExecutor.java
rename to samples/src/main/java/samples/redshiftmanifest/S3ManifestExecutor.java
diff --git a/src/main/samples/redshiftmanifest/S3ManifestPipeline.java b/samples/src/main/java/samples/redshiftmanifest/S3ManifestPipeline.java
similarity index 100%
rename from src/main/samples/redshiftmanifest/S3ManifestPipeline.java
rename to samples/src/main/java/samples/redshiftmanifest/S3ManifestPipeline.java
diff --git a/src/main/samples/redshiftmanifest/build.xml b/samples/src/main/java/samples/redshiftmanifest/build.xml
similarity index 91%
rename from src/main/samples/redshiftmanifest/build.xml
rename to samples/src/main/java/samples/redshiftmanifest/build.xml
index 22a3866..964c092 100644
--- a/src/main/samples/redshiftmanifest/build.xml
+++ b/samples/src/main/java/samples/redshiftmanifest/build.xml
@@ -3,7 +3,7 @@
  before trying to run it.
  Please include PostgreSQL driver in the classpath. If you use the download target, this will be done for you.
  -->
-<project name="Amazon Kinesis Connector to Amazon Redshift Manifest Sample" default="run" basedir="../../">
+<project name="Amazon Kinesis Connector to Amazon Redshift Manifest Sample" default="run" basedir="../../../..//">
     <property name="src.dir" location="${basedir}/../" />
     <property name="kcl.dir" location="${src.dir}/KinesisClientLibrary" />
     <property name="external.dir" location="${src.dir}/external" />
@@ -15,14 +15,14 @@
         <fileset dir="${kcl.dir}" includes="**/*.jar" />
         <fileset dir="${external.dir}" includes="**/*.jar" />
         <pathelement location="${basedir}/build" />
-        <pathelement location="." />
-        <pathelement location="${basedir}/samples" />
-        <pathelement location="${basedir}/samples/redshiftmanifest" />
+        <pathelement location="../../" />
+        <pathelement location="/src/main/java/samples" />
+        <pathelement location="/src/main/java/samples/redshiftmanifest" />
     </path>
     
     <target name="clean">
         <delete includeEmptyDirs="true" failOnError="false">
-            <fileset dir="." includes="**/*.class" />
+            <fileset dir="../../" includes="**/*.class" />
             <fileset dir="${basedir}/build"/>
             <fileset dir="${kcl.dir}"/>
             <fileset dir="${external.dir}"/>
diff --git a/src/main/samples/s3/S3Executor.java b/samples/src/main/java/samples/s3/S3Executor.java
similarity index 100%
rename from src/main/samples/s3/S3Executor.java
rename to samples/src/main/java/samples/s3/S3Executor.java
diff --git a/src/main/samples/s3/S3Pipeline.java b/samples/src/main/java/samples/s3/S3Pipeline.java
similarity index 100%
rename from src/main/samples/s3/S3Pipeline.java
rename to samples/src/main/java/samples/s3/S3Pipeline.java
diff --git a/src/main/samples/s3/build.xml b/samples/src/main/java/samples/s3/build.xml
similarity index 91%
rename from src/main/samples/s3/build.xml
rename to samples/src/main/java/samples/s3/build.xml
index 01c3f2c..93c874f 100644
--- a/src/main/samples/s3/build.xml
+++ b/samples/src/main/java/samples/s3/build.xml
@@ -1,7 +1,7 @@
 <!-- Ant build script for compiling and running the Amazon Kinesis Connector to Amazon S3 sample.
      Don't forget to fill in your AWS access credentials in AwsCredentials.properties
      before trying to run it.  -->
-<project name="Amazon Kinesis Connector to Amazon S3 Sample" default="run" basedir="../../">
+<project name="Amazon Kinesis Connector to Amazon S3 Sample" default="run" basedir="../../../..//">
     <property name="src.dir" location="${basedir}/../" />
     <property name="kcl.dir" location="${src.dir}/KinesisClientLibrary" />
     <property name="external.dir" location="${src.dir}/external" />
@@ -13,14 +13,14 @@
         <fileset dir="${kcl.dir}" includes="**/*.jar" />
         <fileset dir="${external.dir}" includes="**/*.jar" />
         <pathelement location="${basedir}/build" />
-        <pathelement location="." />
-        <pathelement location="${basedir}/samples" />
-        <pathelement location="${basedir}/samples/s3" />
+        <pathelement location="../../" />
+        <pathelement location="/src/main/java/samples" />
+        <pathelement location="/src/main/java/samples/s3" />
     </path>
     
     <target name="clean">
         <delete includeEmptyDirs="true" failOnError="false">
-            <fileset dir="." includes="**/*.class" />
+            <fileset dir="../../" includes="**/*.class" />
             <fileset dir="${basedir}/build"/>
             <fileset dir="${kcl.dir}"/>
             <fileset dir="${external.dir}"/>
diff --git a/src/main/samples/shared-build.xml b/samples/src/main/java/samples/shared-build.xml
similarity index 100%
rename from src/main/samples/shared-build.xml
rename to samples/src/main/java/samples/shared-build.xml
diff --git a/src/main/samples/utils/CloudFormationUtils.java b/samples/src/main/java/samples/utils/CloudFormationUtils.java
similarity index 100%
rename from src/main/samples/utils/CloudFormationUtils.java
rename to samples/src/main/java/samples/utils/CloudFormationUtils.java
diff --git a/src/main/samples/utils/DynamoDBUtils.java b/samples/src/main/java/samples/utils/DynamoDBUtils.java
similarity index 100%
rename from src/main/samples/utils/DynamoDBUtils.java
rename to samples/src/main/java/samples/utils/DynamoDBUtils.java
diff --git a/src/main/samples/utils/EC2Utils.java b/samples/src/main/java/samples/utils/EC2Utils.java
similarity index 100%
rename from src/main/samples/utils/EC2Utils.java
rename to samples/src/main/java/samples/utils/EC2Utils.java
diff --git a/src/main/samples/utils/KinesisUtils.java b/samples/src/main/java/samples/utils/KinesisUtils.java
similarity index 100%
rename from src/main/samples/utils/KinesisUtils.java
rename to samples/src/main/java/samples/utils/KinesisUtils.java
diff --git a/src/main/samples/utils/RedshiftUtils.java b/samples/src/main/java/samples/utils/RedshiftUtils.java
similarity index 100%
rename from src/main/samples/utils/RedshiftUtils.java
rename to samples/src/main/java/samples/utils/RedshiftUtils.java
diff --git a/src/main/samples/utils/S3Utils.java b/samples/src/main/java/samples/utils/S3Utils.java
similarity index 100%
rename from src/main/samples/utils/S3Utils.java
rename to samples/src/main/java/samples/utils/S3Utils.java
diff --git a/src/main/samples/dynamodb/DynamoDBSample.properties b/samples/src/main/resources/DynamoDBSample.properties
similarity index 100%
rename from src/main/samples/dynamodb/DynamoDBSample.properties
rename to samples/src/main/resources/DynamoDBSample.properties
diff --git a/src/main/samples/elasticsearch/Elasticsearch.template b/samples/src/main/resources/Elasticsearch.template
similarity index 100%
rename from src/main/samples/elasticsearch/Elasticsearch.template
rename to samples/src/main/resources/Elasticsearch.template
diff --git a/src/main/samples/elasticsearch/ElasticsearchSample.properties b/samples/src/main/resources/ElasticsearchSample.properties
similarity index 100%
rename from src/main/samples/elasticsearch/ElasticsearchSample.properties
rename to samples/src/main/resources/ElasticsearchSample.properties
diff --git a/src/main/samples/redshiftbasic/RedshiftBasicSample.properties b/samples/src/main/resources/RedshiftBasicSample.properties
similarity index 100%
rename from src/main/samples/redshiftbasic/RedshiftBasicSample.properties
rename to samples/src/main/resources/RedshiftBasicSample.properties
diff --git a/src/main/samples/redshiftmanifest/RedshiftManifestSample.properties b/samples/src/main/resources/RedshiftManifestSample.properties
similarity index 100%
rename from src/main/samples/redshiftmanifest/RedshiftManifestSample.properties
rename to samples/src/main/resources/RedshiftManifestSample.properties
diff --git a/src/main/samples/redshiftmanifest/S3ManifestSample.properties b/samples/src/main/resources/S3ManifestSample.properties
similarity index 100%
rename from src/main/samples/redshiftmanifest/S3ManifestSample.properties
rename to samples/src/main/resources/S3ManifestSample.properties
diff --git a/src/main/samples/s3/S3Sample.properties b/samples/src/main/resources/S3Sample.properties
similarity index 98%
rename from src/main/samples/s3/S3Sample.properties
rename to samples/src/main/resources/S3Sample.properties
index 6bd55c7..b0f9bcf 100644
--- a/src/main/samples/s3/S3Sample.properties
+++ b/samples/src/main/resources/S3Sample.properties
@@ -14,7 +14,7 @@ bufferMillisecondsLimit = 3600000
 
 # Amazon S3 parameters for KinesisConnector
 # Please fill in the name of Amazon S3 bucket you'd like to use.
-s3Bucket = 
+s3Bucket = pfifer-connector-test
 s3Endpoint = https\://s3.amazonaws.com
 
 # Optional Amazon S3 parameters for automatically creating the bucket
diff --git a/src/main/samples/users.txt b/samples/src/main/resources/users.txt
similarity index 100%
rename from src/main/samples/users.txt
rename to samples/src/main/resources/users.txt
diff --git a/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisClientLibraryPipelinedRecordProcessor.java b/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisClientLibraryPipelinedRecordProcessor.java
index f4ff15f..856891a 100644
--- a/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisClientLibraryPipelinedRecordProcessor.java
+++ b/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisClientLibraryPipelinedRecordProcessor.java
@@ -31,7 +31,7 @@
 import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException;
 import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor;
 import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer;
-import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownReason;
+import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason;
 import com.amazonaws.services.kinesis.model.Record;
 
 /**
diff --git a/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisClientLibraryPipelinedRecordProcessorFactory.java b/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisClientLibraryPipelinedRecordProcessorFactory.java
index a7b5bfe..da805b8 100644
--- a/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisClientLibraryPipelinedRecordProcessorFactory.java
+++ b/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisClientLibraryPipelinedRecordProcessorFactory.java
@@ -17,7 +17,7 @@
 import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor;
 import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer;
 import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorFactory;
-import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownReason;
+import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason;
 
 /**
  * Wraps an {@link IRecordProcessorFactory} to decouple fetching records and processing records in the created {@link IRecordProcessor}. The
diff --git a/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorRecordProcessor.java b/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorRecordProcessor.java
index d80a7cd..22977e2 100644
--- a/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorRecordProcessor.java
+++ b/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorRecordProcessor.java
@@ -28,7 +28,7 @@
 import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException;
 import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessor;
 import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer;
-import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownReason;
+import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason;
 import com.amazonaws.services.kinesis.connectors.interfaces.IBuffer;
 import com.amazonaws.services.kinesis.connectors.interfaces.ICollectionTransformer;
 import com.amazonaws.services.kinesis.connectors.interfaces.IEmitter;
diff --git a/src/test/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorRecordProcessorTests.java b/src/test/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorRecordProcessorTests.java
index e7ca168..2f15bf3 100644
--- a/src/test/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorRecordProcessorTests.java
+++ b/src/test/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorRecordProcessorTests.java
@@ -32,7 +32,7 @@
 import com.amazonaws.services.kinesis.clientlibrary.exceptions.ShutdownException;
 import com.amazonaws.services.kinesis.clientlibrary.exceptions.ThrottlingException;
 import com.amazonaws.services.kinesis.clientlibrary.interfaces.IRecordProcessorCheckpointer;
-import com.amazonaws.services.kinesis.clientlibrary.types.ShutdownReason;
+import com.amazonaws.services.kinesis.clientlibrary.lib.worker.ShutdownReason;
 import com.amazonaws.services.kinesis.connectors.KinesisConnectorConfiguration;
 import com.amazonaws.services.kinesis.connectors.KinesisConnectorRecordProcessor;
 import com.amazonaws.services.kinesis.connectors.UnmodifiableBuffer;