Skip to content

RATIS-1614. Upgrade Ratis Thirdparty to 1.0.1#670

Merged
szetszwo merged 1 commit intoapache:masterfrom
codings-dan:1614
Jul 5, 2022
Merged

RATIS-1614. Upgrade Ratis Thirdparty to 1.0.1#670
szetszwo merged 1 commit intoapache:masterfrom
codings-dan:1614

Conversation

@codings-dan
Copy link
Contributor

What changes were proposed in this pull request?

Upgrade Ratis Thirdparty to 1.0.1, which has the following (non-test) changes:

RATIS-1585. Bump gson to 2.8.9
RATIS-1591. Bump netty to 4.1.77
RATIS-1595. Shade dropwizard 4.x in ratis-thirdparty
RATIS-1601. Use the shaded dropwizard metrics and remove the dependency

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/RATIS-1614
https://issues.apache.org/jira/browse/RATIS-1601

How was this patch tested?

https://github.com/codings-dan/incubator-ratis/actions/runs/2616031344

@codings-dan codings-dan requested a review from szetszwo July 5, 2022 12:25
@codings-dan
Copy link
Contributor Author

@szetszwo Could you help review this pull request, thank you!

Copy link
Contributor

@szetszwo szetszwo left a comment

Choose a reason for hiding this comment

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

+1 the change looks good.

@szetszwo szetszwo merged commit ec01dac into apache:master Jul 5, 2022
@codings-dan codings-dan deleted the 1614 branch July 6, 2022 03:47
@codings-dan codings-dan restored the 1614 branch July 6, 2022 03:47
@codings-dan
Copy link
Contributor Author

@szetszwo Thanks for helping review and merging the pull request!

Comment on lines 407 to 429
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${dropwizard.version}</version>
<version>${shaded.dropwizard.version}</version>
</dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jvm</artifactId>
<version>${dropwizard.version}</version>
<version>${shaded.dropwizard.version}</version>
</dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jmx</artifactId>
<version>${dropwizard.version}</version>
<version>${shaded.dropwizard.version}</version>
</dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-ganglia</artifactId>
<version>${dropwizard.ganglia.version}</version>
<version>${shaded.dropwizard.ganglia.version}</version>
</dependency>
Copy link
Contributor

Choose a reason for hiding this comment

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

Oops, we should remove all the dropwizard dependencies and change all the imports to org.apache.ratis.thirdparty.com.codahale.metrics.*

@codings-dan , I have reopened RATIS-1601.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@szetszwo Thanks for pointing out the problem, I'm not very familiar with this part, so I missed some changes. I've made a new pull request, please take a look, thanks! see #671

@codings-dan codings-dan deleted the 1614 branch July 11, 2022 13:17
symious pushed a commit to symious/ratis that referenced this pull request Mar 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants