Merge branch 'APEXMALHAR-2156.improvement2' of github.com:sanjaypujare/apex-malhar
Project: http://git-wip-us.apache.org/repos/asf/apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-malhar/commit/37cb5848 Tree: http://git-wip-us.apache.org/repos/asf/apex-malhar/tree/37cb5848 Diff: http://git-wip-us.apache.org/repos/asf/apex-malhar/diff/37cb5848 Branch: refs/heads/master Commit: 37cb584841810dbc2ac099b6d0ba30cdea36f1d1 Parents: 5972bca d46a6be Author: Pramod Immaneni <[email protected]> Authored: Tue Aug 9 16:42:07 2016 -0700 Committer: Pramod Immaneni <[email protected]> Committed: Tue Aug 9 16:42:07 2016 -0700 ---------------------------------------------------------------------- library/pom.xml | 34 ++- .../lib/io/jms/AbstractJMSInputOperator.java | 10 + .../com/datatorrent/lib/io/jms/JMSBase.java | 214 +++++++++++++-- .../lib/io/jms/JMSObjectInputOperatorTest.java | 1 + .../lib/io/jms/JMSStringInputOperatorTest.java | 2 + .../lib/io/jms/SQSStringInputOperatorTest.java | 262 +++++++++++++++++++ .../com/datatorrent/lib/io/jms/SQSTestBase.java | 187 +++++++++++++ .../src/test/resources/sqsdevCreds.properties | 21 ++ .../src/test/resources/sqstestCreds.properties | 21 ++ 9 files changed, 719 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/37cb5848/library/pom.xml ---------------------------------------------------------------------- diff --cc library/pom.xml index 026bbae,8fe30d0..b8c6271 --- a/library/pom.xml +++ b/library/pom.xml @@@ -343,11 -349,30 +349,29 @@@ <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-s3</artifactId> <version>1.10.73</version> - <scope>test</scope> </dependency> <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.5.4</version> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-sqs</artifactId> + <version>1.10.73</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.5.4</version> + </dependency> + <dependency> + <groupId>com.amazonaws</groupId> + <artifactId>amazon-sqs-java-messaging-lib</artifactId> + <version>1.0.0</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-sqs</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies>
