Skip to content

Commit 0603ba2

Browse files
alextwoodsalextwoods
authored
Merge branch 'master' into alexwoo/eventstream-shared-customization
2 parents 9056c2b + 6d791e0 commit 0603ba2

File tree

2,031 files changed

+165938
-35775
lines changed

Some content is hidden

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

2,031 files changed

+165938
-35775
lines changed

‎.all-contributorsrc‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,6 +1039,42 @@
10391039
"contributions": [
10401040
"code"
10411041
]
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+
]
10421078
}
10431079
],
10441080
"contributorsPerLine": 7,

‎.brazil.json‎

Lines changed: 6 additions & 1 deletion
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" },
@@ -98,6 +99,7 @@
9899
"region-testing": { "skipImport": true },
99100
"release-scripts": { "skipImport": true },
100101
"s3-benchmarks": { "skipImport": true },
102+
"http-client-benchmarks": { "skipImport": true },
101103
"sdk-benchmarks": { "skipImport": true },
102104
"sdk-native-image-test": { "skipImport": true },
103105
"service-test-utils": { "skipImport": true },
@@ -118,7 +120,8 @@
118120
"dependencies": {
119121
"com.fasterxml.jackson.core:jackson-annotations": { "packageName": "Jackson-annotations", "packageVersion": "2.9.x" },
120122
"com.fasterxml.jackson.core:jackson-core": { "packageName": "Jackson-core", "packageVersion": "2.9.x" },
121-
"com.fasterxml.jackson.core:jackson-databind": { "packageName": "Jackson-databind", "packageVersion": "2.9.x" },
123+
"com.fasterxml.jackson.core:jackson-databind": { "packageName": "Jackson-databind", "packageVersion": "2.12.x" },
124+
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": { "packageName": "Jackson-datatype-jdk8", "packageVersion": "2.12.x" },
122125
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { "packageName": "Jackson-dataformat-cbor", "packageVersion": "2.9.x" },
123126
"com.fasterxml.jackson.jr:jackson-jr-objects": { "packageName": "Maven-com-fasterxml-jackson-jr_jackson-jr-objects", "packageVersion": "2.11.x" },
124127
"com.fasterxml.jackson.jr:jackson-jr-stree": { "packageName": "Maven-com-fasterxml-jackson-jr_jackson-jr-stree", "packageVersion": "2.11.x" },
@@ -139,7 +142,9 @@
139142
"io.netty:netty-transport-classes-epoll": { "packageName": "Netty4", "packageVersion": "4.1" },
140143
"io.netty:netty-transport-native-unix-common": { "packageName": "Netty4", "packageVersion": "4.1" },
141144
"org.apache.httpcomponents:httpclient": { "packageName": "Apache-HttpComponents-HttpClient", "packageVersion": "4.5.x" },
145+
"org.apache.httpcomponents.client5:httpclient5": { "packageName": "Apache-HttpComponents-HttpClient5", "packageVersion": "5.0.x" },
142146
"org.apache.httpcomponents:httpcore": { "packageName": "Apache-HttpComponents-HttpCore", "packageVersion": "4.4.x" },
147+
"org.apache.httpcomponents.core5:httpcore5": { "packageName": "Apache-HttpComponents-HttpCore5", "packageVersion": "5.0.x" },
143148
"org.eclipse.jdt:org.eclipse.jdt.core": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
144149
"org.eclipse.text:org.eclipse.text": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
145150
"org.reactivestreams:reactive-streams": { "packageName": "Maven-org-reactivestreams_reactive-streams", "packageVersion": "1.x" },

.changes/2.31.0.json renamed to .changes/2.31.x/2.31.0.json

File renamed without changes.

.changes/2.31.1.json renamed to .changes/2.31.x/2.31.1.json

File renamed without changes.

.changes/2.31.10.json renamed to .changes/2.31.x/2.31.10.json

File renamed without changes.

.changes/2.31.11.json renamed to .changes/2.31.x/2.31.11.json

File renamed without changes.

.changes/2.31.12.json renamed to .changes/2.31.x/2.31.12.json

File renamed without changes.

.changes/2.31.13.json renamed to .changes/2.31.x/2.31.13.json

File renamed without changes.

.changes/2.31.14.json renamed to .changes/2.31.x/2.31.14.json

File renamed without changes.

.changes/2.31.15.json renamed to .changes/2.31.x/2.31.15.json

File renamed without changes.

0 commit comments

Comments
 (0)