Skip to content

Commit 1330d6c

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #3891 from aws/staging/f5787550-f045-4517-aecf-5199083f6f03
Pull request: release <- staging/f5787550-f045-4517-aecf-5199083f6f03
2 parents aa1a800 + b3508ae commit 1330d6c

File tree

519 files changed

+1101
-575
lines changed

Some content is hidden

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

519 files changed

+1101
-575
lines changed

‎.changes/2.31.35.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"version": "2.31.35",
3+
"date": "2025-05-02",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java V2",
8+
"contributor": "",
9+
"description": "Add synchronization around use of JDT code formatter to prevent NPE/race condition during code generation."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Directory Service",
14+
"contributor": "",
15+
"description": "Doc only update - fixed typos."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon Kinesis",
20+
"contributor": "",
21+
"description": "Marking ResourceARN as required for Amazon Kinesis Data Streams APIs TagResource, UntagResource, and ListTagsForResource."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Data Automation for Amazon Bedrock",
26+
"contributor": "",
27+
"description": "Added support for Custom output and blueprints for AUDIO data types."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS SDK for Java v2",
32+
"contributor": "",
33+
"description": "Updated endpoint and partition metadata."
34+
}
35+
]
36+
}

‎.github/workflows/changelog-verification.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Changelog verification
2+
3+
on:
4+
pull_request:
5+
types: [ opened, synchronize, reopened, labeled, unlabeled ]
6+
branches:
7+
- master
8+
9+
jobs:
10+
changelog-verification:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: Check for changelog entry
15+
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-changelog') }}
16+
run: |
17+
git fetch origin ${{ github.base_ref }} --depth 1 && \
18+
git diff remotes/origin/${{ github.base_ref }} --name-only | grep -P "\.changes/next-release/*[a-zA-Z0-9_-]+\.json"
19+
- name: Error message
20+
if: ${{ failure() }}
21+
run: |
22+
echo "::error ::No new/updated changelog entry found in /.changes/next-release directory. Please either:"
23+
echo "::error ::* Add a changelog entry (see CONTRIBUTING.md for instructions) –or–"
24+
echo "::error ::* Add the 'no-changelog' label to this PR (in rare cases not warranting a changelog entry)"
25+
exit 1

‎CHANGELOG.md

+21
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,25 @@
11
#### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
2+
# __2.31.35__ __2025-05-02__
3+
## __AWS Directory Service__
4+
- ### Features
5+
- Doc only update - fixed typos.
6+
7+
## __AWS SDK for Java V2__
8+
- ### Bugfixes
9+
- Add synchronization around use of JDT code formatter to prevent NPE/race condition during code generation.
10+
11+
## __AWS SDK for Java v2__
12+
- ### Features
13+
- Updated endpoint and partition metadata.
14+
15+
## __Amazon Kinesis__
16+
- ### Features
17+
- Marking ResourceARN as required for Amazon Kinesis Data Streams APIs TagResource, UntagResource, and ListTagsForResource.
18+
19+
## __Data Automation for Amazon Bedrock__
20+
- ### Features
21+
- Added support for Custom output and blueprints for AUDIO data types.
22+
223
# __2.31.34__ __2025-05-01__
324
## __AWS SDK for Java v2__
425
- ### Features

‎README.md

+4-4
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.34</version>
54+
<version>2.31.35</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.34</version>
88+
<version>2.31.35</version>
8989
</dependency>
9090
<dependency>
9191
<groupId>software.amazon.awssdk</groupId>
9292
<artifactId>s3</artifactId>
93-
<version>2.31.34</version>
93+
<version>2.31.35</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.34</version>
105+
<version>2.31.35</version>
106106
</dependency>
107107
```
108108

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

+1-1
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.34</version>
23+
<version>2.31.35</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/archetype-lambda/pom.xml

+1-1
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.34</version>
23+
<version>2.31.35</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/archetype-tools/pom.xml

+1-1
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.34</version>
23+
<version>2.31.35</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/pom.xml

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

‎aws-sdk-java/pom.xml

+1-1
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.34</version>
20+
<version>2.31.35</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

+1-1
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.34</version>
23+
<version>2.31.35</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

+1-1
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.34</version>
20+
<version>2.31.35</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎bundle-logging-bridge/pom.xml

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

‎bundle-sdk/pom.xml

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

‎bundle/pom.xml

+1-1
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.34</version>
24+
<version>2.31.35</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

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

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

‎codegen-lite/pom.xml

+1-1
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.34</version>
24+
<version>2.31.35</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/JavaCodeFormatter.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
public class JavaCodeFormatter implements CodeTransformer {
3333

3434
private static final Map<String, Object> DEFAULT_FORMATTER_OPTIONS;
35+
private static final Object lock = new Object();
3536

3637
static {
3738
DEFAULT_FORMATTER_OPTIONS = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
@@ -89,10 +90,16 @@ public JavaCodeFormatter(final Map<String, Object> overrideOptions) {
8990

9091
@Override
9192
public String apply(String contents) {
92-
TextEdit edit = codeFormatter.format(
93+
TextEdit edit;
94+
// There is a race condition in the org.eclipse.jdt.internal.formatter.DefaultCodeFormatter in version 3.10.0.
95+
// The static PROBING_SCANNER can have its state changed by multiple threads.
96+
// Synchronize our usage of that class to ensure we don't hit this.
97+
synchronized (lock) {
98+
edit = codeFormatter.format(
9399
CodeFormatter.K_COMPILATION_UNIT
94100
| CodeFormatter.F_INCLUDE_COMMENTS, contents, 0,
95101
contents.length(), 0, System.lineSeparator());
102+
}
96103

97104
if (edit == null) {
98105
// TODO log a fatal or warning here. Throwing an exception is causing the actual freemarker error to be lost

‎codegen-maven-plugin/pom.xml

+1-1
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.34</version>
25+
<version>2.31.35</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

+1-1
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.34</version>
24+
<version>2.31.35</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/emitters/JavaCodeFormatter.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
public class JavaCodeFormatter implements CodeTransformer {
3434

3535
private static final Map<String, Object> DEFAULT_FORMATTER_OPTIONS;
36+
private static final Object lock = new Object();
3637

3738
static {
3839
DEFAULT_FORMATTER_OPTIONS = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
@@ -90,10 +91,16 @@ public JavaCodeFormatter(final Map<String, Object> overrideOptions) {
9091

9192
@Override
9293
public String apply(String contents) {
93-
TextEdit edit = codeFormatter.format(
94+
TextEdit edit;
95+
// There is a race condition in the org.eclipse.jdt.internal.formatter.DefaultCodeFormatter in version 3.10.0.
96+
// The static PROBING_SCANNER can have its state changed by multiple threads.
97+
// Synchronize our usage of that class to ensure we don't hit this.
98+
synchronized (lock) {
99+
edit = codeFormatter.format(
94100
CodeFormatter.K_COMPILATION_UNIT
95101
| CodeFormatter.F_INCLUDE_COMMENTS, contents, 0,
96102
contents.length(), 0, Constant.LF);
103+
}
97104

98105
if (edit == null) {
99106
// TODO log a fatal or warning here. Throwing an exception is causing the actual freemarker error to be lost

‎core/annotations/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.31.34</version>
23+
<version>2.31.35</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/arns/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.31.34</version>
23+
<version>2.31.35</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth-crt/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.31.34</version>
25+
<version>2.31.35</version>
2626
</parent>
2727

2828
<artifactId>auth-crt</artifactId>

‎core/auth/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.31.34</version>
25+
<version>2.31.35</version>
2626
</parent>
2727

2828
<artifactId>auth</artifactId>

‎core/aws-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.31.34</version>
25+
<version>2.31.35</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎core/checksums-spi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.31.34</version>
25+
<version>2.31.35</version>
2626
</parent>
2727

2828
<artifactId>checksums-spi</artifactId>

‎core/checksums/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.31.34</version>
25+
<version>2.31.35</version>
2626
</parent>
2727

2828
<artifactId>checksums</artifactId>

‎core/crt-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>core</artifactId>
24-
<version>2.31.34</version>
24+
<version>2.31.35</version>
2525
</parent>
2626

2727
<artifactId>crt-core</artifactId>

‎core/endpoints-spi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.31.34</version>
23+
<version>2.31.35</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/http-auth-aws-crt/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.31.34</version>
25+
<version>2.31.35</version>
2626
</parent>
2727

2828
<artifactId>http-auth-aws-crt</artifactId>

0 commit comments

Comments
 (0)