Skip to content

Commit e5e0ba0

Browse files
sigpwnedsigpwned
committed
bump SDK version, improve testcontainers integration
1 parent 1dfbcd9 commit e5e0ba0

File tree

3 files changed

+355
-336
lines changed

3 files changed

+355
-336
lines changed

‎awssdkv2-java11-async-client/pom.xml

+115-110
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,121 @@
1-
<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">
2-
<modelVersion>4.0.0</modelVersion>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
35

4-
<parent>
5-
<groupId>com.sigpwned</groupId>
6-
<artifactId>awssdkv2-java11-clients</artifactId>
7-
<version>2.23.7.0-b1-SNAPSHOT</version>
8-
</parent>
6+
<parent>
7+
<groupId>com.sigpwned</groupId>
8+
<artifactId>awssdkv2-java11-clients</artifactId>
9+
<version>2.26.9.0-b0-SNAPSHOT</version>
10+
</parent>
911

10-
<artifactId>awssdkv2-java11-async-client</artifactId>
11-
<name>AWS Java SDK :: HTTP Clients :: Java 11 Async HTTP Clients</name>
12-
<packaging>jar</packaging>
12+
<artifactId>awssdkv2-java11-async-client</artifactId>
13+
<name>AWS Java SDK :: HTTP Clients :: Java 11 Async HTTP Clients</name>
14+
<packaging>jar</packaging>
1315

14-
<dependencies>
15-
<dependency>
16-
<groupId>software.amazon.awssdk</groupId>
17-
<artifactId>utils</artifactId>
18-
<version>${awsjavasdk.version}</version>
19-
</dependency>
20-
<dependency>
21-
<groupId>software.amazon.awssdk</groupId>
22-
<artifactId>annotations</artifactId>
23-
<version>${awsjavasdk.version}</version>
24-
</dependency>
25-
<dependency>
26-
<groupId>software.amazon.awssdk</groupId>
27-
<artifactId>http-client-spi</artifactId>
28-
<version>${awsjavasdk.version}</version>
29-
</dependency>
16+
<dependencies>
17+
<dependency>
18+
<groupId>software.amazon.awssdk</groupId>
19+
<artifactId>utils</artifactId>
20+
<version>${awsjavasdk.version}</version>
21+
</dependency>
22+
<dependency>
23+
<groupId>software.amazon.awssdk</groupId>
24+
<artifactId>annotations</artifactId>
25+
<version>${awsjavasdk.version}</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>software.amazon.awssdk</groupId>
29+
<artifactId>http-client-spi</artifactId>
30+
<version>${awsjavasdk.version}</version>
31+
</dependency>
3032

31-
<dependency>
32-
<groupId>org.eclipse.jetty</groupId>
33-
<artifactId>jetty-server</artifactId>
34-
<scope>test</scope>
35-
</dependency>
36-
<dependency>
37-
<groupId>software.amazon.awssdk</groupId>
38-
<artifactId>http-client-tests</artifactId>
39-
<version>${awsjavasdk.version}</version>
40-
<scope>test</scope>
41-
</dependency>
42-
<!--Test dependencies-->
43-
<dependency>
44-
<groupId>com.github.tomakehurst</groupId>
45-
<artifactId>wiremock-jre8</artifactId>
46-
<version>${wiremock.version}</version>
47-
<scope>test</scope>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.mockito</groupId>
51-
<artifactId>mockito-core</artifactId>
52-
<scope>test</scope>
53-
</dependency>
54-
<dependency>
55-
<groupId>junit</groupId>
56-
<artifactId>junit</artifactId>
57-
<scope>test</scope>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.assertj</groupId>
61-
<artifactId>assertj-core</artifactId>
62-
<scope>test</scope>
63-
</dependency>
64-
<dependency>
65-
<groupId>software.amazon.awssdk</groupId>
66-
<artifactId>regions</artifactId>
67-
<version>${awsjavasdk.version}</version>
68-
<scope>test</scope>
69-
</dependency>
70-
<dependency>
71-
<groupId>software.amazon.awssdk</groupId>
72-
<artifactId>service-test-utils</artifactId>
73-
<version>${awsjavasdk.version}</version>
74-
<scope>test</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.slf4j</groupId>
78-
<artifactId>slf4j-simple</artifactId>
79-
<scope>test</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>software.amazon.awssdk</groupId>
83-
<artifactId>sqs</artifactId>
84-
<version>${awsjavasdk.version}</version>
85-
<scope>test</scope>
86-
</dependency>
87-
<dependency>
88-
<groupId>org.testcontainers</groupId>
89-
<artifactId>localstack</artifactId>
90-
<version>1.19.5</version>
91-
<scope>test</scope>
92-
</dependency>
93-
</dependencies>
33+
<dependency>
34+
<groupId>org.eclipse.jetty</groupId>
35+
<artifactId>jetty-server</artifactId>
36+
<scope>test</scope>
37+
</dependency>
38+
<dependency>
39+
<groupId>software.amazon.awssdk</groupId>
40+
<artifactId>http-client-tests</artifactId>
41+
<version>${awsjavasdk.version}</version>
42+
<scope>test</scope>
43+
</dependency>
44+
<!--Test dependencies-->
45+
<dependency>
46+
<groupId>com.github.tomakehurst</groupId>
47+
<artifactId>wiremock-jre8</artifactId>
48+
<scope>test</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.mockito</groupId>
52+
<artifactId>mockito-core</artifactId>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>junit</groupId>
57+
<artifactId>junit</artifactId>
58+
<scope>test</scope>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.assertj</groupId>
62+
<artifactId>assertj-core</artifactId>
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>software.amazon.awssdk</groupId>
67+
<artifactId>regions</artifactId>
68+
<version>${awsjavasdk.version}</version>
69+
<scope>test</scope>
70+
</dependency>
71+
<dependency>
72+
<groupId>software.amazon.awssdk</groupId>
73+
<artifactId>service-test-utils</artifactId>
74+
<version>${awsjavasdk.version}</version>
75+
<scope>test</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.slf4j</groupId>
79+
<artifactId>slf4j-simple</artifactId>
80+
<scope>test</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>software.amazon.awssdk</groupId>
84+
<artifactId>sqs</artifactId>
85+
<version>${awsjavasdk.version}</version>
86+
<scope>test</scope>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.testcontainers</groupId>
90+
<artifactId>localstack</artifactId>
91+
<scope>test</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>junit</groupId>
95+
<artifactId>junit</artifactId>
96+
<scope>test</scope>
97+
</dependency>
98+
</dependencies>
9499

95-
<build>
96-
<plugins>
97-
<plugin>
98-
<groupId>org.apache.maven.plugins</groupId>
99-
<artifactId>maven-failsafe-plugin</artifactId>
100-
<version>${maven-failsafe-plugin.version}</version>
101-
</plugin>
102-
<plugin>
103-
<groupId>org.apache.maven.plugins</groupId>
104-
<artifactId>maven-jar-plugin</artifactId>
105-
<configuration>
106-
<archive>
107-
<manifestEntries>
108-
<Automatic-Module-Name>com.sigpwned.software.amazon.awssdk.http.java11
109-
</Automatic-Module-Name>
110-
</manifestEntries>
111-
</archive>
112-
</configuration>
113-
</plugin>
114-
</plugins>
115-
</build>
100+
<build>
101+
<plugins>
102+
<plugin>
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-failsafe-plugin</artifactId>
105+
</plugin>
106+
<plugin>
107+
<groupId>org.apache.maven.plugins</groupId>
108+
<artifactId>maven-jar-plugin</artifactId>
109+
<configuration>
110+
<archive>
111+
<manifestEntries>
112+
<Automatic-Module-Name>
113+
com.sigpwned.software.amazon.awssdk.http.java11
114+
</Automatic-Module-Name>
115+
</manifestEntries>
116+
</archive>
117+
</configuration>
118+
</plugin>
119+
</plugins>
120+
</build>
116121
</project>

‎awssdkv2-java11-async-client/src/it/java/com/sigpwned/software/amazon/awssdk/http/java11/SqsIT.java

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package com.sigpwned.software.amazon.awssdk.http.java11;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS;
5-
64
import org.junit.Before;
7-
import org.junit.Rule;
5+
import org.junit.ClassRule;
86
import org.junit.Test;
97
import org.testcontainers.containers.localstack.LocalStackContainer;
8+
import org.testcontainers.containers.localstack.LocalStackContainer.Service;
109
import org.testcontainers.utility.DockerImageName;
1110
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
1211
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -15,20 +14,19 @@
1514
import software.amazon.awssdk.services.sqs.model.ListQueuesResponse;
1615

1716
public class SqsIT {
17+
@ClassRule
18+
public static LocalStackContainer localstack =
19+
new LocalStackContainer(DockerImageName.parse("localstack/localstack:3"))
20+
.withServices(Service.SQS);
1821

19-
DockerImageName localstackImage = DockerImageName.parse("localstack/localstack:3.1.0");
20-
21-
@Rule
22-
public LocalStackContainer localstack = new LocalStackContainer(localstackImage).withServices(
23-
SQS);
2422
public SqsAsyncClient client;
2523

2624
@Before
2725
public void setupSqsIT() {
2826
client = SqsAsyncClient.builder().endpointOverride(localstack.getEndpoint())
29-
.httpClientBuilder(Java11AsyncHttpClient.builder()).credentialsProvider(
30-
StaticCredentialsProvider.create(
31-
AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())))
27+
.httpClientBuilder(Java11AsyncHttpClient.builder())
28+
.credentialsProvider(StaticCredentialsProvider.create(
29+
AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())))
3230
.region(Region.of(localstack.getRegion())).build();
3331
}
3432

0 commit comments

Comments
 (0)