From bd24096e29c43633500e4efbbb4ab725bee7b824 Mon Sep 17 00:00:00 2001 From: "Dosani, Adnan" Date: Wed, 27 May 2015 05:48:02 -0700 Subject: [PATCH] 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 --- META-INF/MANIFEST.MF | 10 +- README.md | 12 +- pom.xml | 125 ++++++++++++++++++ .../KinesisConnectorConfiguration.java | 2 +- .../connectors/s3/S3ManifestEmitter.java | 4 +- .../elasticsearch/Elasticsearch.template | 9 +- 6 files changed, 144 insertions(+), 18 deletions(-) create mode 100644 pom.xml diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index f7788e7..901ba9d 100644 --- 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 index d9347c3..5aeb7f1 100644 --- 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 new file mode 100644 index 0000000..28799eb --- /dev/null +++ b/pom.xml @@ -0,0 +1,125 @@ + + 4.0.0 + com.amazonaws + amazon-kinesis-connectors + jar + Amazon Kinesis Connector Library + 1.1.2 + The Amazon Kinesis Connector Library helps Java developers integrate Amazon Kinesis with other AWS and non-AWS services. + https://aws.amazon.com/kinesis + + + https://github.com/awslabs/amazon-kinesis-connectors.git + + + + + Amazon Software License + https://aws.amazon.com/asl + repo + + + + + 1.3.0 + 1.9.37 + 1.2.1 + 2.3.2 + + + + + com.amazonaws + amazon-kinesis-client + ${amazon-kinesis-client.version} + + + + com.amazonaws + aws-java-sdk-core + ${aws-java-sdk.version} + + + com.amazonaws + aws-java-sdk-kinesis + ${aws-java-sdk.version} + + + com.amazonaws + aws-java-sdk-dynamodb + ${aws-java-sdk.version} + true + + + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk.version} + true + + + org.elasticsearch + elasticsearch + ${elasticsearch.version} + true + + + com.fasterxml.jackson.core + jackson-core + ${fasterxml-jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${fasterxml-jackson.version} + + + + + + amazonwebservices + Amazon Web Services + https://aws.amazon.com + + developer + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + 1.7 + 1.7 + UTF-8 + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + + diff --git a/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorConfiguration.java b/src/main/java/com/amazonaws/services/kinesis/connectors/KinesisConnectorConfiguration.java index 2004485..2f88e9a 100644 --- 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 index 92c6344..8c1c0d6 100644 --- 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 index 350b3f9..9a68114 100644 --- 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",