Skip to content

Commit cdf893f

Browse files
Merge pull request #4021 from aws/staging/b1faf907-92d7-48cb-8982-85e11195734d
Pull request: release <- staging/b1faf907-92d7-48cb-8982-85e11195734d
2 parents 0ee7e00 + 46dd42d commit cdf893f

File tree

572 files changed

+5383
-2324
lines changed

Some content is hidden

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

572 files changed

+5383
-2324
lines changed

.changes/2.31.60.json

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"version": "2.31.60",
3+
"date": "2025-06-09",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS AppSync",
8+
"contributor": "",
9+
"description": "Deprecate `atRestEncryptionEnabled` and `transitEncryptionEnabled` attributes in `CreateApiCache` action. Encryption is always enabled for new caches."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Cost Explorer Service",
14+
"contributor": "",
15+
"description": "Support dual-stack endpoints for ce api"
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS Marketplace Catalog Service",
20+
"contributor": "",
21+
"description": "The ListEntities API now supports the EntityID, LastModifiedDate, ProductTitle, and Visibility filters for machine learning products. You can also sort using all of those filters."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS SDK for Java v2",
26+
"contributor": "",
27+
"description": "Adds support for configuring bearer auth using a token sourced from the environment for services with the `enableEnvironmentBearerToken` customization flag."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS SDK for Java v2",
32+
"contributor": "",
33+
"description": "Updated Region class generation to use Partitions.json instead of the Endpoints.json and removed the hardcoded global regions."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon Connect Customer Profiles",
38+
"contributor": "",
39+
"description": "This release introduces capability of Profile Explorer, using correct ingestion timestamp & using historical data for computing calculated attributes, and new standard objects for T&H as part of Amazon Connect Customer Profiles service."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Amazon Elastic Compute Cloud",
44+
"contributor": "",
45+
"description": "Release to support Elastic VMware Service (Amazon EVS) Subnet and Amazon EVS Network Interface Types."
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon Elastic File System",
50+
"contributor": "",
51+
"description": "Added support for Internet Protocol Version 6 (IPv6) on EFS Service APIs and mount targets."
52+
},
53+
{
54+
"type": "feature",
55+
"category": "Amazon WorkSpaces Thin Client",
56+
"contributor": "",
57+
"description": "Add ConflictException to UpdateEnvironment API"
58+
},
59+
{
60+
"type": "feature",
61+
"category": "AWS SDK for Java v2",
62+
"contributor": "",
63+
"description": "Updated endpoint and partition metadata."
64+
}
65+
]
66+
}

CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,39 @@
11
#### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
2+
# __2.31.60__ __2025-06-09__
3+
## __AWS AppSync__
4+
- ### Features
5+
- Deprecate `atRestEncryptionEnabled` and `transitEncryptionEnabled` attributes in `CreateApiCache` action. Encryption is always enabled for new caches.
6+
7+
## __AWS Cost Explorer Service__
8+
- ### Features
9+
- Support dual-stack endpoints for ce api
10+
11+
## __AWS Marketplace Catalog Service__
12+
- ### Features
13+
- The ListEntities API now supports the EntityID, LastModifiedDate, ProductTitle, and Visibility filters for machine learning products. You can also sort using all of those filters.
14+
15+
## __AWS SDK for Java v2__
16+
- ### Features
17+
- Adds support for configuring bearer auth using a token sourced from the environment for services with the `enableEnvironmentBearerToken` customization flag.
18+
- Updated Region class generation to use Partitions.json instead of the Endpoints.json and removed the hardcoded global regions.
19+
- Updated endpoint and partition metadata.
20+
21+
## __Amazon Connect Customer Profiles__
22+
- ### Features
23+
- This release introduces capability of Profile Explorer, using correct ingestion timestamp & using historical data for computing calculated attributes, and new standard objects for T&H as part of Amazon Connect Customer Profiles service.
24+
25+
## __Amazon Elastic Compute Cloud__
26+
- ### Features
27+
- Release to support Elastic VMware Service (Amazon EVS) Subnet and Amazon EVS Network Interface Types.
28+
29+
## __Amazon Elastic File System__
30+
- ### Features
31+
- Added support for Internet Protocol Version 6 (IPv6) on EFS Service APIs and mount targets.
32+
33+
## __Amazon WorkSpaces Thin Client__
34+
- ### Features
35+
- Add ConflictException to UpdateEnvironment API
36+
237
# __2.31.59__ __2025-06-06__
338
## __AWS Key Management Service__
439
- ### Features

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To automatically manage module versions (currently all modules have the same ver
5151
<dependency>
5252
<groupId>software.amazon.awssdk</groupId>
5353
<artifactId>bom</artifactId>
54-
<version>2.31.59</version>
54+
<version>2.31.60</version>
5555
<type>pom</type>
5656
<scope>import</scope>
5757
</dependency>
@@ -85,12 +85,12 @@ Alternatively you can add dependencies for the specific services you use only:
8585
<dependency>
8686
<groupId>software.amazon.awssdk</groupId>
8787
<artifactId>ec2</artifactId>
88-
<version>2.31.59</version>
88+
<version>2.31.60</version>
8989
</dependency>
9090
<dependency>
9191
<groupId>software.amazon.awssdk</groupId>
9292
<artifactId>s3</artifactId>
93-
<version>2.31.59</version>
93+
<version>2.31.60</version>
9494
</dependency>
9595
```
9696

@@ -102,7 +102,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
102102
<dependency>
103103
<groupId>software.amazon.awssdk</groupId>
104104
<artifactId>aws-sdk-java</artifactId>
105-
<version>2.31.59</version>
105+
<version>2.31.60</version>
106106
</dependency>
107107
```
108108

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.31.59</version>
23+
<version>2.31.60</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.31.59</version>
23+
<version>2.31.60</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.31.59</version>
23+
<version>2.31.60</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.31.59</version>
23+
<version>2.31.60</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

aws-sdk-java/pom.xml

Lines changed: 1 addition & 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.31.59</version>
20+
<version>2.31.60</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

bom-internal/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.31.59</version>
23+
<version>2.31.60</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

bom/pom.xml

Lines changed: 1 addition & 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.31.59</version>
20+
<version>2.31.60</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

bundle-logging-bridge/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.31.59</version>
24+
<version>2.31.60</version>
2525
</parent>
2626
<artifactId>bundle-logging-bridge</artifactId>
2727
<packaging>jar</packaging>

bundle-sdk/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.31.59</version>
24+
<version>2.31.60</version>
2525
</parent>
2626
<artifactId>bundle-sdk</artifactId>
2727
<packaging>jar</packaging>

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.31.59</version>
24+
<version>2.31.60</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.31.59</version>
25+
<version>2.31.60</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite-maven-plugin/src/main/java/software/amazon/awssdk/codegen/lite/maven/plugin/RegionGenerationMojo.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,15 @@
2929
import software.amazon.awssdk.codegen.lite.regions.EndpointTagGenerator;
3030
import software.amazon.awssdk.codegen.lite.regions.PartitionMetadataGenerator;
3131
import software.amazon.awssdk.codegen.lite.regions.PartitionMetadataProviderGenerator;
32+
import software.amazon.awssdk.codegen.lite.regions.PartitionsRegionsMetadataLoader;
3233
import software.amazon.awssdk.codegen.lite.regions.RegionGenerator;
3334
import software.amazon.awssdk.codegen.lite.regions.RegionMetadataGenerator;
3435
import software.amazon.awssdk.codegen.lite.regions.RegionMetadataLoader;
3536
import software.amazon.awssdk.codegen.lite.regions.RegionMetadataProviderGenerator;
3637
import software.amazon.awssdk.codegen.lite.regions.ServiceMetadataGenerator;
3738
import software.amazon.awssdk.codegen.lite.regions.ServiceMetadataProviderGenerator;
3839
import software.amazon.awssdk.codegen.lite.regions.model.Partitions;
40+
import software.amazon.awssdk.codegen.lite.regions.model.PartitionsRegionsMetadata;
3941
import software.amazon.awssdk.utils.StringUtils;
4042

4143
/**
@@ -59,19 +61,24 @@ public class RegionGenerationMojo extends AbstractMojo {
5961
"${basedir}/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json")
6062
private File endpoints;
6163

64+
@Parameter(property = "partitionsJson", defaultValue =
65+
"${basedir}/../../codegen/src/main/resources/software/amazon/awssdk/codegen/rules/partitions.json.resource")
66+
private File partitionsJson;
67+
6268
@Override
6369
public void execute() throws MojoExecutionException {
6470
Path baseSourcesDirectory = Paths.get(outputDirectory).resolve("generated-sources").resolve("sdk");
6571
Path testsDirectory = Paths.get(outputDirectory).resolve("generated-test-sources").resolve("sdk-tests");
6672

6773
Partitions partitions = RegionMetadataLoader.build(endpoints);
74+
PartitionsRegionsMetadata regionPartitions = PartitionsRegionsMetadataLoader.build(partitionsJson);
6875

6976
generatePartitionMetadataClass(baseSourcesDirectory, partitions);
70-
generateRegionClass(baseSourcesDirectory, partitions);
77+
generateRegionClass(baseSourcesDirectory, regionPartitions);
7178
generateServiceMetadata(baseSourcesDirectory, partitions);
72-
generateRegions(baseSourcesDirectory, partitions);
79+
generateRegions(baseSourcesDirectory, regionPartitions);
7380
generatePartitionProvider(baseSourcesDirectory, partitions);
74-
generateRegionProvider(baseSourcesDirectory, partitions);
81+
generateRegionProvider(baseSourcesDirectory, regionPartitions);
7582
generateServiceProvider(baseSourcesDirectory, partitions);
7683
generateEndpointTags(baseSourcesDirectory, partitions);
7784

@@ -88,7 +95,7 @@ public void generatePartitionMetadataClass(Path baseSourcesDirectory, Partitions
8895
REGION_BASE)).generate());
8996
}
9097

91-
public void generateRegionClass(Path baseSourcesDirectory, Partitions partitions) {
98+
public void generateRegionClass(Path baseSourcesDirectory, PartitionsRegionsMetadata partitions) {
9299
Path sourcesDirectory = baseSourcesDirectory.resolve(StringUtils.replace(REGION_BASE, ".", "/"));
93100
new CodeGenerator(sourcesDirectory.toString(), new RegionGenerator(partitions, REGION_BASE)).generate();
94101
}
@@ -105,7 +112,7 @@ public void generateServiceMetadata(Path baseSourcesDirectory, Partitions partit
105112
.generate());
106113
}
107114

108-
public void generateRegions(Path baseSourcesDirectory, Partitions partitions) {
115+
public void generateRegions(Path baseSourcesDirectory, PartitionsRegionsMetadata partitions) {
109116
Path sourcesDirectory = baseSourcesDirectory.resolve(StringUtils.replace(REGION_METADATA_BASE, ".", "/"));
110117
partitions.getPartitions()
111118
.forEach(p -> p.getRegions().forEach((k, v) ->
@@ -126,7 +133,7 @@ public void generatePartitionProvider(Path baseSourcesDirectory, Partitions part
126133
.generate();
127134
}
128135

129-
public void generateRegionProvider(Path baseSourcesDirectory, Partitions partitions) {
136+
public void generateRegionProvider(Path baseSourcesDirectory, PartitionsRegionsMetadata partitions) {
130137
Path sourcesDirectory = baseSourcesDirectory.resolve(StringUtils.replace(REGION_BASE, ".", "/"));
131138
new CodeGenerator(sourcesDirectory.toString(), new RegionMetadataProviderGenerator(partitions,
132139
REGION_METADATA_BASE,

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.31.59</version>
24+
<version>2.31.60</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package software.amazon.awssdk.codegen.lite.regions;
17+
18+
import com.fasterxml.jackson.jr.ob.JSON;
19+
import java.io.File;
20+
import java.io.IOException;
21+
import software.amazon.awssdk.annotations.SdkInternalApi;
22+
import software.amazon.awssdk.codegen.lite.regions.model.PartitionsRegionsMetadata;
23+
24+
/**
25+
* Loads and parses the partitions.json file into {@link PartitionsRegionsMetadata}.
26+
*/
27+
@SdkInternalApi
28+
public final class PartitionsRegionsMetadataLoader {
29+
30+
private PartitionsRegionsMetadataLoader() {
31+
}
32+
33+
public static PartitionsRegionsMetadata build(File path) {
34+
return loadPartitionFromStream(path, path.toString());
35+
}
36+
37+
private static PartitionsRegionsMetadata loadPartitionFromStream(File stream, String location) {
38+
39+
try {
40+
return JSON.std.with(JSON.Feature.USE_IS_GETTERS)
41+
.beanFrom(PartitionsRegionsMetadata.class, stream);
42+
43+
} catch (IOException | RuntimeException e) {
44+
throw new RuntimeException("Error while loading partitions file from " + location, e);
45+
}
46+
}
47+
}

0 commit comments

Comments
 (0)