Skip to content

Commit 6e91621

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #2828 from aws/staging/bb92e2fe-741d-43d0-9e49-c5732e455569
Pull request: release <- staging/bb92e2fe-741d-43d0-9e49-c5732e455569
2 parents 740d08d + bd601ed commit 6e91621

File tree

489 files changed

+4163
-615
lines changed

Some content is hidden

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

489 files changed

+4163
-615
lines changed

‎.changes/2.21.41.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"version": "2.21.41",
3+
"date": "2023-12-07",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java v2 Bundle",
8+
"contributor": "",
9+
"description": "Fix failure to bind to SLF4J binding at runtime when using the SDK bundle."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS CodeDeploy",
14+
"contributor": "",
15+
"description": "This release adds support for two new CodeDeploy features: 1) zonal deployments for Amazon EC2 in-place deployments, 2) deployments triggered by Auto Scaling group termination lifecycle hook events."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS SDK for Java v2 - Codegen",
20+
"contributor": "",
21+
"description": "Allow users to customize package name."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS SDK for Java v2",
26+
"contributor": "",
27+
"description": "Updated endpoint and partition metadata."
28+
}
29+
]
30+
}

‎CHANGELOG.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# __2.21.41__ __2023-12-07__
2+
## __AWS CodeDeploy__
3+
- ### Features
4+
- This release adds support for two new CodeDeploy features: 1) zonal deployments for Amazon EC2 in-place deployments, 2) deployments triggered by Auto Scaling group termination lifecycle hook events.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Updated endpoint and partition metadata.
9+
10+
## __AWS SDK for Java v2 - Codegen__
11+
- ### Features
12+
- Allow users to customize package name.
13+
14+
## __AWS SDK for Java v2 Bundle__
15+
- ### Bugfixes
16+
- Fix failure to bind to SLF4J binding at runtime when using the SDK bundle.
17+
118
# __2.21.40__ __2023-12-06__
219
## __AWS Backup__
320
- ### Features
@@ -3926,7 +3943,7 @@ Special thanks to the following contributors to this release:
39263943
## __Contributors__
39273944
Special thanks to the following contributors to this release:
39283945

3929-
[@breader124](https://github.com/breader124), [@bmaizels](https://github.com/bmaizels)
3946+
[@bmaizels](https://github.com/bmaizels), [@breader124](https://github.com/breader124)
39303947
# __2.20.85__ __2023-06-13__
39313948
## __AWS CloudTrail__
39323949
- ### Features

‎README.md

Lines changed: 4 additions & 4 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.21.40</version>
55+
<version>2.21.41</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.21.40</version>
89+
<version>2.21.41</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.21.40</version>
94+
<version>2.21.41</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.21.40</version>
106+
<version>2.21.41</version>
107107
</dependency>
108108
```
109109

‎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.21.40</version>
23+
<version>2.21.41</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.21.40</version>
23+
<version>2.21.41</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.21.40</version>
23+
<version>2.21.41</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.21.40</version>
23+
<version>2.21.41</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.21.40</version>
20+
<version>2.21.41</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.21.40</version>
23+
<version>2.21.41</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.21.40</version>
20+
<version>2.21.41</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎buildspecs/release-javadoc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ 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'
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,!:third-party-slf4j-api,!:bundle-sdk,!:bundle-logging-bridge,!:bundle-logging-bridge-binding-test'
22+
2223
- RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
2324
-
2425
- aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/ --acl="public-read"

‎buildspecs/release-to-maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ phases:
3434
awk 'BEGIN { var=ENVIRON["SDK_SIGNING_GPG_KEYNAME"] } { gsub("\\$SDK_SIGNING_GPG_KEYNAME", var, $0); print }' > \
3535
$SETTINGS_XML
3636
37-
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 -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
37+
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,!:third-party-slf4j-api,!:bundle-sdk,!:bundle-logging-bridge,!:bundle-logging-bridge-binding-test -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
3838
else
3939
echo "This version was already released."
4040
fi

‎bundle-logging-bridge/pom.xml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License").
6+
~ You may not use this file except in compliance with the License.
7+
~ A copy of the License is located at
8+
~
9+
~ http://aws.amazon.com/apache2.0
10+
~
11+
~ or in the "license" file accompanying this file. This file is distributed
12+
~ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
13+
~ express or implied. See the License for the specific language governing
14+
~ permissions and limitations under the License.
15+
-->
16+
17+
<project xmlns="http://maven.apache.org/POM/4.0.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
<parent>
22+
<groupId>software.amazon.awssdk</groupId>
23+
<artifactId>aws-sdk-java-pom</artifactId>
24+
<version>2.21.41</version>
25+
</parent>
26+
<artifactId>bundle-logging-bridge</artifactId>
27+
<packaging>jar</packaging>
28+
29+
<name>AWS Java SDK :: Bundle Logging Bridge</name>
30+
<url>https://aws.amazon.com/sdkforjava</url>
31+
32+
<properties>
33+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34+
<sonar.skip>true</sonar.skip>
35+
</properties>
36+
37+
<dependencyManagement>
38+
<dependencies>
39+
<dependency>
40+
<groupId>software.amazon.awssdk</groupId>
41+
<artifactId>bom-internal</artifactId>
42+
<version>${project.version}</version>
43+
<type>pom</type>
44+
<scope>import</scope>
45+
</dependency>
46+
</dependencies>
47+
</dependencyManagement>
48+
49+
<dependencies>
50+
<dependency>
51+
<groupId>software.amazon.awssdk</groupId>
52+
<artifactId>annotations</artifactId>
53+
<version>${awsjavasdk.version}</version>
54+
<scope>provided</scope>
55+
</dependency>
56+
<dependency>
57+
<!-- Provided scope as the 'thirdparty.org.slf4j' package will be in the shaded bundle -->
58+
<groupId>software.amazon.awssdk</groupId>
59+
<artifactId>third-party-slf4j-api</artifactId>
60+
<version>${awsjavasdk.version}</version>
61+
<scope>provided</scope>
62+
</dependency>
63+
<dependency>
64+
<!-- Brought in by bundle user SLF4J impl -->
65+
<groupId>org.slf4j</groupId>
66+
<artifactId>slf4j-api</artifactId>
67+
<version>${slf4j.version}</version>
68+
<scope>provided</scope>
69+
</dependency>
70+
71+
<dependency>
72+
<groupId>org.mockito</groupId>
73+
<artifactId>mockito-junit-jupiter</artifactId>
74+
<scope>test</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.junit.jupiter</groupId>
78+
<artifactId>junit-jupiter</artifactId>
79+
<scope>test</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.junit.jupiter</groupId>
83+
<artifactId>junit-jupiter-engine</artifactId>
84+
<scope>test</scope>
85+
</dependency>
86+
<dependency>
87+
<groupId>org.assertj</groupId>
88+
<artifactId>assertj-core</artifactId>
89+
<scope>test</scope>
90+
</dependency>
91+
</dependencies>
92+
93+
</project>

‎bundle-logging-bridge/src/main/java/software/amazon/awssdk/thirdparty/org/slf4j/impl/StaticLoggerBinder.java

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
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.thirdparty.org.slf4j.impl;
17+
18+
import java.lang.invoke.MethodHandle;
19+
import java.lang.invoke.MethodHandles;
20+
import java.lang.invoke.MethodType;
21+
import software.amazon.awssdk.annotations.SdkInternalApi;
22+
import software.amazon.awssdk.annotations.SdkTestInternalApi;
23+
import software.amazon.awssdk.thirdparty.org.slf4j.ILoggerFactory;
24+
import software.amazon.awssdk.thirdparty.org.slf4j.impl.internal.ErrorUtil;
25+
import software.amazon.awssdk.thirdparty.org.slf4j.impl.internal.ILoggerFactoryAdapter;
26+
27+
/**
28+
* Acts as a bridge to real SLF4J implementations of {@code StaticLoggerBinder}.
29+
*/
30+
@SdkInternalApi
31+
public class StaticLoggerBinder {
32+
private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
33+
34+
private static final String LOGGER_BINDER_NAME = "org.slf4j.impl.StaticLoggerBinder";
35+
private static final Class<?> BINDER_CLASS;
36+
private static final Object IMPL;
37+
private static final State STATE;
38+
39+
private enum State {
40+
INIT_FAILURE,
41+
INIT_SUCCESS
42+
}
43+
44+
static {
45+
Class<?> binderClass;
46+
Object impl = null;
47+
State initState = State.INIT_FAILURE;
48+
try {
49+
binderClass = Class.forName(LOGGER_BINDER_NAME);
50+
try {
51+
MethodType mt = MethodType.methodType(binderClass);
52+
MethodHandle mh = LOOKUP.findStatic(binderClass, "getSingleton", mt);
53+
impl = mh.invoke();
54+
initState = State.INIT_SUCCESS;
55+
} catch (Throwable t) {
56+
ErrorUtil.report(String.format("%s#getSingleton threw an exception: %s. Logging will not be initialized.",
57+
binderClass.getCanonicalName(), t.getMessage()));
58+
}
59+
} catch (ClassNotFoundException e) {
60+
binderClass = null;
61+
}
62+
BINDER_CLASS = binderClass;
63+
IMPL = impl;
64+
STATE = initState;
65+
}
66+
67+
private static final StaticLoggerBinder INSTANCE = new StaticLoggerBinder();
68+
69+
// SLF4J API
70+
public static final StaticLoggerBinder getSingleton() {
71+
if (STATE != State.INIT_SUCCESS) {
72+
throw new NoClassDefFoundError(StaticLoggerBinder.class.getCanonicalName());
73+
}
74+
75+
return INSTANCE;
76+
}
77+
78+
// SLF4J API
79+
public ILoggerFactory getLoggerFactory() {
80+
MethodType mt = MethodType.methodType(org.slf4j.ILoggerFactory.class);
81+
try {
82+
MethodHandle mh = LOOKUP.findVirtual(BINDER_CLASS, "getLoggerFactory", mt);
83+
return new ILoggerFactoryAdapter((org.slf4j.ILoggerFactory) mh.invoke(IMPL));
84+
} catch (Throwable t) {
85+
throw new RuntimeException(t);
86+
}
87+
}
88+
89+
@SdkTestInternalApi
90+
Object getActualStaticLoggerBinder() {
91+
return IMPL;
92+
}
93+
}

0 commit comments

Comments
 (0)