Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into sugmanue/sra-retr…
Browse files Browse the repository at this point in the history
…ies-merge-2.25.71-SNAPSHOT
  • Loading branch information
sugmanue committed Jun 10, 2024
2 parents d875f06 + bef4dd8 commit 77f164b
Show file tree
Hide file tree
Showing 20 changed files with 2,405 additions and 37 deletions.
36 changes: 36 additions & 0 deletions .changes/2.25.70.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"version": "2.25.70",
"date": "2024-06-10",
"entries": [
{
"type": "feature",
"category": "Amazon S3",
"contributor": "nikitamsawant",
"description": "Updated the version of aws-s3-accessgrants-java-plugin to include changes that support copyObject and deleteObjects."
},
{
"type": "feature",
"category": "Amazon CloudWatch Application Signals",
"contributor": "",
"description": "This is the initial SDK release for Amazon CloudWatch Application Signals. Amazon CloudWatch Application Signals provides curated application performance monitoring for developers to monitor and troubleshoot application health using pre-built dashboards and Service Level Objectives."
},
{
"type": "feature",
"category": "Amazon EC2 Container Service",
"contributor": "",
"description": "This release introduces a new cluster configuration to support the customer-managed keys for ECS managed storage encryption."
},
{
"type": "feature",
"category": "EC2 Image Builder",
"contributor": "",
"description": "This release updates the regex pattern for Image Builder ARNs."
},
{
"type": "feature",
"category": "AWS SDK for Java v2",
"contributor": "",
"description": "Updated endpoint and partition metadata."
}
]
}
6 changes: 0 additions & 6 deletions .changes/next-release/feature-AWSS3-2bfc0aa.json

This file was deleted.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<version>2.25.69</version>
<version>2.25.70</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>ec2</artifactId>
<version>2.25.69</version>
<version>2.25.70</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>2.25.69</version>
<version>2.25.70</version>
</dependency>
```

Expand All @@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>aws-sdk-java</artifactId>
<version>2.25.69</version>
<version>2.25.70</version>
</dependency>
```

Expand Down
5 changes: 5 additions & 0 deletions aws-sdk-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1958,6 +1958,11 @@ Amazon AutoScaling, etc).</description>
<artifactId>taxsettings</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>applicationsignals</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
Expand Down
5 changes: 5 additions & 0 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2153,6 +2153,11 @@
<artifactId>taxsettings</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>applicationsignals</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
26 changes: 26 additions & 0 deletions changelogs/2.25.x-CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,30 @@
#### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
# __2.25.70__ __2024-06-10__
## __AWS SDK for Java v2__
- ### Features
- Updated endpoint and partition metadata.

## __Amazon CloudWatch Application Signals__
- ### Features
- This is the initial SDK release for Amazon CloudWatch Application Signals. Amazon CloudWatch Application Signals provides curated application performance monitoring for developers to monitor and troubleshoot application health using pre-built dashboards and Service Level Objectives.

## __Amazon EC2 Container Service__
- ### Features
- This release introduces a new cluster configuration to support the customer-managed keys for ECS managed storage encryption.

## __Amazon S3__
- ### Features
- Updated the version of aws-s3-accessgrants-java-plugin to include changes that support copyObject and deleteObjects.
- Contributed by: [@nikitamsawant](https://github.com/nikitamsawant)

## __EC2 Image Builder__
- ### Features
- This release updates the regex pattern for Image Builder ARNs.

## __Contributors__
Special thanks to the following contributors to this release:

[@nikitamsawant](https://github.com/nikitamsawant)
# __2.25.69__ __2024-06-07__
## __AWS Audit Manager__
- ### Features
Expand Down
2 changes: 1 addition & 1 deletion core/crt-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@
</plugins>
</build>

</project>
</project>
2 changes: 1 addition & 1 deletion core/imds/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -14832,6 +14832,7 @@
"deprecated" : true,
"hostname" : "redshift-serverless-fips.us-west-2.amazonaws.com"
},
"me-central-1" : { },
"sa-east-1" : { },
"us-east-1" : {
"variants" : [ {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</scm>
<properties>
<awsjavasdk.version>${project.version}</awsjavasdk.version>
<awsjavasdk.previous.version>2.25.69</awsjavasdk.previous.version>
<awsjavasdk.previous.version>2.25.70</awsjavasdk.previous.version>
<jackson.version>2.15.2</jackson.version>
<jackson.databind.version>2.15.2</jackson.databind.version>
<jacksonjr.version>2.13.2</jacksonjr.version>
Expand Down
2 changes: 1 addition & 1 deletion services-custom/s3-event-notifications/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@
</plugins>
</build>

</project>
</project>
60 changes: 60 additions & 0 deletions services/applicationsignals/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
~ Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License").
~ You may not use this file except in compliance with the License.
~ A copy of the License is located at
~
~ http://aws.amazon.com/apache2.0
~
~ or in the "license" file accompanying this file. This file is distributed
~ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
~ express or implied. See the License for the specific language governing
~ permissions and limitations under the License.
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>software.amazon.awssdk</groupId>
<artifactId>services</artifactId>
<version>2.25.71-SNAPSHOT</version>
</parent>
<artifactId>applicationsignals</artifactId>
<name>AWS Java SDK :: Services :: Application Signals</name>
<description>The AWS Java SDK for Application Signals module holds the client classes that are used for
communicating with Application Signals.
</description>
<url>https://aws.amazon.com/sdkforjava</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.services.applicationsignals</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>protocol-core</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>aws-json-protocol</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-aws</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
{
"version": "1.0",
"parameters": {
"UseFIPS": {
"builtIn": "AWS::UseFIPS",
"required": true,
"default": false,
"documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.",
"type": "Boolean"
},
"Endpoint": {
"builtIn": "SDK::Endpoint",
"required": false,
"documentation": "Override the endpoint used to send this request",
"type": "String"
},
"Region": {
"builtIn": "AWS::Region",
"required": false,
"documentation": "The AWS region used to dispatch the request.",
"type": "String"
}
},
"rules": [
{
"conditions": [
{
"fn": "isSet",
"argv": [
{
"ref": "Endpoint"
}
]
}
],
"rules": [
{
"conditions": [
{
"fn": "booleanEquals",
"argv": [
{
"ref": "UseFIPS"
},
true
]
}
],
"error": "Invalid Configuration: FIPS and custom endpoint are not supported",
"type": "error"
},
{
"conditions": [],
"endpoint": {
"url": {
"ref": "Endpoint"
},
"properties": {},
"headers": {}
},
"type": "endpoint"
}
],
"type": "tree"
},
{
"conditions": [],
"rules": [
{
"conditions": [
{
"fn": "isSet",
"argv": [
{
"ref": "Region"
}
]
}
],
"rules": [
{
"conditions": [
{
"fn": "aws.partition",
"argv": [
{
"ref": "Region"
}
],
"assign": "PartitionResult"
}
],
"rules": [
{
"conditions": [
{
"fn": "booleanEquals",
"argv": [
{
"ref": "UseFIPS"
},
true
]
}
],
"endpoint": {
"url": "https://application-signals-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
"properties": {},
"headers": {}
},
"type": "endpoint"
},
{
"conditions": [],
"endpoint": {
"url": "https://application-signals.{Region}.{PartitionResult#dualStackDnsSuffix}",
"properties": {},
"headers": {}
},
"type": "endpoint"
}
],
"type": "tree"
}
],
"type": "tree"
},
{
"conditions": [],
"error": "Invalid Configuration: Missing Region",
"type": "error"
}
],
"type": "tree"
}
]
}
Loading

0 comments on commit 77f164b

Please sign in to comment.