Skip to content

Commit eff0da9

Browse files
committed
Upgrade slf4j, jaskcon and netty and update the module path tests
1 parent 18ba8b6 commit eff0da9

File tree

5 files changed

+23
-26
lines changed

5 files changed

+23
-26
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"category": "AWS SDK for Java v2",
3+
"type": "feature",
4+
"description": "Update jackson, slf4j, netty versions."
5+
}

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,19 @@
8484
</scm>
8585
<properties>
8686
<awsjavasdk.version>${project.version}</awsjavasdk.version>
87-
<jackson.version>2.9.8</jackson.version>
87+
<jackson.version>2.9.9</jackson.version>
8888
<jackson.annotations.version>2.9.0</jackson.annotations.version>
8989
<eventstream.version>1.0.1</eventstream.version>
9090
<ion.java.version>1.2.0</ion.java.version>
9191
<commons.lang.version>3.4</commons.lang.version>
9292
<wiremock.version>2.18.0</wiremock.version>
93-
<slf4j.version>1.7.25</slf4j.version>
93+
<slf4j.version>1.7.28</slf4j.version>
9494
<log4j.version>1.2.17</log4j.version>
9595
<commons.io.version>2.5</commons.io.version>
9696
<equalsverifier.version>2.3.3</equalsverifier.version>
9797
<!-- Update netty-open-ssl-version accordingly whenever we update netty version-->
9898
<!-- https://github.com/netty/netty/blob/4.1/pom.xml#L286 -->
99-
<netty.version>4.1.39.Final</netty.version>
99+
<netty.version>4.1.41.Final</netty.version>
100100
<unitils.version>3.3</unitils.version>
101101
<xmlunit.version>1.3</xmlunit.version>
102102
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

test/module-path-tests/pom.xml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,22 @@
4848
<groupId>software.amazon.awssdk</groupId>
4949
<artifactId>s3</artifactId>
5050
<version>${awsjavasdk.version}</version>
51-
<exclusions>
52-
<exclusion>
53-
<!-- TODO remove exclusions after we fix netty module -->
54-
<artifactId>netty-nio-client</artifactId>
55-
<groupId>software.amazon.awssdk</groupId>
56-
</exclusion>
57-
</exclusions>
5851
</dependency>
5952
<dependency>
6053
<groupId>software.amazon.awssdk</groupId>
6154
<artifactId>protocol-tests</artifactId>
6255
<version>${awsjavasdk.version}</version>
63-
<exclusions>
64-
<exclusion>
65-
<!-- TODO remove exclusions after we fix netty module -->
66-
<artifactId>netty-nio-client</artifactId>
67-
<groupId>software.amazon.awssdk</groupId>
68-
</exclusion>
69-
</exclusions>
7056
</dependency>
7157
<dependency>
7258
<groupId>software.amazon.awssdk</groupId>
7359
<artifactId>apache-client</artifactId>
7460
<version>${awsjavasdk.version}</version>
7561
</dependency>
62+
<dependency>
63+
<groupId>software.amazon.awssdk</groupId>
64+
<artifactId>netty-nio-client</artifactId>
65+
<version>${awsjavasdk.version}</version>
66+
</dependency>
7667
<dependency>
7768
<groupId>software.amazon.awssdk</groupId>
7869
<artifactId>url-connection-client</artifactId>

test/module-path-tests/src/main/java/module-info.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
requires software.amazon.awssdk.regions;
1818
requires software.amazon.awssdk.http.urlconnection;
1919
requires software.amazon.awssdk.http.apache;
20+
requires software.amazon.awssdk.http.nio.netty;
2021
requires software.amazon.awssdk.http;
2122
requires software.amazon.awssdk.core;
2223
requires software.amazon.awssdk.awscore;
@@ -27,9 +28,6 @@
2728
requires software.amazon.awssdk.utils;
2829
requires software.amazon.awssdk.testutils.service;
2930

30-
// This is fine because those are just used in unit test.
31-
// https://jira.qos.ch/browse/SLF4J-420
32-
requires slf4j.api;
31+
requires org.slf4j;
3332
requires slf4j.simple;
34-
3533
}

test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/integtests/S3ApiCall.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515

1616
package software.amazon.awssdk.modulepath.tests.integtests;
1717

18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
2018
import software.amazon.awssdk.http.apache.ApacheHttpClient;
19+
import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
2120
import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
2221
import software.amazon.awssdk.regions.Region;
22+
import software.amazon.awssdk.services.s3.S3AsyncClient;
2323
import software.amazon.awssdk.services.s3.S3Client;
2424

2525
public class S3ApiCall extends BaseApiCall {
26-
private static final Logger logger = LoggerFactory.getLogger(S3ApiCall.class);
2726

2827
private S3Client s3Client = S3Client.builder()
2928
.region(Region.US_WEST_2)
@@ -36,6 +35,11 @@ public class S3ApiCall extends BaseApiCall {
3635
.httpClient(UrlConnectionHttpClient.builder().build())
3736
.credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
3837

38+
private S3AsyncClient s3ClientWithNettyClient = S3AsyncClient.builder()
39+
.region(Region.US_WEST_2)
40+
.httpClient(NettyNioAsyncHttpClient.builder().build())
41+
.credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
42+
3943
public S3ApiCall() {
4044
super("s3");
4145
}
@@ -50,9 +54,8 @@ public Runnable urlHttpConnectionClientRunnable() {
5054
return () -> s3ClientWithHttpUrlConnection.listBuckets();
5155
}
5256

53-
//TODO: testing netty client once it's fixed
5457
@Override
5558
public Runnable nettyClientRunnable() {
56-
return () -> logger.info("Skipping testing s3 client with netty client");
59+
return () -> s3ClientWithNettyClient.listBuckets().join();
5760
}
5861
}

0 commit comments

Comments
 (0)