Skip to content

Commit

Permalink
Merge branch 'awspring:main' into feature/1161-s3-presigned-url-conte…
Browse files Browse the repository at this point in the history
…nt-md5
  • Loading branch information
hardikSinghBehl authored Nov 20, 2024
2 parents 1dd484d + 6151537 commit d7e8885
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/s3.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ Transfer Manager works the best with CRT S3 Client. To auto-configure CRT based
[source,xml]
----
<dependency>
<groupId>software.amazon.awssdk.crt</groupId>
<artifactId>aws-crt</artifactId>
<groupId>software.amazon.awssdk</groupId>
<artifactId>aws-crt-client</artifactId>
</dependency>
----

Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/testing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Maven coordinates, using <<index.adoc#bill-of-materials, Spring Cloud AWS BOM>>:
</dependency>
----

== Service Connection
=== Service Connection

https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#features.testing.testcontainers.service-connections[@ServiceConnection] for https://java.testcontainers.org/modules/localstack/[LocalStack Container] simplifies configuring Spring Cloud AWS based project to point to LocalStack instead of real AWS.

Expand Down
6 changes: 0 additions & 6 deletions spring-cloud-aws-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@
<version>${amazon.s3.accessgrants}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3-transfer-manager</artifactId>
<version>${awssdk-v2.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>io.awspring.cloud</groupId>
Expand Down

0 comments on commit d7e8885

Please sign in to comment.