Version 1.1.2 of the Amazon Kinesis Connector Library

- Upgraded AWS SDK to 1.9, KCL to 1.3.0 - Added pom.xml file
amazon-archives · May 27, 2015 · bd24096 · bd24096
1 parent 7cce500
commit bd24096
Show file tree

Hide file tree

Showing 6 changed files with 144 additions and 18 deletions.
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Amazon Kinesis Connector Library for Java
 Bundle-SymbolicName: com.amazonaws.kinesisconnectors;singleton:=true
-Bundle-Version: 1.1.1
+Bundle-Version: 1.1.2
 Bundle-Vendor: Amazon Technologies, Inc
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.apache.commons.codec;bundle-version="1.3.0",
  org.apache.commons.logging;bundle-version="1.1.1";visibility:=reexport,
- com.fasterxml.jackson.core.jackson-databind;bundle-version="2.1.1",
- com.fasterxml.jackson.core.jackson-core;bundle-version="2.1.1",
- com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.1.1",
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="2.3.2",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="2.3.2",
+ com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.3.2",
  org.apache.httpcomponents.httpcore;bundle-version="4.2.0",
  org.apache.httpcomponents.httpclient;bundle-version="4.2.0"
- com.amazonaws.sdk;bundle-version="1.7.13",
+ com.amazonaws.sdk;bundle-version="1.9.37",
 Export-Package: com.amazonaws.services.kinesis.connectors,
  com.amazonaws.services.kinesis.connectors.dynamodb,
  com.amazonaws.services.kinesis.connectors.impl,

diff --git a/README.md b/README.md
@@ -83,12 +83,16 @@ To run a sample, complete these steps:
 3. Within the sample folder, execute **ant run**.
 
 ## Release Notes
-### Release 1.1 (June 30, 2014)
-+ Added time threshold to IBuffer 
-+ Added region name support
+### Release 1.1.2 (May 27, 2015)
++ Upgraded AWS SDK to 1.9, KCL to 1.3.0
++ Added pom.xml file
 
 ### Release 1.1.1 (Sep 11, 2014)
-+ Added connector to Elasticsearch 
++ Added connector to Elasticsearch
+
+### Release 1.1 (June 30, 2014)
++ Added time threshold to IBuffer
++ Added region name support
 
 ## Related Resources
 

diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,125 @@
+<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</artifactId>
+    <packaging>jar</packaging>
+    <name>Amazon Kinesis Connector Library</name>
+    <version>1.1.2</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>
+
+    <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>
+        <amazon-kinesis-client.version>1.3.0</amazon-kinesis-client.version>
+        <aws-java-sdk.version>1.9.37</aws-java-sdk.version>
+        <elasticsearch.version>1.2.1</elasticsearch.version>
+        <fasterxml-jackson.version>2.3.2</fasterxml-jackson.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>amazon-kinesis-client</artifactId>
+            <version>${amazon-kinesis-client.version}</version>
+        </dependency>
+        <!-- Note that some of dependencies below are shared with the Amazon Kinesis Client library. -->
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
+            <version>${aws-java-sdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-kinesis</artifactId>
+            <version>${aws-java-sdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-dynamodb</artifactId>
+            <version>${aws-java-sdk.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-s3</artifactId>
+            <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>
+            <version>${fasterxml-jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${fasterxml-jackson.version}</version>
+        </dependency>
+    </dependencies>
+
+    <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>
+                <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.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>
+
+</project>
+
diff --git a/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorConfiguration.java b/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorConfiguration.java
@@ -39,7 +39,7 @@
  */
 public class KinesisConnectorConfiguration {
     private static final Log LOG = LogFactory.getLog(KinesisConnectorConfiguration.class);
-    public static final String KINESIS_CONNECTOR_USER_AGENT = "amazon-kinesis-connector-java-1.1.1";
+    public static final String KINESIS_CONNECTOR_USER_AGENT = "amazon-kinesis-connector-java-1.1.2";
 
     // Connector App Property Keys
     public static final String PROP_APP_NAME = "appName";

diff --git a/src/main/java/com/amazonaws/services/kinesis/connectors/s3/S3ManifestEmitter.java b/src/main/java/com/amazonaws/services/kinesis/connectors/s3/S3ManifestEmitter.java
@@ -52,7 +52,9 @@ public S3ManifestEmitter(KinesisConnectorConfiguration configuration) {
         super(configuration);
         manifestStream = configuration.KINESIS_OUTPUT_STREAM;
         kinesisClient = new AmazonKinesisClient(configuration.AWS_CREDENTIALS_PROVIDER);
-        kinesisClient.setEndpoint(configuration.KINESIS_ENDPOINT);
+        if (configuration.KINESIS_ENDPOINT != null) {
+            kinesisClient.setEndpoint(configuration.KINESIS_ENDPOINT);
+        }
     }
 
     @Override

diff --git a/src/main/samples/elasticsearch/Elasticsearch.template b/src/main/samples/elasticsearch/Elasticsearch.template
@@ -92,11 +92,6 @@
       "ap-southeast-2" : { "64" : "ami-3b4bd301", "64HVM" : "ami-cf4ad2f5" },
       "ap-northeast-1" : { "64" : "ami-c9562fc8", "64HVM" : "ami-bb562fba" }
     },
-    "ElasticsearchVersion2ServiceWrapperVersion" : {
-      "0.90.11" : { "Ver" : "0.90"},
-      "1.0.0"   : { "Ver" : "master"},
-      "1.2.1"   : { "Ver" : "master"}
-    },
     "ElasticsearchVersion2ServiceWrapperHash" : {
       "0.90.11" : { "Hash" : "303e94d" },
       "1.0.0"   : { "Hash" : "4943d5a" },
@@ -230,8 +225,8 @@
 
           "#install elasticsearch servicewrapper daemon\n",
           "cd ~\n",
-          "wget https://github.com/elasticsearch/elasticsearch-servicewrapper/zipball/", { "Fn::FindInMap" : [ "ElasticsearchVersion2ServiceWrapperVersion", { "Ref" : "ElasticsearchVersion" }, "Ver"] }, "\n",
-          "unzip ", { "Fn::FindInMap" : [ "ElasticsearchVersion2ServiceWrapperVersion", { "Ref" : "ElasticsearchVersion" }, "Ver"] }, "\n",
+          "wget -O elasticsearch-servicewrapper.zip https://github.com/elasticsearch/elasticsearch-servicewrapper/zipball/", { "Fn::FindInMap" : [ "ElasticsearchVersion2ServiceWrapperHash", { "Ref" : "ElasticsearchVersion" }, "Ver"] }, "\n",
+          "unzip elasticsearch-servicewrapper.zip\n",
           "mv elasticsearch-elasticsearch-servicewrapper-", { "Fn::FindInMap" : [ "ElasticsearchVersion2ServiceWrapperHash", { "Ref" : "ElasticsearchVersion" }, "Hash"] }, "/service/ /usr/local/elasticsearch/elasticsearch-" , { "Ref" : "ElasticsearchVersion"  }, "/bin/\n",
           "cd /usr/local/elasticsearch/elasticsearch-" , { "Ref" : "ElasticsearchVersion"  }, "\n",
           "sed -i 's#set.default.ES_HOME=.*#set.default.ES_HOME='$PWD'#g' bin/service/elasticsearch.conf\n",