From fb9a229ea4668727ac00634601fbdf1c1e1d7f82 Mon Sep 17 00:00:00 2001 From: brharrington Date: Tue, 21 May 2019 13:29:27 -0700 Subject: [PATCH] aws-java-sdk 1.11.556 (#60) Update to aws-java-sdk 1.11.556. This update caused us to hit a `code too large` error again. See #51 for context on the last time this happened. The dependencies have been pruned to only include the SDK projects that are known to be used with Edda or related projects. Also switches the Travis build to openjdk8, it was failing to find oraclejdk8. --- .travis.yml | 2 +- .../AmazonObjectMapperTest.java | 3 --- build.gradle | 25 ++++++++++++++++++- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1682533..b970a77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: java jdk: -- oraclejdk8 +- openjdk8 install: ./installViaTravis.sh script: ./buildViaTravis.sh env: diff --git a/awsobjectmapper/src/test/java/com/netflix/awsobjectmapper/AmazonObjectMapperTest.java b/awsobjectmapper/src/test/java/com/netflix/awsobjectmapper/AmazonObjectMapperTest.java index 199aa55..5a08703 100644 --- a/awsobjectmapper/src/test/java/com/netflix/awsobjectmapper/AmazonObjectMapperTest.java +++ b/awsobjectmapper/src/test/java/com/netflix/awsobjectmapper/AmazonObjectMapperTest.java @@ -101,9 +101,6 @@ private Predicate excludedFields() { private Predicate> excludedTypes() { return type -> type.getSuperclass().equals(com.amazonaws.AmazonWebServiceRequest.class) || - type.equals(com.amazonaws.services.elasticmapreduce.model.Cluster.class) || - type.equals(com.amazonaws.services.elasticmapreduce.model.Configuration.class) || - type.equals(com.amazonaws.services.kinesisvideo.model.AckEvent.class) || type.equals(com.amazonaws.services.simplesystemsmanagement.model.InventoryAggregator.class); } diff --git a/build.gradle b/build.gradle index 0230336..021a153 100755 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,30 @@ subprojects { } dependencies { - compile 'com.amazonaws:aws-java-sdk:1.11.534' + compile 'com.amazonaws:aws-java-sdk-autoscaling:1.11.556' + compile 'com.amazonaws:aws-java-sdk-cloudwatch:1.11.556' + compile 'com.amazonaws:aws-java-sdk-config:1.11.556' + compile 'com.amazonaws:aws-java-sdk-core:1.11.556' + compile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.556' + compile 'com.amazonaws:aws-java-sdk-ec2:1.11.556' + compile 'com.amazonaws:aws-java-sdk-ecs:1.11.556' + compile 'com.amazonaws:aws-java-sdk-efs:1.11.556' + compile 'com.amazonaws:aws-java-sdk-elasticache:1.11.556' + compile 'com.amazonaws:aws-java-sdk-elasticloadbalancing:1.11.556' + compile 'com.amazonaws:aws-java-sdk-elasticloadbalancingv2:1.11.556' + compile 'com.amazonaws:aws-java-sdk-elasticsearch:1.11.556' + compile 'com.amazonaws:aws-java-sdk-iam:1.11.556' + compile 'com.amazonaws:aws-java-sdk-lambda:1.11.556' + compile 'com.amazonaws:aws-java-sdk-rds:1.11.556' + compile 'com.amazonaws:aws-java-sdk-route53:1.11.556' + compile 'com.amazonaws:aws-java-sdk-s3:1.11.556' + compile 'com.amazonaws:aws-java-sdk-ses:1.11.556' + compile 'com.amazonaws:aws-java-sdk-sns:1.11.556' + compile 'com.amazonaws:aws-java-sdk-sqs:1.11.556' + compile 'com.amazonaws:aws-java-sdk-ssm:1.11.556' + compile 'com.amazonaws:aws-java-sdk-sts:1.11.556' + compile 'com.amazonaws:aws-java-sdk-support:1.11.556' + compile 'com.amazonaws:aws-java-sdk-xray:1.11.556' compile 'com.fasterxml.jackson.core:jackson-databind:2.9.8' testCompile 'junit:junit:4.10' testCompile 'com.google.guava:guava:18.0'