Skip to content

RATIS-1614. Upgrade Ratis Thirdparty to 1.0.1 #670

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.

Sign up for GitHub

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
szetszwo merged 1 commit into from
Jul 5, 2022
Merged

RATIS-1614. Upgrade Ratis Thirdparty to 1.0.1 #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 0 additions & 25 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,5 @@ Copyright 2017-2021 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

--

This product uses the dropwizard-hadoop-metrics2.

Copyright 2016 Josh Elser

Licensed under the Apache License v2.0

--

Notice for Dropwizard:

Metrics
Copyright 2010-2013 Coda Hale and Yammer, Inc., 2014-2017 Dropwizard Team

This product includes software developed by Coda Hale and Yammer, Inc.

This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
LongAdder), which was released with the following comments:

Written by Doug Lea with assistance from members of JCP JSR-166
Expert Group and released to the public domain, as explained at
http://creativecommons.org/publicdomain/zero/1.0/

--

14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
<maven.min.version>3.3.9</maven.min.version>

<!-- Contains all shaded thirdparty dependencies -->
<ratis.thirdparty.version>1.0.0</ratis.thirdparty.version>
<ratis.thirdparty.version>1.0.1</ratis.thirdparty.version>

<!-- Need these for the protobuf compiler. *MUST* match what is in ratis-thirdparty -->
<shaded.protobuf.version>3.19.2</shaded.protobuf.version>
Expand All @@ -217,8 +217,8 @@
<testsThreadCount>4</testsThreadCount>

<!--metrics-->
<dropwizard.version>4.2.9</dropwizard.version>
<dropwizard.ganglia.version>3.2.6</dropwizard.ganglia.version>
<shaded.dropwizard.version>4.2.9</shaded.dropwizard.version>
<shaded.dropwizard.ganglia.version>3.2.6</shaded.dropwizard.ganglia.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -407,25 +407,25 @@
<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>
Comment on lines 407 to 429
Copy link
Contributor

@szetszwo szetszwo Jul 6, 2022

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

@codings-dan codings-dan Jul 7, 2022

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


<dependency>
Expand Down
7 changes: 0 additions & 7 deletions ratis-assembly/src/main/resources/NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,3 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-----------------------------------------------------------------------
This product uses the dropwizard-hadoop-metrics2.

Copyright 2016 Josh Elser

Licensed under the Apache License v2.0

--