Merge branch 'master' into alexwoo/eventstream-shared-customization

Author: alextwoods

.all-contributorsrc

@@ -1039,6 +1039,42 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "greg-at-moderne",
+      "name": "Greg Oledzki",
+      "avatar_url": "https://avatars.githubusercontent.com/u/192309513?v=4",
+      "profile": "https://github.com/greg-at-moderne",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kstich",
+      "name": "Kevin Stich",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26905335?v=4",
+      "profile": "https://github.com/kstich",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jencymaryjoseph",
+      "name": "Jency Joseph",
+      "avatar_url": "https://avatars.githubusercontent.com/u/35571282?v=4",
+      "profile": "https://github.com/jencymaryjoseph",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "reifiedbeans",
+      "name": "Drew Davis",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9686215?v=4",
+      "profile": "https://github.com/reifiedbeans",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.brazil.json

@@ -4,6 +4,7 @@
     "modules": {
         "annotations": { "packageName": "AwsJavaSdk-Core-Annotations" },
         "apache-client": { "packageName": "AwsJavaSdk-HttpClient-ApacheClient" },
+        "apache5-client": { "packageName": "AwsJavaSdk-HttpClient-Apache5Client" },
         "arns": { "packageName": "AwsJavaSdk-Core-Arns" },
         "auth": { "packageName": "AwsJavaSdk-Core-Auth" },
         "auth-crt": { "packageName": "AwsJavaSdk-Core-AuthCrt" },
@@ -98,6 +99,7 @@
         "region-testing": { "skipImport": true },
         "release-scripts": { "skipImport": true },
         "s3-benchmarks": { "skipImport": true },
+        "http-client-benchmarks": { "skipImport": true },
         "sdk-benchmarks": { "skipImport": true },
         "sdk-native-image-test": { "skipImport": true },
         "service-test-utils": { "skipImport": true },
@@ -118,7 +120,8 @@
     "dependencies": {
         "com.fasterxml.jackson.core:jackson-annotations": { "packageName": "Jackson-annotations", "packageVersion": "2.9.x" },
         "com.fasterxml.jackson.core:jackson-core": { "packageName": "Jackson-core", "packageVersion": "2.9.x" },
-        "com.fasterxml.jackson.core:jackson-databind": { "packageName": "Jackson-databind", "packageVersion": "2.9.x" },
+        "com.fasterxml.jackson.core:jackson-databind": { "packageName": "Jackson-databind", "packageVersion": "2.12.x" },
+        "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { "packageName": "Jackson-datatype-jdk8", "packageVersion": "2.12.x" },
         "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { "packageName": "Jackson-dataformat-cbor", "packageVersion": "2.9.x" },
         "com.fasterxml.jackson.jr:jackson-jr-objects": { "packageName": "Maven-com-fasterxml-jackson-jr_jackson-jr-objects", "packageVersion": "2.11.x" },
         "com.fasterxml.jackson.jr:jackson-jr-stree": { "packageName": "Maven-com-fasterxml-jackson-jr_jackson-jr-stree", "packageVersion": "2.11.x" },
@@ -139,7 +142,9 @@
         "io.netty:netty-transport-classes-epoll": { "packageName": "Netty4", "packageVersion": "4.1" },
         "io.netty:netty-transport-native-unix-common": { "packageName": "Netty4", "packageVersion": "4.1" },
         "org.apache.httpcomponents:httpclient": { "packageName": "Apache-HttpComponents-HttpClient", "packageVersion": "4.5.x" },
+        "org.apache.httpcomponents.client5:httpclient5": { "packageName": "Apache-HttpComponents-HttpClient5", "packageVersion": "5.0.x" },
         "org.apache.httpcomponents:httpcore": { "packageName": "Apache-HttpComponents-HttpCore", "packageVersion": "4.4.x" },
+        "org.apache.httpcomponents.core5:httpcore5": { "packageName": "Apache-HttpComponents-HttpCore5", "packageVersion": "5.0.x" },
         "org.eclipse.jdt:org.eclipse.jdt.core": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
         "org.eclipse.text:org.eclipse.text": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
         "org.reactivestreams:reactive-streams": { "packageName": "Maven-org-reactivestreams_reactive-streams", "packageVersion": "1.x" },