Skip to content

Commit 17cf7af

Browse files
authored
Merge branch 'master' into fix-typo-asyncrequestbody-forblockingoutputstream
2 parents 00c8891 + 97ceb0a commit 17cf7af

File tree

3,388 files changed

+420654
-144388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,388 files changed

+420654
-144388
lines changed

.all-contributorsrc

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,6 +1057,33 @@
10571057
"contributions": [
10581058
"code"
10591059
]
1060+
},
1061+
{
1062+
"login": "jencymaryjoseph",
1063+
"name": "Jency Joseph",
1064+
"avatar_url": "https://avatars.githubusercontent.com/u/35571282?v=4",
1065+
"profile": "https://github.com/jencymaryjoseph",
1066+
"contributions": [
1067+
"code"
1068+
]
1069+
},
1070+
{
1071+
"login": "reifiedbeans",
1072+
"name": "Drew Davis",
1073+
"avatar_url": "https://avatars.githubusercontent.com/u/9686215?v=4",
1074+
"profile": "https://github.com/reifiedbeans",
1075+
"contributions": [
1076+
"code"
1077+
]
1078+
},
1079+
{
1080+
"login": "MBoegers",
1081+
"name": "Merlin Bögershausen",
1082+
"avatar_url": "https://avatars.githubusercontent.com/u/7557397?v=4",
1083+
"profile": "https://mboegie.dev",
1084+
"contributions": [
1085+
"code"
1086+
]
10601087
}
10611088
],
10621089
"contributorsPerLine": 7,

.attach_pid885

Whitespace-only changes.

.brazil.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"modules": {
55
"annotations": { "packageName": "AwsJavaSdk-Core-Annotations" },
66
"apache-client": { "packageName": "AwsJavaSdk-HttpClient-ApacheClient" },
7+
"apache5-client": { "packageName": "AwsJavaSdk-HttpClient-Apache5Client" },
78
"arns": { "packageName": "AwsJavaSdk-Core-Arns" },
89
"auth": { "packageName": "AwsJavaSdk-Core-Auth" },
910
"auth-crt": { "packageName": "AwsJavaSdk-Core-AuthCrt" },
@@ -33,6 +34,7 @@
3334
"sdk-core": { "packageName": "AwsJavaSdk-Core" },
3435
"url-connection-client": { "packageName": "AwsJavaSdk-HttpClient-UrlConnectionClient" },
3536
"utils": { "packageName": "AwsJavaSdk-Core-Utils" },
37+
"utils-lite": { "packageName": "AwsJavaSdk-Core-UtilsLite" },
3638
"imds": { "packageName": "AwsJavaSdk-Imds" },
3739
"crt-core": { "packageName": "AwsJavaSdk-Core-CrtCore" },
3840
"checksums-spi": { "packageName": "AwsJavaSdk-Core-ChecksumsSpi" },
@@ -98,6 +100,7 @@
98100
"region-testing": { "skipImport": true },
99101
"release-scripts": { "skipImport": true },
100102
"s3-benchmarks": { "skipImport": true },
103+
"http-client-benchmarks": { "skipImport": true },
101104
"sdk-benchmarks": { "skipImport": true },
102105
"sdk-native-image-test": { "skipImport": true },
103106
"service-test-utils": { "skipImport": true },
@@ -140,7 +143,9 @@
140143
"io.netty:netty-transport-classes-epoll": { "packageName": "Netty4", "packageVersion": "4.1" },
141144
"io.netty:netty-transport-native-unix-common": { "packageName": "Netty4", "packageVersion": "4.1" },
142145
"org.apache.httpcomponents:httpclient": { "packageName": "Apache-HttpComponents-HttpClient", "packageVersion": "4.5.x" },
146+
"org.apache.httpcomponents.client5:httpclient5": { "packageName": "Apache-HttpComponents-HttpClient5", "packageVersion": "5.0.x" },
143147
"org.apache.httpcomponents:httpcore": { "packageName": "Apache-HttpComponents-HttpCore", "packageVersion": "4.4.x" },
148+
"org.apache.httpcomponents.core5:httpcore5": { "packageName": "Apache-HttpComponents-HttpCore5", "packageVersion": "5.0.x" },
144149
"org.eclipse.jdt:org.eclipse.jdt.core": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
145150
"org.eclipse.text:org.eclipse.text": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
146151
"org.reactivestreams:reactive-streams": { "packageName": "Maven-org-reactivestreams_reactive-streams", "packageVersion": "1.x" },
@@ -156,5 +161,9 @@
156161
"org.openrewrite:rewrite-java-8": {"packageName": "Maven-org-openrewrite_rewrite-java-8", "packageVersion": "8.x"},
157162
"org.openrewrite:rewrite-java": {"packageName": "Maven-org-openrewrite_rewrite-java", "packageVersion": "8.x"},
158163
"org.openrewrite.recipe:rewrite-java-dependencies": {"packageName": "Maven-org-openrewrite-recipe_rewrite-java-dependencies", "packageVersion": "1.x"}
164+
},
165+
166+
"test-dependencies": {
167+
"s3": ["JUnit5-5.x", "Aws-crt-java-1.0.x"]
159168
}
160169
}

0 commit comments

Comments
 (0)