Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions codegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,21 @@
<artifactId>auth</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<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>http-auth-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-aws</artifactId>
Expand Down
10 changes: 0 additions & 10 deletions core/auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@
<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>regions</artifactId>
Expand All @@ -82,11 +77,6 @@
<groupId>software.amazon.eventstream</groupId>
<artifactId>eventstream</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
10 changes: 10 additions & 0 deletions core/aws-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@
<artifactId>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.awssdk</groupId>
<artifactId>identity-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>profiles</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions core/http-auth-aws-crt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
<artifactId>http-auth-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>identity-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
14 changes: 12 additions & 2 deletions core/http-auth-aws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,22 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-spi</artifactId>
<artifactId>utils</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>identity-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth</artifactId>
<artifactId>http-client-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>

Expand Down
5 changes: 5 additions & 0 deletions core/http-auth-event-stream/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
<artifactId>http-auth-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>identity-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
10 changes: 10 additions & 0 deletions core/http-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@
<artifactId>annotations</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>utils</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-client-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-spi</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions core/sdk-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@
<artifactId>http-auth-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>identity-spi</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>utils</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions services/accessanalyzer/pom.xml
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

Choose a reason for hiding this comment

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

Instead of adding it to every service module, can we add it to this pom? https://github.com/aws/aws-sdk-java-v2/blob/master/services/pom.xml This way, if we need to change anything, say artifact ID, we can do it just in one place.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added a note to the description about it

Given that codecatalyst does not use http-auth-aws this dependency was added to all the services but that one instead of just adding it to the services/pom.xml parent pom.

So, we can add it to the services/pom.xml and live with one warning of unused dependency for codecatalyst, or we can just add it to all of the services but codecatalyst as done here and avoid having any warnings, thoughts?

Copy link
Contributor

Choose a reason for hiding this comment

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

My bad, should've read the description first 😅 Agreed we should add the dependency to each service module since not all services use them. The last thing we want is adding unused dependency since it'll increase JAR size.

Copy link
Contributor

Choose a reason for hiding this comment

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

We need to update this template though https://github.com/aws/aws-sdk-java-v2/blob/master/services/new-service-template/pom.xml This is used to create new service modules. We need to figure out how to add this dependency conditionally.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The template is already updated, we do not have at the moment a way to "opt-out" other than editing the resulting pom. I can take a look at that.

Copy link
Contributor

Choose a reason for hiding this comment

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

Discussed offline, new services will be addressed in another PR

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added on #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/account/pom.xml
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>
5 changes: 5 additions & 0 deletions services/acm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,10 @@
<artifactId>protocol-core</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-aws</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
</dependencies>
</project>
5 changes: 5 additions & 0 deletions services/acmpca/pom.xml
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>
5 changes: 5 additions & 0 deletions services/alexaforbusiness/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,10 @@
<artifactId>protocol-core</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-aws</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
</dependencies>
</project>
5 changes: 5 additions & 0 deletions services/amp/pom.xml
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>
5 changes: 5 additions & 0 deletions services/amplify/pom.xml
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>
5 changes: 5 additions & 0 deletions services/amplifybackend/pom.xml
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>
5 changes: 5 additions & 0 deletions services/amplifyuibuilder/pom.xml
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>
5 changes: 5 additions & 0 deletions services/apigateway/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,10 @@
<artifactId>guava</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-aws</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
</dependencies>
</project>
5 changes: 5 additions & 0 deletions services/apigatewaymanagementapi/pom.xml
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>
5 changes: 5 additions & 0 deletions services/apigatewayv2/pom.xml
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>
5 changes: 5 additions & 0 deletions services/appconfig/pom.xml
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>
5 changes: 5 additions & 0 deletions services/appconfigdata/pom.xml
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>
5 changes: 5 additions & 0 deletions services/appfabric/pom.xml
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>
5 changes: 5 additions & 0 deletions services/appflow/pom.xml
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>
5 changes: 5 additions & 0 deletions services/appintegrations/pom.xml
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>
5 changes: 5 additions & 0 deletions services/applicationautoscaling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,10 @@
<artifactId>protocol-core</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-aws</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
</dependencies>
</project>
5 changes: 5 additions & 0 deletions services/applicationcostprofiler/pom.xml
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>
5 changes: 5 additions & 0 deletions services/applicationdiscovery/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,10 @@
<artifactId>protocol-core</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-auth-aws</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
</dependencies>
</project>
5 changes: 5 additions & 0 deletions services/applicationinsights/pom.xml
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>
5 changes: 5 additions & 0 deletions services/appmesh/pom.xml
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>
5 changes: 5 additions & 0 deletions services/apprunner/pom.xml
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>
Loading