Skip to content

Commit e8ca6a5

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #3708 from aws/staging/9a52fe69-deb7-4248-853a-12dc2b589792
Pull request: release <- staging/9a52fe69-deb7-4248-853a-12dc2b589792
2 parents 7a85f88 + 7b97f8f commit e8ca6a5

File tree

513 files changed

+8055
-949
lines changed

Some content is hidden

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

513 files changed

+8055
-949
lines changed

‎.brazil.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@
111111
"v2-migration-tests": {"skipImport": true},
112112
"crt-unavailable-tests": { "skipImport": true },
113113
"bundle-shading-tests": { "skipImport": true },
114-
"architecture-tests": {"skipImport": true}
114+
"architecture-tests": {"skipImport": true},
115+
"s3-tests": {"skipImport": true}
115116
},
116117

117118
"dependencies": {

‎.changes/2.30.33.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"version": "2.30.33",
3+
"date": "2025-03-04",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS IoT SiteWise",
8+
"contributor": "",
9+
"description": "AWS IoT SiteWise now supports MQTT-enabled, V3 gateways. Configure data destinations for real-time ingestion into AWS IoT SiteWise or buffered ingestion using Amazon S3 storage. You can also use path filters for precise data collection from specific MQTT topics."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "Amazon ElastiCache",
14+
"contributor": "",
15+
"description": "Doc only update, listing 'valkey7' and 'valkey8' as engine options for parameter groups."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon Relational Database Service",
20+
"contributor": "",
21+
"description": "Note support for Database Insights for Amazon RDS."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Managed integrations for AWS IoT Device Management",
26+
"contributor": "",
27+
"description": "Adding managed integrations APIs for IoT Device Management to setup and control devices across different manufacturers and connectivity protocols. APIs include managedthing operations, credential and provisioning profile management, notification configuration, and OTA update."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS SDK for Java v2",
32+
"contributor": "",
33+
"description": "Updated endpoint and partition metadata."
34+
}
35+
]
36+
}

‎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.30.33__ __2025-03-04__
3+
## __AWS IoT SiteWise__
4+
- ### Features
5+
- AWS IoT SiteWise now supports MQTT-enabled, V3 gateways. Configure data destinations for real-time ingestion into AWS IoT SiteWise or buffered ingestion using Amazon S3 storage. You can also use path filters for precise data collection from specific MQTT topics.
6+
7+
## __AWS SDK for Java v2__
8+
- ### Features
9+
- Updated endpoint and partition metadata.
10+
11+
## __Amazon ElastiCache__
12+
- ### Features
13+
- Doc only update, listing 'valkey7' and 'valkey8' as engine options for parameter groups.
14+
15+
## __Amazon Relational Database Service__
16+
- ### Features
17+
- Note support for Database Insights for Amazon RDS.
18+
19+
## __Managed integrations for AWS IoT Device Management__
20+
- ### Features
21+
- Adding managed integrations APIs for IoT Device Management to setup and control devices across different manufacturers and connectivity protocols. APIs include managedthing operations, credential and provisioning profile management, notification configuration, and OTA update.
22+
223
# __2.30.32__ __2025-03-03__
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.30.32</version>
54+
<version>2.30.33</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.30.32</version>
88+
<version>2.30.33</version>
8989
</dependency>
9090
<dependency>
9191
<groupId>software.amazon.awssdk</groupId>
9292
<artifactId>s3</artifactId>
93-
<version>2.30.32</version>
93+
<version>2.30.33</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.30.32</version>
105+
<version>2.30.33</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.30.32</version>
23+
<version>2.30.33</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.30.32</version>
23+
<version>2.30.33</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.30.32</version>
23+
<version>2.30.33</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.30.32</version>
23+
<version>2.30.33</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

+6-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.30.32</version>
20+
<version>2.30.33</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>
@@ -2058,6 +2058,11 @@ Amazon AutoScaling, etc).</description>
20582058
<artifactId>backupsearch</artifactId>
20592059
<version>${awsjavasdk.version}</version>
20602060
</dependency>
2061+
<dependency>
2062+
<groupId>software.amazon.awssdk</groupId>
2063+
<artifactId>iotmanagedintegrations</artifactId>
2064+
<version>${awsjavasdk.version}</version>
2065+
</dependency>
20612066
</dependencies>
20622067
<build>
20632068
<finalName>${project.artifactId}-${project.version}</finalName>

‎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.30.32</version>
23+
<version>2.30.33</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

+6-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.30.32</version>
20+
<version>2.30.33</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>
@@ -2258,6 +2258,11 @@
22582258
<artifactId>backupsearch</artifactId>
22592259
<version>${awsjavasdk.version}</version>
22602260
</dependency>
2261+
<dependency>
2262+
<groupId>software.amazon.awssdk</groupId>
2263+
<artifactId>iotmanagedintegrations</artifactId>
2264+
<version>${awsjavasdk.version}</version>
2265+
</dependency>
22612266
</dependencies>
22622267
</dependencyManagement>
22632268
</project>

‎buildspecs/release-javadoc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ phases:
1818
commands:
1919
- python ./scripts/doc_crosslinks/generate_cross_link_data.py --apiDefinitionsBasePath ./services/ --apiDefinitionsRelativeFilePath src/main/resources/codegen-resources/service-2.json --templateFilePath ./scripts/doc_crosslinks/crosslink_redirect.html --outputFilePath ./scripts/crosslink_redirect.html
2020
- mvn install -P quick -T1C
21-
- mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:s3-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting,!:sdk-native-image-test,!:ruleset-testing-core,!:old-client-version-compatibility-test,!:crt-unavailable-tests,!:bundle-shading-tests,!:v2-migration,!:v2-migration-tests,!:architecture-tests'
21+
- mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:s3-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting,!:sdk-native-image-test,!:ruleset-testing-core,!:old-client-version-compatibility-test,!:crt-unavailable-tests,!:bundle-shading-tests,!:v2-migration,!:v2-migration-tests,!:architecture-tests,!:s3-tests'
2222
- RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
2323
-
2424
- aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/ --acl="public-read"

‎buildspecs/release-to-maven.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ phases:
3737
awk 'BEGIN { var=ENVIRON["SDK_SIGNING_GPG_KEYNAME"] } { gsub("\\$SDK_SIGNING_GPG_KEYNAME", var, $0); print }' > \
3838
$SETTINGS_XML
3939
40-
mvn clean deploy -B -s $SETTINGS_XML -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Djapicmp.skip -Ddoclint=none -pl !:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests,!:sdk-native-image-test,!:auth-tests,!:s3-benchmarks,!:region-testing,!:old-client-version-compatibility-test,!:crt-unavailable-tests,!:bundle-shading-tests,!:v2-migration-tests,!:architecture-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
40+
mvn clean deploy -B -s $SETTINGS_XML -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Djapicmp.skip -Ddoclint=none -pl !:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests,!:sdk-native-image-test,!:auth-tests,!:s3-benchmarks,!:region-testing,!:old-client-version-compatibility-test,!:crt-unavailable-tests,!:bundle-shading-tests,!:v2-migration-tests,!:architecture-tests,!:s3-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
4141
else
4242
echo "This version was already released."
4343
fi

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

‎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.30.32</version>
25+
<version>2.30.33</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.30.32</version>
24+
<version>2.30.33</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/resources/software/amazon/awssdk/codegen/rules2/RuleUrl.java.resource

+72-25
Original file line numberDiff line numberDiff line change
@@ -48,41 +48,88 @@ public final class RuleUrl {
4848
String path = parsed.getPath();
4949
if (parsed.getQuery() != null) {
5050
return null;
51-
5251
}
53-
boolean isIpAddr = false;
5452
String host = parsed.getHost();
53+
boolean isIpAddr = isIpAddr(host);
54+
String normalizedPath = normalizePath(path);
55+
return new RuleUrl(parsed.getProtocol(), parsed.getAuthority(), path, normalizedPath, isIpAddr);
56+
}
57+
58+
static boolean isIpAddr(String host) {
5559
if (host.startsWith("[") && host.endsWith("]")) {
56-
isIpAddr = true;
60+
return true;
5761
}
58-
String[] dottedParts = host.split("\\.");
59-
if (dottedParts.length == 4) {
60-
if (Arrays.stream(dottedParts).allMatch(part -> {
61-
try {
62-
int value = Integer.parseInt(part);
63-
return value >= 0 && value <= 255;
64-
} catch (NumberFormatException ex) {
62+
int from = 0;
63+
int segments = 0;
64+
boolean done = false;
65+
while (!done) {
66+
int index = host.indexOf('.', from);
67+
if (index == -1) {
68+
if (segments != 3) {
69+
// E.g., 123.com
6570
return false;
6671
}
67-
})) {
68-
isIpAddr = true;
72+
index = host.length();
73+
done = true;
74+
} else if (segments == 3) {
75+
// E.g., 1.2.3.4.5
76+
return false;
6977
}
78+
int length = index - from;
79+
if (length == 1) {
80+
char ch0 = host.charAt(from);
81+
if (ch0 < '0' || ch0 > '9') {
82+
return false;
83+
}
84+
} else if (length == 2) {
85+
char ch0 = host.charAt(from);
86+
char ch1 = host.charAt(from + 1);
87+
if ((ch0 <= '0' || ch0 > '9') || (ch1 < '0' || ch1 > '9')) {
88+
return false;
89+
}
90+
} else if (length == 3) {
91+
char ch0 = host.charAt(from);
92+
char ch1 = host.charAt(from + 1);
93+
char ch2 = host.charAt(from + 2);
94+
if ((ch0 <= '0' || ch0 > '9')
95+
|| (ch1 < '0' || ch1 > '9')
96+
|| (ch2 < '0' || ch2 > '9')
97+
) {
98+
return false;
99+
}
100+
int value = ((ch0 - '0') * 100) + ((ch1 - '0') * 10) + (ch2 - '0');
101+
if (value > 255) {
102+
return false;
103+
}
104+
} else {
105+
return false;
106+
}
107+
from = index + 1;
108+
segments += 1;
70109
}
71-
String normalizedPath;
110+
return true;
111+
}
112+
113+
static String normalizePath(String path) {
72114
if (StringUtils.isBlank(path)) {
73-
normalizedPath = "/";
74-
} else {
75-
StringBuilder builder = new StringBuilder();
76-
if (!path.startsWith("/")) {
77-
builder.append("/");
78-
}
79-
builder.append(path);
80-
if (!path.endsWith("/")) {
81-
builder.append("/");
82-
}
83-
normalizedPath = builder.toString();
115+
return "/";
84116
}
85117

86-
return new RuleUrl(parsed.getProtocol(), parsed.getAuthority(), path, normalizedPath, isIpAddr);
118+
boolean startsWithSlash = path.startsWith("/");
119+
boolean endsWithSlash = path.endsWith("/");
120+
121+
if (startsWithSlash && endsWithSlash) {
122+
return path;
123+
}
124+
125+
StringBuilder builder = new StringBuilder();
126+
if (!startsWithSlash) {
127+
builder.append("/");
128+
}
129+
builder.append(path);
130+
if (!endsWithSlash) {
131+
builder.append("/");
132+
}
133+
return builder.toString();
87134
}
88135
}

‎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.30.32</version>
23+
<version>2.30.33</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

0 commit comments

Comments
 (0)