Skip to content

Upgrade dependencies #1413

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.

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
merged 3 commits into from
Sep 12, 2019
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/next-release/feature-AWSSDKforJavav2-959855c.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"category": "AWS SDK for Java v2",
"type": "feature",
"description": "Updating dependencies versions: jackson 2.9.8 -> 2.9.9, slf4j 1.7.35 -> 1.7.38, netty 4.1.39.Final -> 4.1.41.Final (contains the fix for the performance regression in 4.1.39)",

}
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,19 @@
</scm>
<properties>
<awsjavasdk.version>${project.version}</awsjavasdk.version>
<jackson.version>2.9.8</jackson.version>
<jackson.version>2.9.9</jackson.version>
<jackson.annotations.version>2.9.0</jackson.annotations.version>
<eventstream.version>1.0.1</eventstream.version>
<ion.java.version>1.2.0</ion.java.version>
<commons.lang.version>3.4</commons.lang.version>
<wiremock.version>2.18.0</wiremock.version>
<slf4j.version>1.7.25</slf4j.version>
<slf4j.version>1.7.28</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<commons.io.version>2.5</commons.io.version>
<equalsverifier.version>2.3.3</equalsverifier.version>
<!-- Update netty-open-ssl-version accordingly whenever we update netty version-->
<!-- https://github.com/netty/netty/blob/4.1/pom.xml#L286 -->
<netty.version>4.1.39.Final</netty.version>
<netty.version>4.1.41.Final</netty.version>
<unitils.version>3.3</unitils.version>
<xmlunit.version>1.3</xmlunit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
19 changes: 5 additions & 14 deletions test/module-path-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,31 +48,22 @@
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>${awsjavasdk.version}</version>
<exclusions>
<exclusion>
<!-- TODO remove exclusions after we fix netty module -->
<artifactId>netty-nio-client</artifactId>
<groupId>software.amazon.awssdk</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>protocol-tests</artifactId>
<version>${awsjavasdk.version}</version>
<exclusions>
<exclusion>
<!-- TODO remove exclusions after we fix netty module -->
<artifactId>netty-nio-client</artifactId>
<groupId>software.amazon.awssdk</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache-client</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>netty-nio-client</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>url-connection-client</artifactId>
Expand Down
6 changes: 2 additions & 4 deletions test/module-path-tests/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
requires software.amazon.awssdk.regions;
requires software.amazon.awssdk.http.urlconnection;
requires software.amazon.awssdk.http.apache;
requires software.amazon.awssdk.http.nio.netty;
requires software.amazon.awssdk.http;
requires software.amazon.awssdk.core;
requires software.amazon.awssdk.awscore;
Expand All @@ -27,9 +28,6 @@
requires software.amazon.awssdk.utils;
requires software.amazon.awssdk.testutils.service;

// This is fine because those are just used in unit test.
// https://jira.qos.ch/browse/SLF4J-420
requires slf4j.api;
requires org.slf4j;
requires slf4j.simple;

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@

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

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.http.apache.ApacheHttpClient;
import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.S3AsyncClient;
import software.amazon.awssdk.services.s3.S3Client;

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

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

private S3AsyncClient s3ClientWithNettyClient = S3AsyncClient.builder()
.region(Region.US_WEST_2)
.httpClient(NettyNioAsyncHttpClient.builder().build())
.credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();

public S3ApiCall() {
super("s3");
}
Expand All @@ -50,9 +54,8 @@ public Runnable urlHttpConnectionClientRunnable() {
return () -> s3ClientWithHttpUrlConnection.listBuckets();
}

//TODO: testing netty client once it's fixed
@Override
public Runnable nettyClientRunnable() {
return () -> logger.info("Skipping testing s3 client with netty client");
return () -> s3ClientWithNettyClient.listBuckets().join();
}
}
Loading