Skip to content

Commit b8786c7

Browse files
authored
Merge branch 'master' into dependabot/maven/com.github.spotbugs-spotbugs-4.8.6
2 parents 6670d18 + c7c9447 commit b8786c7

File tree

5,267 files changed

+846203
-242717
lines changed

Some content is hidden

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

5,267 files changed

+846203
-242717
lines changed

.all-contributorsrc

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,105 @@
994994
"contributions": [
995995
"code"
996996
]
997+
},
998+
{
999+
"login": "prateek-vats",
1000+
"name": "prateek-vats",
1001+
"avatar_url": "https://avatars.githubusercontent.com/u/177409977?v=4",
1002+
"profile": "https://github.com/prateek-vats",
1003+
"contributions": [
1004+
"code"
1005+
]
1006+
},
1007+
{
1008+
"login": "Fred1155",
1009+
"name": "Bole1155",
1010+
"avatar_url": "https://avatars.githubusercontent.com/u/49867651?v=4",
1011+
"profile": "https://github.com/Fred1155",
1012+
"contributions": [
1013+
"code"
1014+
]
1015+
},
1016+
{
1017+
"login": "Xtansia",
1018+
"name": "Thomas Farr",
1019+
"avatar_url": "https://avatars.githubusercontent.com/u/1222964?v=4",
1020+
"profile": "https://xtansia.com",
1021+
"contributions": [
1022+
"code"
1023+
]
1024+
},
1025+
{
1026+
"login": "S-Saranya1",
1027+
"name": "Saranya Somepalli",
1028+
"avatar_url": "https://avatars.githubusercontent.com/u/196712423?v=4",
1029+
"profile": "https://github.com/S-Saranya1",
1030+
"contributions": [
1031+
"code"
1032+
]
1033+
},
1034+
{
1035+
"login": "RanVaknin",
1036+
"name": "Ran Vaknin",
1037+
"avatar_url": "https://avatars.githubusercontent.com/u/50976344?v=4",
1038+
"profile": "https://github.com/RanVaknin",
1039+
"contributions": [
1040+
"code"
1041+
]
1042+
},
1043+
{
1044+
"login": "greg-at-moderne",
1045+
"name": "Greg Oledzki",
1046+
"avatar_url": "https://avatars.githubusercontent.com/u/192309513?v=4",
1047+
"profile": "https://github.com/greg-at-moderne",
1048+
"contributions": [
1049+
"code"
1050+
]
1051+
},
1052+
{
1053+
"login": "kstich",
1054+
"name": "Kevin Stich",
1055+
"avatar_url": "https://avatars.githubusercontent.com/u/26905335?v=4",
1056+
"profile": "https://github.com/kstich",
1057+
"contributions": [
1058+
"code"
1059+
]
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+
]
1087+
},
1088+
{
1089+
"login": "KENNYSOFT",
1090+
"name": "Hyeonmin Park",
1091+
"avatar_url": "https://avatars.githubusercontent.com/u/6624567?v=4",
1092+
"profile": "http://kennysoft.kr",
1093+
"contributions": [
1094+
"doc"
1095+
]
9971096
}
9981097
],
9991098
"contributorsPerLine": 7,

.brazil.json

Lines changed: 22 additions & 3 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" },
@@ -14,7 +15,9 @@
1415
"aws-json-protocol": { "packageName": "AwsJavaSdk-Core-AwsJsonProtocol" },
1516
"aws-query-protocol": { "packageName": "AwsJavaSdk-Core-AwsQueryProtocol" },
1617
"aws-xml-protocol": { "packageName": "AwsJavaSdk-Core-AwsXmlProtocol" },
18+
"smithy-rpcv2-protocol": { "packageName": "AwsJavaSdk-Core-SmithyRpcV2Protocol" },
1719
"cloudwatch-metric-publisher": { "packageName": "AwsJavaSdk-MetricPublisher-CloudWatch" },
20+
"emf-metric-logging-publisher": { "packageName": "AwsJavaSdk-MetricPublisher-Emf" },
1821
"codegen": { "packageName": "AwsJavaSdk-Codegen" },
1922
"dynamodb-enhanced": { "packageName": "AwsJavaSdk-DynamoDb-Enhanced" },
2023
"http-client-spi": { "packageName": "AwsJavaSdk-HttpClient" },
@@ -31,6 +34,7 @@
3134
"sdk-core": { "packageName": "AwsJavaSdk-Core" },
3235
"url-connection-client": { "packageName": "AwsJavaSdk-HttpClient-UrlConnectionClient" },
3336
"utils": { "packageName": "AwsJavaSdk-Core-Utils" },
37+
"utils-lite": { "packageName": "AwsJavaSdk-Core-UtilsLite" },
3438
"imds": { "packageName": "AwsJavaSdk-Imds" },
3539
"crt-core": { "packageName": "AwsJavaSdk-Core-CrtCore" },
3640
"checksums-spi": { "packageName": "AwsJavaSdk-Core-ChecksumsSpi" },
@@ -46,6 +50,7 @@
4650

4751
"dynamodb": { "packageName": "AwsJavaSdk-DynamoDb" },
4852
"waf": { "packageName": "AwsJavaSdk-Waf" },
53+
"v2-migration": { "packageName": "AwsJavaSdk-Tooling-V2Migration"},
4954

5055
"third-party-jackson-core": {
5156
"packageName": "AwsJavaSdk-ThirdParty-JacksonCore",
@@ -95,6 +100,7 @@
95100
"region-testing": { "skipImport": true },
96101
"release-scripts": { "skipImport": true },
97102
"s3-benchmarks": { "skipImport": true },
103+
"http-client-benchmarks": { "skipImport": true },
98104
"sdk-benchmarks": { "skipImport": true },
99105
"sdk-native-image-test": { "skipImport": true },
100106
"service-test-utils": { "skipImport": true },
@@ -105,14 +111,18 @@
105111
"tests-coverage-reporting": { "skipImport": true },
106112
"third-party": { "skipImport": true },
107113
"third-party-slf4j-api": { "skipImport": true },
114+
"v2-migration-tests": {"skipImport": true},
108115
"crt-unavailable-tests": { "skipImport": true },
109-
"bundle-shading-tests": { "skipImport": true }
116+
"bundle-shading-tests": { "skipImport": true },
117+
"architecture-tests": {"skipImport": true},
118+
"s3-tests": {"skipImport": true}
110119
},
111120

112121
"dependencies": {
113122
"com.fasterxml.jackson.core:jackson-annotations": { "packageName": "Jackson-annotations", "packageVersion": "2.9.x" },
114123
"com.fasterxml.jackson.core:jackson-core": { "packageName": "Jackson-core", "packageVersion": "2.9.x" },
115-
"com.fasterxml.jackson.core:jackson-databind": { "packageName": "Jackson-databind", "packageVersion": "2.9.x" },
124+
"com.fasterxml.jackson.core:jackson-databind": { "packageName": "Jackson-databind", "packageVersion": "2.12.x" },
125+
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { "packageName": "Jackson-datatype-jdk8", "packageVersion": "2.12.x" },
116126
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { "packageName": "Jackson-dataformat-cbor", "packageVersion": "2.9.x" },
117127
"com.fasterxml.jackson.jr:jackson-jr-objects": { "packageName": "Maven-com-fasterxml-jackson-jr_jackson-jr-objects", "packageVersion": "2.11.x" },
118128
"com.fasterxml.jackson.jr:jackson-jr-stree": { "packageName": "Maven-com-fasterxml-jackson-jr_jackson-jr-stree", "packageVersion": "2.11.x" },
@@ -133,7 +143,9 @@
133143
"io.netty:netty-transport-classes-epoll": { "packageName": "Netty4", "packageVersion": "4.1" },
134144
"io.netty:netty-transport-native-unix-common": { "packageName": "Netty4", "packageVersion": "4.1" },
135145
"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" },
136147
"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" },
137149
"org.eclipse.jdt:org.eclipse.jdt.core": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
138150
"org.eclipse.text:org.eclipse.text": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
139151
"org.reactivestreams:reactive-streams": { "packageName": "Maven-org-reactivestreams_reactive-streams", "packageVersion": "1.x" },
@@ -145,6 +157,13 @@
145157
"org.junit.jupiter:junit-jupiter": { "packageName": "JUnit5", "packageVersion": "5.x" },
146158
"org.mockito:mockito-core": { "packageName": "Mockito", "packageVersion": "3.x" },
147159
"io.reactivex.rxjava3:rxjava": { "packageName": "RxJava", "packageVersion": "3.x" },
148-
"org.assertj:assertj-core": { "packageName": "AssertJ", "packageVersion": "3.22.x" }
160+
"org.assertj:assertj-core": { "packageName": "AssertJ", "packageVersion": "3.22.x" },
161+
"org.openrewrite:rewrite-java-8": {"packageName": "Maven-org-openrewrite_rewrite-java-8", "packageVersion": "8.x"},
162+
"org.openrewrite:rewrite-java": {"packageName": "Maven-org-openrewrite_rewrite-java", "packageVersion": "8.x"},
163+
"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"]
149168
}
150169
}

.changes/2.25.x/2.25.37.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "feature",
1919
"category": "AWS SDK for Java V2",
2020
"contributor": "",
21-
"description": "Source account Id from credentials to use in endpoint construction"
21+
"description": "Support AWS-account-based endpoints for AWS services that choose to generate them. Note that endpoint URLs and host names can change when this feature is activated. See the documentation for details: https://docs.aws.amazon.com/sdkref/latest/guide/feature-account-endpoints.html"
2222
},
2323
{
2424
"type": "feature",

0 commit comments

Comments
 (0)