Skip to content
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

chore: upgrade WaterDog to v2 #1210

Draft
wants to merge 6 commits into
base: nightly
Choose a base branch
from
Draft

chore: upgrade WaterDog to v2 #1210

wants to merge 6 commits into from

Conversation

derklaro
Copy link
Member

@derklaro derklaro commented Apr 23, 2023

Motivation

WaterdogPE version 2 was released and we should upgrade to this new version as the 1.X will no longer receive updates.

Modification

Update usages of Waterdog classes from 1.X to 2.X & update configuration file.

Result

Waterdog v2 can now be used with CloudNet.

Other Context

  • Wait for Waterdog to make v2 builds available from their Jenkins

@derklaro derklaro added v: 4.X This pull should be included in the 4.0 release in: node An issue/pull request releated to the node module code t: platform Request to add/change a platform implementation in: module An issue/pull request releated to one of the internal modules labels Apr 23, 2023
@derklaro derklaro requested a review from 0utplay April 23, 2023 09:30
@derklaro derklaro self-assigned this Apr 23, 2023
@github-actions
Copy link

github-actions bot commented Apr 27, 2023

Test Results

  47 files  ±0    47 suites  ±0   1m 27s ⏱️ +14s
322 tests ±0  322 ✔️ ±0  0 💤 ±0  0 ±0 
652 runs  ±0  652 ✔️ ±0  0 💤 ±0  0 ±0 

Results for commit 88aefb1. ± Comparison against base commit 36be7e0.

This pull request removes 15 and adds 15 tests. Note that renamed tests count towards both.
eu.cloudnetservice.driver.document.DocumentSerialisationTest ‑ [4] {"b":1,"s":2,"i":3,"l":4,"f":5.0,"d":6.0,"c":"/","string":"Hello, World!","bol":true,"cloud":["Ben?","Yes","No","HoHoHoHo"],"world":{"this":"is","hello":"world","insane":"!"}}, PRETTY
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [10] 12720, null
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [1] {test=test1, test2=test3}, class java.lang.String, class java.lang.String
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [2] 4ZWDCHMWI077XLOOCBV60M4PF, null
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [2] {test=123, test2=456}, class java.lang.String, class java.lang.Integer
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [3] -1250139865, null
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [3] Lobbyhello156:777016ea-5ce7-4bdb-8f05-ee81d9821fef
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [3] {test=[123, 456], test2=[678, 456]}, class java.lang.String, java.util.List<java.lang.Integer>
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [4] -2348245904719119507, null
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [4] Optional[{test=test1, test2=test3}], java.util.Map<java.lang.String, java.lang.String>
…
eu.cloudnetservice.driver.document.DocumentSerialisationTest ‑ [4] {"b":1,"s":2,"i":3,"l":4,"f":5.0,"d":6.0,"c":"/","string":"Hello, World!","bol":true,"cloud":["Ben?","Yes","No","HoHoHoHo"],"world":{"insane":"!","hello":"world","this":"is"}}, PRETTY
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [10] 13143, null
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [1] {test2=test3, test=test1}, class java.lang.String, class java.lang.String
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [2] PP0L44MG1SQ0DWE933SFKPHXZ, null
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [2] {test2=456, test=123}, class java.lang.String, class java.lang.Integer
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [3] 1948152697, null
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [3] Lobbyhello156:3222d56d-85ad-4319-9341-8dba893f4057
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [3] {test2=[678, 456], test=[123, 456]}, class java.lang.String, java.util.List<java.lang.Integer>
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [4] 8166692600082826921, null
eu.cloudnetservice.driver.network.rpc.object.DefaultObjectMapperTest ‑ [4] Optional[{test2=test3, test=test1}], java.util.Map<java.lang.String, java.lang.String>
…

♻️ This comment has been updated with latest results.

@0utplay 0utplay added this to the 4.0.0-RC10 milestone Jul 12, 2023
@tunikakeks
Copy link

I have some issues with the Bridge, it got updated correctly from the waterdog2 branch. Self-built and downloaded from the launchermeta repo

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
in: module An issue/pull request releated to one of the internal modules in: node An issue/pull request releated to the node module code t: platform Request to add/change a platform implementation v: 4.X This pull should be included in the 4.0 release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants