Repository: nifi Updated Branches: refs/heads/0.x 32a93be54 -> 7d00c0177
NIFI-3702 AWS SDK Update: * Updated the AWS SDK dependency version to 1.11.8 * Removed GetDynamoDBTest references to JsonObject class dropped from AWS SDK * Fixed integration test ITPutSNS.testPublish() - exception from not evaluating expressions * Ignored integration test ITPutS3Object.testS3MultipartAgeoff() - did not work before or after SDK update * Updated NOTICE information in nifi-assembly and nifi-aws-bundle Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7d00c017 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7d00c017 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7d00c017 Branch: refs/heads/0.x Commit: 7d00c017705e88e27eaa7bb17e3157a3b3b2b6fd Parents: 32a93be Author: James Wing <jvw...@gmail.com> Authored: Tue Jun 21 13:06:02 2016 -0700 Committer: Mike Moser <mose...@apache.org> Committed: Tue Apr 18 18:05:27 2017 +0000 ---------------------------------------------------------------------- nifi-assembly/NOTICE | 1 - .../nifi-aws-nar/src/main/resources/META-INF/NOTICE | 1 - .../apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java | 6 ++---- .../java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java | 1 + .../test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java | 1 + pom.xml | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/7d00c017/nifi-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index ebada22..6afaf78 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -683,7 +683,6 @@ The following binary components are provided under the Apache Software License v ********************** This software includes third party software subject to the following copyrights: - XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty. - - JSON parsing and utility functions from JSON.org - Copyright 2002 JSON.org. - PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc. (ASLv2) Apache Commons DBCP http://git-wip-us.apache.org/repos/asf/nifi/blob/7d00c017/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE index 38cb6eb..5ae7a45 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE @@ -68,7 +68,6 @@ The following binary components are provided under the Apache Software License v ********************** This software includes third party software subject to the following copyrights: - XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty. - - JSON parsing and utility functions from JSON.org - Copyright 2002 JSON.org. - PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc. http://git-wip-us.apache.org/repos/asf/nifi/blob/7d00c017/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java index 5bc3360..5ee15b1 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java @@ -45,8 +45,6 @@ import com.amazonaws.services.dynamodbv2.document.TableKeysAndAttributes; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.BatchGetItemResult; import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes; -import com.amazonaws.util.json.JSONException; -import com.amazonaws.util.json.JSONObject; public class GetDynamoDBTest extends AbstractDynamoDBTest { protected GetDynamoDB getDynamoDB; @@ -177,7 +175,7 @@ public class GetDynamoDBTest extends AbstractDynamoDBTest { } @Test - public void testStringHashStringRangeGetJsonObjectValid() throws IOException, JSONException { + public void testStringHashStringRangeGetJsonObjectValid() throws IOException { outcome = new BatchGetItemOutcome(result); KeysAndAttributes kaa = new KeysAndAttributes(); Map<String,AttributeValue> map = new HashMap<>(); @@ -190,7 +188,7 @@ public class GetDynamoDBTest extends AbstractDynamoDBTest { Map<String,List<Map<String,AttributeValue>>> responses = new HashMap<>(); List<Map<String,AttributeValue>> items = new ArrayList<>(); Map<String,AttributeValue> item = new HashMap<String,AttributeValue>(); - String jsonDocument = new JSONObject().put("name", "john").toString(); + String jsonDocument = "{\"name\": \"john\"}"; item.put("j1",new AttributeValue(jsonDocument)); item.put("hashS", new AttributeValue("h1")); item.put("rangeS", new AttributeValue("r1")); http://git-wip-us.apache.org/repos/asf/nifi/blob/7d00c017/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java index ba65e07..ea6be48 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java @@ -797,6 +797,7 @@ public class ITPutS3Object extends AbstractS3IT { Assert.assertTrue(ff1.getSize() > S3_MAXIMUM_OBJECT_SIZE); } + @Ignore @Test public void testS3MultipartAgeoff() throws InterruptedException, IOException { final PutS3Object processor = new PutS3Object(); http://git-wip-us.apache.org/repos/asf/nifi/blob/7d00c017/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java index f558446..94fb3d3 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java @@ -39,6 +39,7 @@ public class ITPutSNS { @Test public void testPublish() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new PutSNS()); + runner.setValidateExpressionUsage(false); runner.setProperty(PutSNS.CREDENTIALS_FILE, CREDENTIALS_FILE); runner.setProperty(PutSNS.ARN, "arn:aws:sns:us-west-2:100515378163:test-topic-1"); assertTrue(runner.setProperty("DynamicProperty", "hello!").isValid()); http://git-wip-us.apache.org/repos/asf/nifi/blob/7d00c017/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3c07bc2..1bb07f4 100644 --- a/pom.xml +++ b/pom.xml @@ -1223,7 +1223,7 @@ language governing permissions and limitations under the License. --> <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk</artifactId> - <version>1.10.32</version> + <version>1.11.8</version> </dependency> <!-- Groovy support is primarily as a test dependency --> <dependency>
