Skip to content

Commit df6be3d

Browse files
andreas-grafenbergerandreas-grafenberger
authored
Merge branch 'aws:master' into feature/support-timeToLive-attributes-in-dynamodb-enhanced-client
2 parents 5206b59 + 3259632 commit df6be3d

File tree

2,129 files changed

+161322
-68957
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,129 files changed

+161322
-68957
lines changed

‎.brazil.json

Lines changed: 4 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" },
@@ -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 },
@@ -140,7 +142,9 @@
140142
"io.netty:netty-transport-classes-epoll": { "packageName": "Netty4", "packageVersion": "4.1" },
141143
"io.netty:netty-transport-native-unix-common": { "packageName": "Netty4", "packageVersion": "4.1" },
142144
"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" },
143146
"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" },
144148
"org.eclipse.jdt:org.eclipse.jdt.core": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
145149
"org.eclipse.text:org.eclipse.text": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
146150
"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.

‎.changes/2.31.16.json renamed to ‎.changes/2.31.x/2.31.16.json

File renamed without changes.

0 commit comments

Comments
 (0)