Merge remote-tracking branch 'origin/master' into all-contributors/add-akidambisrinivasan

Author: dagnir

.all-contributorsrc

@@ -967,6 +967,142 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "eckardnet",
+      "name": "Eckard Mühlich",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13320705?v=4",
+      "profile": "https://github.com/eckardnet",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "klopfdreh",
+      "name": "Tobias Soloschenko",
+      "avatar_url": "https://avatars.githubusercontent.com/u/980773?v=4",
+      "profile": "http://wicket.apache.org",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Madrigal",
+      "name": "Luis Madrigal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/599908?v=4",
+      "profile": "https://github.com/Madrigal",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "chaykin",
+      "name": "Kirill Chaykin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2480265?v=4",
+      "profile": "https://github.com/chaykin",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "prateek-vats",
+      "name": "prateek-vats",
+      "avatar_url": "https://avatars.githubusercontent.com/u/177409977?v=4",
+      "profile": "https://github.com/prateek-vats",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Fred1155",
+      "name": "Bole1155",
+      "avatar_url": "https://avatars.githubusercontent.com/u/49867651?v=4",
+      "profile": "https://github.com/Fred1155",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Xtansia",
+      "name": "Thomas Farr",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1222964?v=4",
+      "profile": "https://xtansia.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "S-Saranya1",
+      "name": "Saranya Somepalli",
+      "avatar_url": "https://avatars.githubusercontent.com/u/196712423?v=4",
+      "profile": "https://github.com/S-Saranya1",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "RanVaknin",
+      "name": "Ran Vaknin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/50976344?v=4",
+      "profile": "https://github.com/RanVaknin",
+      "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"
+      ]
+    },
+    {
+      "login": "MBoegers",
+      "name": "Merlin Bögershausen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7557397?v=4",
+      "profile": "https://mboegie.dev",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "KENNYSOFT",
+      "name": "Hyeonmin Park",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6624567?v=4",
+      "profile": "http://kennysoft.kr",
+      "contributions": [
+        "doc"
+      ]
+>>>>>>> origin/master
     }
   ],
   "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" },
@@ -14,7 +15,9 @@
         "aws-json-protocol": { "packageName": "AwsJavaSdk-Core-AwsJsonProtocol" },
         "aws-query-protocol": { "packageName": "AwsJavaSdk-Core-AwsQueryProtocol" },
         "aws-xml-protocol": { "packageName": "AwsJavaSdk-Core-AwsXmlProtocol" },
+        "smithy-rpcv2-protocol": { "packageName": "AwsJavaSdk-Core-SmithyRpcV2Protocol" },
         "cloudwatch-metric-publisher": { "packageName": "AwsJavaSdk-MetricPublisher-CloudWatch" },
+        "emf-metric-logging-publisher": { "packageName": "AwsJavaSdk-MetricPublisher-Emf" },
         "codegen": { "packageName": "AwsJavaSdk-Codegen" },
         "dynamodb-enhanced": { "packageName": "AwsJavaSdk-DynamoDb-Enhanced" },
         "http-client-spi": { "packageName": "AwsJavaSdk-HttpClient" },
@@ -31,6 +34,7 @@
         "sdk-core": { "packageName": "AwsJavaSdk-Core" },
         "url-connection-client": { "packageName": "AwsJavaSdk-HttpClient-UrlConnectionClient" },
         "utils": { "packageName": "AwsJavaSdk-Core-Utils" },
+        "utils-lite": { "packageName": "AwsJavaSdk-Core-UtilsLite" },
         "imds": { "packageName": "AwsJavaSdk-Imds" },
         "crt-core": { "packageName": "AwsJavaSdk-Core-CrtCore" },
         "checksums-spi": { "packageName": "AwsJavaSdk-Core-ChecksumsSpi" },
@@ -41,9 +45,12 @@
         "http-auth-aws": { "packageName": "AwsJavaSdk-Core-HttpAuthAws" },
         "http-auth-aws-crt": { "packageName": "AwsJavaSdk-Core-HttpAuthAwsCrt" },
         "http-auth-aws-eventstream": { "packageName": "AwsJavaSdk-Core-HttpAuthAwsEventStream" },
+        "retries-spi": { "packageName": "AwsJavaSdk-Core-RetriesSpi" },
+        "retries": { "packageName": "AwsJavaSdk-Core-Retries" },
 
         "dynamodb": { "packageName": "AwsJavaSdk-DynamoDb" },
         "waf": { "packageName": "AwsJavaSdk-Waf" },
+        "v2-migration": { "packageName":  "AwsJavaSdk-Tooling-V2Migration"},
 
         "third-party-jackson-core": {
             "packageName": "AwsJavaSdk-ThirdParty-JacksonCore",
@@ -93,6 +100,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 },
@@ -103,13 +111,18 @@
         "tests-coverage-reporting": { "skipImport": true },
         "third-party": { "skipImport": true },
         "third-party-slf4j-api": { "skipImport": true },
-        "crt-unavailable-tests": { "skipImport": true }
+        "v2-migration-tests": {"skipImport":  true},
+        "crt-unavailable-tests": { "skipImport": true },
+        "bundle-shading-tests": { "skipImport": true },
+        "architecture-tests": {"skipImport":  true},
+        "s3-tests": {"skipImport":  true}
     },
 
     "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" },
@@ -130,7 +143,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" },
@@ -142,6 +157,13 @@
         "org.junit.jupiter:junit-jupiter": { "packageName": "JUnit5", "packageVersion": "5.x" },
         "org.mockito:mockito-core": { "packageName": "Mockito", "packageVersion": "3.x" },
         "io.reactivex.rxjava3:rxjava": { "packageName": "RxJava", "packageVersion": "3.x" },
-        "org.assertj:assertj-core": { "packageName": "AssertJ", "packageVersion": "3.22.x" }
+        "org.assertj:assertj-core": { "packageName": "AssertJ", "packageVersion": "3.22.x" },
+        "org.openrewrite:rewrite-java-8": {"packageName": "Maven-org-openrewrite_rewrite-java-8", "packageVersion": "8.x"},
+        "org.openrewrite:rewrite-java": {"packageName": "Maven-org-openrewrite_rewrite-java", "packageVersion": "8.x"},
+        "org.openrewrite.recipe:rewrite-java-dependencies": {"packageName": "Maven-org-openrewrite-recipe_rewrite-java-dependencies", "packageVersion": "1.x"}
+    },
+
+    "test-dependencies": {
+        "s3": ["JUnit5-5.x", "Aws-crt-java-1.0.x"]
     }
 }