Skip to content

Add used but undeclared dependencies to pom.xmls #4539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gosar merged 9 commits into from
Oct 4, 2023
Merged

Add used but undeclared dependencies to pom.xmls #4539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
762bf39
http-auth-aws depends on eventstream
gosar Oct 4, 2023
61c6b48
http-auth-aws depends on aws-crt
gosar Oct 4, 2023
7c165a3
Specify version of aws-crt and eventstream
gosar Oct 4, 2023
0a1488c
auth depends on http-auth-spi
gosar Oct 4, 2023
ca1f3c4
auth depends on checksums for tests
gosar Oct 4, 2023
de31418
aws-core depends on http-auth
gosar Oct 4, 2023
293ea72
Remove test dependency on http-auth-aws from aws-core
gosar Oct 4, 2023
f71acbd
Add http-auth-aws dependency to new services
gosar Oct 4, 2023
e5bfe86
Remove aws-crt dependency from http-auth-aws
gosar Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions core/auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@
<artifactId>http-auth</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.eventstream</groupId>
<artifactId>eventstream</artifactId>
Expand Down Expand Up @@ -174,6 +179,12 @@
<version>${jimfs.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>checksums</artifactId>
<version>${awsjavasdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
5 changes: 5 additions & 0 deletions core/aws-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@
<artifactId>identity-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>profiles</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions ...src/test/java/software/amazon/awssdk/awscore/internal/AwsExecutionContextBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import software.amazon.awssdk.core.interceptor.trait.HttpChecksum;
import software.amazon.awssdk.core.internal.util.HttpChecksumUtils;
import software.amazon.awssdk.core.signer.Signer;
import software.amazon.awssdk.http.auth.aws.scheme.AwsV4AuthScheme;
import software.amazon.awssdk.http.auth.scheme.NoAuthAuthScheme;
import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
Expand Down Expand Up @@ -401,7 +400,7 @@ private SdkClientConfiguration.Builder testClientConfiguration() {
SelectedAuthScheme<?> selectedAuthScheme = new SelectedAuthScheme<>(
CompletableFuture.completedFuture(AwsCredentialsIdentity.create("ak", "sk")),
mock(HttpSigner.class),
AuthSchemeOption.builder().schemeId(AwsV4AuthScheme.SCHEME_ID).build()
AuthSchemeOption.builder().schemeId("blah-value-does-not-matter").build()
);
ExecutionAttributes executionAttributes =
ExecutionAttributes.builder()
Expand Down
5 changes: 5 additions & 0 deletions core/http-auth-aws/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@
<version>${awsjavasdk.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>software.amazon.eventstream</groupId>
<artifactId>eventstream</artifactId>
<version>${eventstream.version}</version>
</dependency>
Comment on lines +84 to +88
Copy link
Contributor Author

@gosar gosar Oct 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have been an optional dependency like http-auth-aws-eventstream above, so all customers of http-auth-aws don't bring in eventstream unless they are using event streaming features. Fixing in #4574.



<dependency>
Expand Down
5 changes: 5 additions & 0 deletions services/bedrock/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,10 @@
<artifactId>aws-json-protocol</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
Copy link
Contributor

@cenedhryn cenedhryn Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will new services get this dependency from this point on?

Copy link
Contributor Author

@gosar gosar Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, added to the feature branch in #4309

<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-aws</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
</dependencies>
</project>
5 changes: 5 additions & 0 deletions services/bedrockruntime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,10 @@
<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>