Skip to content

Commit 302226d

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #2709 from aws/staging/d484acb2-2529-4787-889d-51b3a77094fe
Pull request: release <- staging/d484acb2-2529-4787-889d-51b3a77094fe
2 parents 10554e3 + 22652f3 commit 302226d

File tree

442 files changed

+14714
-469
lines changed

Some content is hidden

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

442 files changed

+14714
-469
lines changed

‎.changes/2.20.160.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"version": "2.20.160",
3+
"date": "2023-10-04",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS MediaTailor",
8+
"contributor": "",
9+
"description": "Updates DescribeVodSource to include a list of ad break opportunities in the response"
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS SDK for Java v2",
14+
"contributor": "",
15+
"description": "Add support for building JDK 21."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon AppConfig",
20+
"contributor": "",
21+
"description": "AWS AppConfig introduces KMS customer-managed key (CMK) encryption support for data saved to AppConfig's hosted configuration store."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon DataZone",
26+
"contributor": "",
27+
"description": "Initial release of Amazon DataZone"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon SageMaker Service",
32+
"contributor": "",
33+
"description": "Adding support for AdditionalS3DataSource, a data source used for training or inference that is in addition to the input dataset or model data."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Application Migration Service",
38+
"contributor": "",
39+
"description": "This release includes the following new APIs: ListConnectors, CreateConnector, UpdateConnector, DeleteConnector and UpdateSourceServer to support the source action framework feature."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "AWS SDK for Java v2",
44+
"contributor": "",
45+
"description": "Updated endpoint and partition metadata."
46+
}
47+
]
48+
}

‎.github/workflows/codebuild-ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,20 @@ jobs:
5959
timeout-minutes: 120
6060
with:
6161
project-name: aws-sdk-java-v2-JDK17
62+
jdk21-build:
63+
runs-on: ubuntu-latest
64+
steps:
65+
- name: Configure AWS Credentials
66+
uses: aws-actions/configure-aws-credentials@v1
67+
with:
68+
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
69+
aws-region: us-west-2
70+
role-duration-seconds: 7200
71+
- name: Run JDK21 build
72+
uses: aws-actions/aws-codebuild-run-build@v1
73+
timeout-minutes: 120
74+
with:
75+
project-name: aws-java-sdk-v2-JDK21
6276
windows-jdk8-build:
6377
runs-on: ubuntu-latest
6478
steps:

‎CHANGELOG.md

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
# __2.20.160__ __2023-10-04__
2+
## __AWS MediaTailor__
3+
- ### Features
4+
- Updates DescribeVodSource to include a list of ad break opportunities in the response
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Add support for building JDK 21.
9+
- Updated endpoint and partition metadata.
10+
11+
## __Amazon AppConfig__
12+
- ### Features
13+
- AWS AppConfig introduces KMS customer-managed key (CMK) encryption support for data saved to AppConfig's hosted configuration store.
14+
15+
## __Amazon DataZone__
16+
- ### Features
17+
- Initial release of Amazon DataZone
18+
19+
## __Amazon SageMaker Service__
20+
- ### Features
21+
- Adding support for AdditionalS3DataSource, a data source used for training or inference that is in addition to the input dataset or model data.
22+
23+
## __Application Migration Service__
24+
- ### Features
25+
- This release includes the following new APIs: ListConnectors, CreateConnector, UpdateConnector, DeleteConnector and UpdateSourceServer to support the source action framework feature.
26+
127
# __2.20.159__ __2023-10-03__
228
## __AWS Elemental MediaConvert__
329
- ### Features
@@ -439,7 +465,7 @@ Special thanks to the following contributors to this release:
439465
## __Contributors__
440466
Special thanks to the following contributors to this release:
441467

442-
[@faucct](https://github.com/faucct), [@psnilesh](https://github.com/psnilesh)
468+
[@psnilesh](https://github.com/psnilesh), [@faucct](https://github.com/faucct)
443469
# __2.20.146__ __2023-09-12__
444470
## __AWS CRT-based S3 Client__
445471
- ### Bugfixes
@@ -2180,7 +2206,7 @@ Special thanks to the following contributors to this release:
21802206
## __Contributors__
21812207
Special thanks to the following contributors to this release:
21822208

2183-
[@breader124](https://github.com/breader124), [@bmaizels](https://github.com/bmaizels)
2209+
[@bmaizels](https://github.com/bmaizels), [@breader124](https://github.com/breader124)
21842210
# __2.20.85__ __2023-06-13__
21852211
## __AWS CloudTrail__
21862212
- ### Features

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
5252
<dependency>
5353
<groupId>software.amazon.awssdk</groupId>
5454
<artifactId>bom</artifactId>
55-
<version>2.20.159</version>
55+
<version>2.20.160</version>
5656
<type>pom</type>
5757
<scope>import</scope>
5858
</dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
8686
<dependency>
8787
<groupId>software.amazon.awssdk</groupId>
8888
<artifactId>ec2</artifactId>
89-
<version>2.20.159</version>
89+
<version>2.20.160</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.20.159</version>
94+
<version>2.20.160</version>
9595
</dependency>
9696
```
9797

@@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
103103
<dependency>
104104
<groupId>software.amazon.awssdk</groupId>
105105
<artifactId>aws-sdk-java</artifactId>
106-
<version>2.20.159</version>
106+
<version>2.20.160</version>
107107
</dependency>
108108
```
109109

@@ -150,7 +150,7 @@ For information about maintenance and support for SDK major versions and their u
150150

151151
## Maintenance and Support for Java Versions
152152

153-
We maintain full support on Long-Term Support(LTS) releases: Java 8, Java 11, and Java 17.
153+
We maintain full support on Long-Term Support(LTS) releases: Java 8, Java 11, Java 17, and Java 21.
154154

155155
## Giving Feedback
156156
We need your help in making this SDK great. Please participate in the community and contribute to this effort by submitting issues, participating in discussion forums and submitting pull requests through the following channels:

‎archetypes/archetype-app-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.20.159</version>
23+
<version>2.20.160</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/archetype-lambda/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.20.159</version>
23+
<version>2.20.160</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/archetype-tools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.20.159</version>
23+
<version>2.20.160</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.20.159</version>
23+
<version>2.20.160</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.20.159</version>
20+
<version>2.20.160</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>
@@ -1808,6 +1808,11 @@ Amazon AutoScaling, etc).</description>
18081808
<artifactId>bedrock</artifactId>
18091809
<version>${awsjavasdk.version}</version>
18101810
</dependency>
1811+
<dependency>
1812+
<groupId>software.amazon.awssdk</groupId>
1813+
<artifactId>datazone</artifactId>
1814+
<version>${awsjavasdk.version}</version>
1815+
</dependency>
18111816
</dependencies>
18121817
<build>
18131818
<finalName>${project.artifactId}-${project.version}</finalName>

‎bom-internal/pom.xml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.20.159</version>
23+
<version>2.20.160</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

@@ -312,18 +312,6 @@
312312
<version>${guava.version}</version>
313313
<scope>test</scope>
314314
</dependency>
315-
<dependency>
316-
<groupId>org.junit.jupiter</groupId>
317-
<artifactId>junit-jupiter</artifactId>
318-
<version>${junit5.version}</version>
319-
<scope>test</scope>
320-
</dependency>
321-
<dependency>
322-
<groupId>org.junit.vintage</groupId>
323-
<artifactId>junit-vintage-engine</artifactId>
324-
<version>${junit5.version}</version>
325-
<scope>test</scope>
326-
</dependency>
327315
<dependency>
328316
<groupId>org.mockito</groupId>
329317
<artifactId>mockito-junit-jupiter</artifactId>
@@ -484,6 +472,19 @@
484472
<artifactId>plexus-utils</artifactId>
485473
<version>3.0.24</version>
486474
</dependency>
475+
<dependency>
476+
<groupId>net.bytebuddy</groupId>
477+
<artifactId>byte-buddy</artifactId>
478+
<version>${bytebuddy.version}</version>
479+
<scope>test</scope>
480+
</dependency>
481+
<dependency>
482+
<groupId>org.junit</groupId>
483+
<artifactId>junit-bom</artifactId>
484+
<version>${junit5.version}</version>
485+
<type>pom</type>
486+
<scope>import</scope>
487+
</dependency>
487488
</dependencies>
488489
</dependencyManagement>
489490

‎bom/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.20.159</version>
20+
<version>2.20.160</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>
@@ -1963,6 +1963,11 @@
19631963
<artifactId>bedrock</artifactId>
19641964
<version>${awsjavasdk.version}</version>
19651965
</dependency>
1966+
<dependency>
1967+
<groupId>software.amazon.awssdk</groupId>
1968+
<artifactId>datazone</artifactId>
1969+
<version>${awsjavasdk.version}</version>
1970+
</dependency>
19661971
</dependencies>
19671972
</dependencyManagement>
19681973
</project>

‎build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,4 +266,11 @@
266266
<Method name="fromFile"/>
267267
<Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
268268
</Match>
269+
270+
271+
<!-- New flags as of spotbogs 4.7.3.5 -->
272+
<!-- TODO: Fix or explicitly exclude each occurrence -->
273+
<Match>
274+
<Bug pattern="EI_EXPOSE_REP2,EI_EXPOSE_REP,MS_EXPOSE_REP,MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR,SA_FIELD_SELF_ASSIGNMENT,DCN_NULLPOINTER_EXCEPTION"/>
275+
</Match>
269276
</FindBugsFilter>

‎buildspecs/release-to-maven.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@ version: 0.2
33
phases:
44
install:
55
commands:
6-
- apt-get update
7-
- apt-get install python3 python3-pip -y
8-
- update-alternatives --install /usr/bin/python python /usr/bin/python3 10
9-
- update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 10
10-
- pip install awscli==1.19.34 --upgrade --user
11-
- pip install rsa
12-
- pip install typing
6+
- pip install awscli --upgrade --user
137

148
pre_build:
159
commands:

‎buildspecs/resources/ci.cloudformation.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Resources:
5252
- !Sub arn:aws:codebuild:${ AWS::Region }:${ AWS::AccountId }:project/aws-sdk-java-v2
5353
- !Sub arn:aws:codebuild:${ AWS::Region }:${ AWS::AccountId }:project/aws-sdk-java-v2-JDK11
5454
- !Sub arn:aws:codebuild:${ AWS::Region }:${ AWS::AccountId }:project/aws-sdk-java-v2-JDK17
55+
- !Sub arn:aws:codebuild:${ AWS::Region }:${ AWS::AccountId }:project/aws-java-sdk-v2-JDK21
5556
- !Sub arn:aws:codebuild:${ AWS::Region }:${ AWS::AccountId }:project/aws-sdk-java-v2-JDK8-windows
5657
- !Sub arn:aws:codebuild:${ AWS::Region }:${ AWS::AccountId }:project/aws-sdk-java-v2-native-image-test
5758
- !Sub arn:aws:codebuild:${ AWS::Region }:${ AWS::AccountId }:project/aws-sdk-java-v2-sonar
@@ -62,6 +63,7 @@ Resources:
6263
- !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/aws-sdk-java-v2:*
6364
- !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/aws-sdk-java-v2-JDK11:*
6465
- !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/aws-sdk-java-v2-JDK17:*
66+
- !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/aws-java-sdk-v2-JDK21:*
6567
- !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/aws-sdk-java-v2-JDK8-windows:*
6668
- !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/aws-sdk-java-v2-native-image-test:*
6769
- !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/aws-sdk-java-v2-sonar:*

‎bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.20.159</version>
24+
<version>2.20.160</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.20.159</version>
25+
<version>2.20.160</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.20.159</version>
24+
<version>2.20.160</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.20.159</version>
25+
<version>2.20.160</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.20.159</version>
24+
<version>2.20.160</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import com.squareup.javapoet.FieldSpec;
2020
import com.squareup.javapoet.MethodSpec;
2121
import com.squareup.javapoet.TypeSpec;
22-
import java.util.HashMap;
2322
import java.util.List;
2423
import java.util.Map;
24+
import java.util.TreeMap;
2525
import java.util.stream.Collectors;
2626
import javax.lang.model.element.Modifier;
2727
import software.amazon.awssdk.annotations.SdkPublicApi;
@@ -39,7 +39,7 @@
3939
*/
4040
public class ResponseMetadataSpec implements ClassSpec {
4141
private PoetExtension poetExtensions;
42-
private Map<String, String> headerMetadata = new HashMap<>();
42+
private Map<String, String> headerMetadata = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
4343

4444
public ResponseMetadataSpec(IntermediateModel model) {
4545
if (!CollectionUtils.isNullOrEmpty(model.getCustomizationConfig().getCustomResponseMetadata())) {

0 commit comments

Comments
 (0)