From da47c4ccb674a536b78bac5ef55e3d433ad27c9d Mon Sep 17 00:00:00 2001 From: Aldin Date: Sun, 15 Dec 2024 23:16:26 +0100 Subject: [PATCH 01/16] fix: exception when interacting with npc inventory (#1554) ### Motivation An NPCs inventory is only created when the NPC is spawned. However, we only spawn NPCs if the chunk they are located in is loaded. As a result, there are NPCs that are tracked but do not yet have an inventory. When interacting with an already spawned NPC, a check is performed to determine if the clicked inventory belongs to an NPC. If an NPC is not yet spawned and therefore its inventory has not yet been created, checking whether the inventory belongs to this NPC will result in a NullPointerException. ### Modification Mark the method that returns the NPC's inventory as nullable and make the inventory comparison null aware. ### Result Clicking on NPC selector items no longer leads to exceptions due to NPCs without inventory. --- .../modules/npc/platform/PlatformSelectorEntity.java | 3 ++- .../platform/bukkit/listener/BukkitFunctionalityListener.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/npcs/src/main/java/eu/cloudnetservice/modules/npc/platform/PlatformSelectorEntity.java b/modules/npcs/src/main/java/eu/cloudnetservice/modules/npc/platform/PlatformSelectorEntity.java index dcce6e2ff6..197dc9e3fa 100644 --- a/modules/npcs/src/main/java/eu/cloudnetservice/modules/npc/platform/PlatformSelectorEntity.java +++ b/modules/npcs/src/main/java/eu/cloudnetservice/modules/npc/platform/PlatformSelectorEntity.java @@ -20,6 +20,7 @@ import eu.cloudnetservice.modules.npc.NPC; import java.util.Set; import lombok.NonNull; +import org.jetbrains.annotations.Nullable; public interface PlatformSelectorEntity { @@ -39,7 +40,7 @@ public interface PlatformSelectorEntity { void executeAction(@NonNull P player, @NonNull NPC.ClickAction action); - @NonNull I selectorInventory(); + @Nullable I selectorInventory(); void handleInventoryInteract(@NonNull I inv, @NonNull P player, @NonNull M clickedItem); diff --git a/modules/npcs/src/main/java/eu/cloudnetservice/modules/npc/platform/bukkit/listener/BukkitFunctionalityListener.java b/modules/npcs/src/main/java/eu/cloudnetservice/modules/npc/platform/bukkit/listener/BukkitFunctionalityListener.java index 40ccf05308..7cbae24ff8 100644 --- a/modules/npcs/src/main/java/eu/cloudnetservice/modules/npc/platform/bukkit/listener/BukkitFunctionalityListener.java +++ b/modules/npcs/src/main/java/eu/cloudnetservice/modules/npc/platform/bukkit/listener/BukkitFunctionalityListener.java @@ -137,7 +137,7 @@ public void handle(@NonNull InventoryClickEvent event) { // check if we can handle the event if (item != null && item.hasItemMeta() && inv != null && inv.getHolder() == null && clicker instanceof Player) { this.management.trackedEntities().values().stream() - .filter(npc -> npc.selectorInventory().equals(inv)) + .filter(npc -> inv.equals(npc.selectorInventory())) .findFirst() .ifPresent(npc -> { event.setCancelled(true); From d45c83363a07ca0bcebf4c9add5f12e7bb39cd48 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:13:53 +0100 Subject: [PATCH 02/16] chore: update dependency com.zaxxer:HikariCP to v6.2.1 (#1545) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.zaxxer:HikariCP](https://redirect.github.com/brettwooldridge/HikariCP) | `6.0.0` -> `6.2.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.zaxxer:HikariCP/6.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.zaxxer:HikariCP/6.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.zaxxer:HikariCP/6.0.0/6.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.zaxxer:HikariCP/6.0.0/6.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/CloudNetService/CloudNet). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9f576a7363..b5c2710419 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ stringSimilarity = "2.0.0" h2 = "1.4.197" # do not update, leads to database incompatibility xodus = "2.0.1" mongodb = "5.2.0" -hikariCp = "6.0.0" +hikariCp = "6.2.1" mysqlConnector = "9.1.0" # general From c91bddbfd03939bf4ad6813b83e405c523ea0061 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:19:38 +0100 Subject: [PATCH 03/16] chore: update dependency com.puppycrawl.tools:checkstyle to v10.21.0 (#1543) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://redirect.github.com/checkstyle/checkstyle)) | `10.18.2` -> `10.21.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.puppycrawl.tools:checkstyle/10.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.puppycrawl.tools:checkstyle/10.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.puppycrawl.tools:checkstyle/10.18.2/10.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.puppycrawl.tools:checkstyle/10.18.2/10.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
checkstyle/checkstyle (com.puppycrawl.tools:checkstyle) ### [`v10.21.0`](https://redirect.github.com/checkstyle/checkstyle/compare/checkstyle-10.20.2...checkstyle-10.21.0) ### [`v10.20.2`](https://redirect.github.com/checkstyle/checkstyle/compare/checkstyle-10.20.1...checkstyle-10.20.2) [Compare Source](https://redirect.github.com/checkstyle/checkstyle/compare/checkstyle-10.20.1...checkstyle-10.20.2) ### [`v10.20.1`](https://redirect.github.com/checkstyle/checkstyle/compare/checkstyle-10.20.0...checkstyle-10.20.1) ### [`v10.20.0`](https://redirect.github.com/checkstyle/checkstyle/compare/checkstyle-10.19.0...checkstyle-10.20.0) [Compare Source](https://redirect.github.com/checkstyle/checkstyle/compare/checkstyle-10.19.0...checkstyle-10.20.0) ### [`v10.19.0`](https://redirect.github.com/checkstyle/checkstyle/compare/checkstyle-10.18.2...checkstyle-10.19.0)
--- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/CloudNetService/CloudNet). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b5c2710419..cfb5cfe05a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ juppiter = "0.4.0" spotless = "6.25.0" fabricLoom = "1.8.10" nexusPublish = "2.0.0" -checkstyleTools = "10.18.2" +checkstyleTools = "10.21.0" # google libs gson = "2.11.0" From 87377fba0b23974e32ed2e1d8ca9409da3aecf65 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:21:25 +0100 Subject: [PATCH 04/16] chore: update jline to v3.28.0 (#1552) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.jline:jline-terminal-ffm](https://redirect.github.com/jline/jline3) | `3.27.1` -> `3.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jline:jline-terminal-ffm/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jline:jline-terminal-ffm/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jline:jline-terminal-ffm/3.27.1/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jline:jline-terminal-ffm/3.27.1/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.jline:jline-reader](https://redirect.github.com/jline/jline3) | `3.27.1` -> `3.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jline:jline-reader/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jline:jline-reader/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jline:jline-reader/3.27.1/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jline:jline-reader/3.27.1/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.jline:jansi-core](https://redirect.github.com/jline/jline3) | `3.27.1` -> `3.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.jline:jansi-core/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jline:jansi-core/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jline:jansi-core/3.27.1/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jline:jansi-core/3.27.1/3.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/CloudNetService/CloudNet). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cfb5cfe05a..ec48dee46d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ lombok = "1.18.34" javapoet = "1.13.0" # console -jline = "3.27.1" +jline = "3.28.0" cloud = "2.0.0-cn1" cloudConfirmation = "1.0.0-rc.1" stringSimilarity = "2.0.0" From aec74b6a348824455ea0efb95578aa18242de2d5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:21:59 +0100 Subject: [PATCH 05/16] chore: update dependency software.amazon.awssdk:s3 to v2.29.34 (#1542) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [software.amazon.awssdk:s3](https://aws.amazon.com/sdkforjava) | `2.28.26` -> `2.29.34` | [![age](https://developer.mend.io/api/mc/badges/age/maven/software.amazon.awssdk:s3/2.29.34?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/software.amazon.awssdk:s3/2.29.34?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/software.amazon.awssdk:s3/2.28.26/2.29.34?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/software.amazon.awssdk:s3/2.28.26/2.29.34?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/CloudNetService/CloudNet). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ec48dee46d..84d0ab6fd0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -40,7 +40,7 @@ oshi = "6.6.5" vavr = "0.10.5" sshj = "0.39.0" aerogel = "2.1.0" -awsSdk = "2.28.26" +awsSdk = "2.29.34" unirest = "4.4.4" caffeine = "3.1.8" reflexion = "1.8.0" From dcb0f2ef94b7e612a7290961311ec3632b33f92c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:30:51 +0100 Subject: [PATCH 06/16] chore: update all dependencies with patch changes (#1539) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ch.qos.logback:logback-classic](http://logback.qos.ch) ([source](https://redirect.github.com/qos-ch/logback), [changelog](https://logback.qos.ch/news.html)) | `1.5.11` -> `1.5.12` | [![age](https://developer.mend.io/api/mc/badges/age/maven/ch.qos.logback:logback-classic/1.5.12?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/ch.qos.logback:logback-classic/1.5.12?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/ch.qos.logback:logback-classic/1.5.11/1.5.12?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/ch.qos.logback:logback-classic/1.5.11/1.5.12?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [ch.qos.logback:logback-core](http://logback.qos.ch) ([source](https://redirect.github.com/qos-ch/logback), [changelog](https://logback.qos.ch/news.html)) | `1.5.11` -> `1.5.12` | [![age](https://developer.mend.io/api/mc/badges/age/maven/ch.qos.logback:logback-core/1.5.12?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/ch.qos.logback:logback-core/1.5.12?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/ch.qos.logback:logback-core/1.5.11/1.5.12?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/ch.qos.logback:logback-core/1.5.11/1.5.12?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [com.github.docker-java:docker-java-transport-httpclient5](https://redirect.github.com/docker-java/docker-java) | `3.4.0` -> `3.4.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.github.docker-java:docker-java-transport-httpclient5/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.github.docker-java:docker-java-transport-httpclient5/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.github.docker-java:docker-java-transport-httpclient5/3.4.0/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.github.docker-java:docker-java-transport-httpclient5/3.4.0/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [com.github.docker-java:docker-java-core](https://redirect.github.com/docker-java/docker-java) | `3.4.0` -> `3.4.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.github.docker-java:docker-java-core/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.github.docker-java:docker-java-core/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.github.docker-java:docker-java-core/3.4.0/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.github.docker-java:docker-java-core/3.4.0/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [com.konghq:unirest-modules-gson](https://redirect.github.com/Kong/unirest-java) | `4.4.4` -> `4.4.5` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.konghq:unirest-modules-gson/4.4.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.konghq:unirest-modules-gson/4.4.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.konghq:unirest-modules-gson/4.4.4/4.4.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.konghq:unirest-modules-gson/4.4.4/4.4.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [com.konghq:unirest-java-core](https://redirect.github.com/Kong/unirest-java) | `4.4.4` -> `4.4.5` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.konghq:unirest-java-core/4.4.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.konghq:unirest-java-core/4.4.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.konghq:unirest-java-core/4.4.4/4.4.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.konghq:unirest-java-core/4.4.4/4.4.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.mongodb:mongodb-driver-sync](https://www.mongodb.com/) ([source](https://redirect.github.com/mongodb/mongo-java-driver)) | `5.2.0` -> `5.2.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.mongodb:mongodb-driver-sync/5.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.mongodb:mongodb-driver-sync/5.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.mongodb:mongodb-driver-sync/5.2.0/5.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.mongodb:mongodb-driver-sync/5.2.0/5.2.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.projectlombok:lombok](https://projectlombok.org) ([source](https://redirect.github.com/projectlombok/lombok)) | `1.18.34` -> `1.18.36` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.projectlombok:lombok/1.18.36?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.projectlombok:lombok/1.18.36?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.projectlombok:lombok/1.18.34/1.18.36?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.projectlombok:lombok/1.18.34/1.18.36?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.testcontainers:junit-jupiter](https://java.testcontainers.org) ([source](https://redirect.github.com/testcontainers/testcontainers-java)) | `1.20.2` -> `1.20.4` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.testcontainers:junit-jupiter/1.20.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.testcontainers:junit-jupiter/1.20.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.testcontainers:junit-jupiter/1.20.2/1.20.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.testcontainers:junit-jupiter/1.20.2/1.20.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.testcontainers:testcontainers](https://java.testcontainers.org) ([source](https://redirect.github.com/testcontainers/testcontainers-java)) | `1.20.2` -> `1.20.4` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.testcontainers:testcontainers/1.20.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.testcontainers:testcontainers/1.20.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.testcontainers:testcontainers/1.20.2/1.20.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.testcontainers:testcontainers/1.20.2/1.20.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.junit.platform:junit-platform-launcher](https://junit.org/junit5/) ([source](https://redirect.github.com/junit-team/junit5)) | `1.11.2` -> `1.11.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.junit.platform:junit-platform-launcher/1.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.junit.platform:junit-platform-launcher/1.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.junit.platform:junit-platform-launcher/1.11.2/1.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.junit.platform:junit-platform-launcher/1.11.2/1.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.junit.jupiter:junit-jupiter-engine](https://junit.org/junit5/) ([source](https://redirect.github.com/junit-team/junit5)) | `5.11.2` -> `5.11.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.junit.jupiter:junit-jupiter-engine/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.junit.jupiter:junit-jupiter-engine/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.junit.jupiter:junit-jupiter-engine/5.11.2/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.junit.jupiter:junit-jupiter-engine/5.11.2/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.junit.jupiter:junit-jupiter-params](https://junit.org/junit5/) ([source](https://redirect.github.com/junit-team/junit5)) | `5.11.2` -> `5.11.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.junit.jupiter:junit-jupiter-params/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.junit.jupiter:junit-jupiter-params/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.junit.jupiter:junit-jupiter-params/5.11.2/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.junit.jupiter:junit-jupiter-params/5.11.2/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.junit.jupiter:junit-jupiter-api](https://junit.org/junit5/) ([source](https://redirect.github.com/junit-team/junit5)) | `5.11.2` -> `5.11.3` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.junit.jupiter:junit-jupiter-api/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.junit.jupiter:junit-jupiter-api/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.junit.jupiter:junit-jupiter-api/5.11.2/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.junit.jupiter:junit-jupiter-api/5.11.2/5.11.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | com.gradleup.shadow | `8.3.3` -> `8.3.5` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.gradleup.shadow:com.gradleup.shadow.gradle.plugin/8.3.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.gradleup.shadow:com.gradleup.shadow.gradle.plugin/8.3.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.gradleup.shadow:com.gradleup.shadow.gradle.plugin/8.3.3/8.3.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.gradleup.shadow:com.gradleup.shadow.gradle.plugin/8.3.3/8.3.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
docker-java/docker-java (com.github.docker-java:docker-java-transport-httpclient5) ### [`v3.4.1`](https://redirect.github.com/docker-java/docker-java/releases/tag/3.4.1) [Compare Source](https://redirect.github.com/docker-java/docker-java/compare/3.4.0...3.4.1) ##### Changes - Fix restart test [@​eddumelendez](https://redirect.github.com/eddumelendez) ([#​2375](https://redirect.github.com/docker-java/docker-java/issues/2375)) ##### πŸ“ˆ Enhancements - Add support for CgroupVersion and CgroupDriver [@​LarsSven](https://redirect.github.com/LarsSven) ([#​2360](https://redirect.github.com/docker-java/docker-java/issues/2360)) ##### 🧰 Maintenance - Don't swallow IOException caused by opening socket [@​Sineaggi](https://redirect.github.com/Sineaggi) ([#​2041](https://redirect.github.com/docker-java/docker-java/issues/2041))
Kong/unirest-java (com.konghq:unirest-modules-gson) ### [`v4.4.5`](https://redirect.github.com/Kong/unirest-java/blob/HEAD/CHANGELOG.md#445) - Issue [#​536](https://redirect.github.com/Kong/unirest-java/issues/536) UnirestInstance should implement AutoCloseable
projectlombok/lombok (org.projectlombok:lombok) ### [`v1.18.36`](https://redirect.github.com/projectlombok/lombok/compare/v1.18.34...v1.18.36)
testcontainers/testcontainers-java (org.testcontainers:junit-jupiter) ### [`v1.20.4`](https://redirect.github.com/testcontainers/testcontainers-java/releases/tag/1.20.4) [Compare Source](https://redirect.github.com/testcontainers/testcontainers-java/compare/1.20.3...1.20.4) ### What's Changed - Update docs version to ${GITHUB_REF##\*/} ([#​9450](https://redirect.github.com/testcontainers/testcontainers-java/issues/9450)) [@​github-actions](https://redirect.github.com/github-actions) - Update testcontainers version to ${GITHUB_REF##\*/} ([#​9449](https://redirect.github.com/testcontainers/testcontainers-java/issues/9449)) [@​github-actions](https://redirect.github.com/github-actions) #### πŸš€ Features & Enhancements - \[localstack] Add testcontainer marker labels to additional localstack flags ([#​9531](https://redirect.github.com/testcontainers/testcontainers-java/issues/9531)) [@​dfangl](https://redirect.github.com/dfangl) - Remove extra call to docker credentials ([#​9545](https://redirect.github.com/testcontainers/testcontainers-java/issues/9545)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Remove privilegedMode in Db2Container ([#​9460](https://redirect.github.com/testcontainers/testcontainers-java/issues/9460)) [@​hfhbd](https://redirect.github.com/hfhbd) #### πŸ› Bug Fixes - Fix docker credentials output ([#​9544](https://redirect.github.com/testcontainers/testcontainers-java/issues/9544)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Fix cockroachdb wait strategy with version >= 22.1.0 ([#​9505](https://redirect.github.com/testcontainers/testcontainers-java/issues/9505)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Check if container belongs to a network when using exposeHostPorts ([#​8298](https://redirect.github.com/testcontainers/testcontainers-java/issues/8298)) [@​TomDeBacker](https://redirect.github.com/TomDeBacker) - Revert "Add shutdownHook to send sigterm to ryuk ([#​7717](https://redirect.github.com/testcontainers/testcontainers-java/issues/7717))" ([#​9504](https://redirect.github.com/testcontainers/testcontainers-java/issues/9504)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Stop container that doesn't match wait strategy ([#​9474](https://redirect.github.com/testcontainers/testcontainers-java/issues/9474)) [@​ssheikin](https://redirect.github.com/ssheikin) - Fix ClickHouse wait strategy ([#​9466](https://redirect.github.com/testcontainers/testcontainers-java/issues/9466)) [@​livk-cloud](https://redirect.github.com/livk-cloud) #### πŸ“– Documentation - Fix default client.ping.timeout value in docs ([#​9464](https://redirect.github.com/testcontainers/testcontainers-java/issues/9464)) [@​KyleAure](https://redirect.github.com/KyleAure) - Add container implementation for Typesense ([#​9454](https://redirect.github.com/testcontainers/testcontainers-java/issues/9454)) [@​eddumelendez](https://redirect.github.com/eddumelendez) #### πŸ“¦ Dependency updates - Update ryuk version to 0.11.0 ([#​9453](https://redirect.github.com/testcontainers/testcontainers-java/issues/9453)) [@​eddumelendez](https://redirect.github.com/eddumelendez) ### [`v1.20.3`](https://redirect.github.com/testcontainers/testcontainers-java/releases/tag/1.20.3) [Compare Source](https://redirect.github.com/testcontainers/testcontainers-java/compare/1.20.2...1.20.3) ##### What's Changed - Pin OceanBase image ([#​9416](https://redirect.github.com/testcontainers/testcontainers-java/issues/9416)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Fix execution in windows runner ([#​9413](https://redirect.github.com/testcontainers/testcontainers-java/issues/9413)) [@​eddumelendez](https://redirect.github.com/eddumelendez) ##### πŸš€ Features & Enhancements - Log exception on socket problems ([#​8055](https://redirect.github.com/testcontainers/testcontainers-java/issues/8055)) [@​ciis0](https://redirect.github.com/ciis0) - Add support for apachepulsar/pulsar-all image ([#​9448](https://redirect.github.com/testcontainers/testcontainers-java/issues/9448)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Introduce new property to configure pull.timeout ([#​9417](https://redirect.github.com/testcontainers/testcontainers-java/issues/9417)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Add r2dbc support for Clickhouse ([#​8434](https://redirect.github.com/testcontainers/testcontainers-java/issues/8434)) [@​livk-cloud](https://redirect.github.com/livk-cloud) - Support reset value in Docker Compose ([#​9343](https://redirect.github.com/testcontainers/testcontainers-java/issues/9343)) [@​eddumelendez](https://redirect.github.com/eddumelendez) ##### πŸ› Bug Fixes - fix: await during DockerClientProviderStrategy test method ([#​9412](https://redirect.github.com/testcontainers/testcontainers-java/issues/9412)) [@​KyleAure](https://redirect.github.com/KyleAure) - Parse docker compose file correctly when version is not declared ([#​9420](https://redirect.github.com/testcontainers/testcontainers-java/issues/9420)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Read docker credentials stdout and stderr independently ([#​8007](https://redirect.github.com/testcontainers/testcontainers-java/issues/8007)) [@​Smeb](https://redirect.github.com/Smeb) - Use server URL from auth query if helper does not return one ([#​9056](https://redirect.github.com/testcontainers/testcontainers-java/issues/9056)) [@​eager-signal](https://redirect.github.com/eager-signal) - Clear docker compose initialization ([#​9370](https://redirect.github.com/testcontainers/testcontainers-java/issues/9370)) [@​eddumelendez](https://redirect.github.com/eddumelendez) ##### πŸ“– Documentation - Add "integration-testing" topic ([#​9338](https://redirect.github.com/testcontainers/testcontainers-java/issues/9338)) [@​bsideup](https://redirect.github.com/bsideup) ##### 🧹 Housekeeping - Declarative R2DBC SPI implementation ([#​9447](https://redirect.github.com/testcontainers/testcontainers-java/issues/9447)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Fix windows test ([#​9409](https://redirect.github.com/testcontainers/testcontainers-java/issues/9409)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Add ComposeContainer test to junit-jupiter module ([#​9407](https://redirect.github.com/testcontainers/testcontainers-java/issues/9407)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Check docker compose version ([#​9342](https://redirect.github.com/testcontainers/testcontainers-java/issues/9342)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Use Awaitility in FixedHostPortContainerTest ([#​9341](https://redirect.github.com/testcontainers/testcontainers-java/issues/9341)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Polish Kafka examples ([#​9340](https://redirect.github.com/testcontainers/testcontainers-java/issues/9340)) [@​eddumelendez](https://redirect.github.com/eddumelendez) - Polish Cassandra tests ([#​9339](https://redirect.github.com/testcontainers/testcontainers-java/issues/9339)) [@​eddumelendez](https://redirect.github.com/eddumelendez)
--- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ‘» **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/CloudNetService/CloudNet). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 84d0ab6fd0..896e0f36ed 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] # plugins -shadow = "8.3.3" +shadow = "8.3.5" juppiter = "0.4.0" spotless = "6.25.0" fabricLoom = "1.8.10" @@ -13,13 +13,13 @@ gson = "2.11.0" guava = "33.3.1-jre" # testing -junit = "5.11.2" +junit = "5.11.3" mockito = "5.14.2" -junitLauncher = "1.11.2" -testcontainers = "1.20.2" +junitLauncher = "1.11.3" +testcontainers = "1.20.4" # compile time processing -lombok = "1.18.34" +lombok = "1.18.36" javapoet = "1.13.0" # console @@ -31,7 +31,7 @@ stringSimilarity = "2.0.0" # databases h2 = "1.4.197" # do not update, leads to database incompatibility xodus = "2.0.1" -mongodb = "5.2.0" +mongodb = "5.2.1" hikariCp = "6.2.1" mysqlConnector = "9.1.0" @@ -41,11 +41,11 @@ vavr = "0.10.5" sshj = "0.39.0" aerogel = "2.1.0" awsSdk = "2.29.34" -unirest = "4.4.4" +unirest = "4.4.5" caffeine = "3.1.8" reflexion = "1.8.0" geantyref = "2.0.0" -dockerJava = "3.4.0" +dockerJava = "3.4.1" nightConfig = "3.8.1" annotations = "26.0.1" influxClient = "7.2.0" @@ -54,7 +54,7 @@ gulf = "1.0.0-SNAPSHOT" # logging slf4j = "2.0.16" -logback = "1.5.11" +logback = "1.5.12" # platform api versions sponge = "9.0.0" From 0f5e7e9ebb3eef478543380627b2bfe9144309b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:38:37 +0100 Subject: [PATCH 07/16] chore: update dependency gradle to v8.11.1 (#1548) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [gradle](https://gradle.org) ([source](https://redirect.github.com/gradle/gradle)) | minor | `8.10.2` -> `8.11.1` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
gradle/gradle (gradle) ### [`v8.11.1`](https://redirect.github.com/gradle/gradle/releases/tag/v8.11.1): 8.11.1 [Compare Source](https://redirect.github.com/gradle/gradle/compare/v8.11.0...v8.11.1) This is a patch release for Gradle 8.11. We recommend users upgrade to 8.11.1 instead of 8.11. It fixes the following issues: - [#​31268](https://redirect.github.com/gradle/gradle/issues/31268) BuildEventsListenerRegistry corrupted with Isolated Projects and parallel configuration - [#​31282](https://redirect.github.com/gradle/gradle/issues/31282) Running executables sporadically fails with ETXTBSY (Text file busy) - [#​31284](https://redirect.github.com/gradle/gradle/issues/31284) ArrayIndexOutOfBoundsException after upgrading to gradle 8.11 when generating problems report - [#​31310](https://redirect.github.com/gradle/gradle/issues/31310) Unable to run Gradle task in 8.10 due to bytecode interception [Read the Release Notes](https://docs.gradle.org/8.11.1/release-notes.html) #### Upgrade instructions Switch your build to use Gradle 8.11.1 by updating your wrapper: ./gradlew wrapper --gradle-version=8.11.1 See the Gradle [8.x upgrade guide](https://docs.gradle.org/8.11.1/userguide/upgrading_version\_8.html) to learn about deprecations, breaking changes and other considerations when upgrading. For Java, Groovy, Kotlin and Android compatibility, see the [full compatibility notes](https://docs.gradle.org/8.11.1/userguide/compatibility.html). #### Reporting problems If you find a problem with this release, please file a bug on [GitHub Issues](https://redirect.github.com/gradle/gradle/issues) adhering to our issue guidelines. If you're not sure you're encountering a bug, please use the [forum](https://discuss.gradle.org/c/help-discuss). We hope you will build happiness with Gradle, and we look forward to your feedback via [Twitter](https://twitter.com/gradle) or on [GitHub](https://redirect.github.com/gradle). ### [`v8.11`](https://redirect.github.com/gradle/gradle/releases/tag/v8.11.0): 8.11 [Compare Source](https://redirect.github.com/gradle/gradle/compare/v8.10.2...v8.11.0) The Gradle team is excited to announce Gradle 8.11. [Read the Release Notes](https://docs.gradle.org/8.11/release-notes.html) We would like to thank the following community members for their contributions to this release of Gradle: [Adam](https://redirect.github.com/adam-enko), [alyssoncs](https://redirect.github.com/alyssoncs), [Bilel MEDIMEGH](https://redirect.github.com/LelouBil), [BjΓΆrn Kautler](https://redirect.github.com/Vampire), [Chuck Thomas](https://redirect.github.com/chuckthemole), [Daniel Lacasse](https://redirect.github.com/lacasseio), [Finn Petersen](https://redirect.github.com/fp7), [JK](https://redirect.github.com/jknair0), [JΓ©rΓ©mie Bresson](https://redirect.github.com/jmini), [luozexuan](https://redirect.github.com/luozexuan), [Mahdi Hosseinzadeh](https://redirect.github.com/mahozad), [Markus Gaisbauer](https://redirect.github.com/quijote), [Matthew Haughton](https://redirect.github.com/3flex), [Matthew Von-Maszewski](https://redirect.github.com/matthewvon), [ploober](https://redirect.github.com/ploober), [Siarhei](https://redirect.github.com/madhead), [Titus James](https://redirect.github.com/tj330), [vrp0211](https://redirect.github.com/vrp0211) #### Upgrade instructions Switch your build to use Gradle 8.11 by updating your wrapper: ./gradlew wrapper --gradle-version=8.11 See the Gradle [8.x upgrade guide](https://docs.gradle.org/8.11/userguide/upgrading_version\_8.html) to learn about deprecations, breaking changes and other considerations when upgrading. For Java, Groovy, Kotlin and Android compatibility, see the [full compatibility notes](https://docs.gradle.org/8.11/userguide/compatibility.html). #### Reporting problems If you find a problem with this release, please file a bug on [GitHub Issues](https://redirect.github.com/gradle/gradle/issues) adhering to our issue guidelines. If you're not sure you're encountering a bug, please use the [forum](https://discuss.gradle.org/c/help-discuss). We hope you will build happiness with Gradle, and we look forward to your feedback via [Twitter](https://twitter.com/gradle) or on [GitHub](https://redirect.github.com/gradle).
--- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/CloudNetService/CloudNet). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb602ee2af..eb1a55be0e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 7fc8691ba0527a444a5b724645839c5c2bcd124b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 13:40:57 +0100 Subject: [PATCH 08/16] chore: update dependency fabric-loom to v1.9.2 (#1549) --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 896e0f36ed..a43a7811b7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ shadow = "8.3.5" juppiter = "0.4.0" spotless = "6.25.0" -fabricLoom = "1.8.10" +fabricLoom = "1.9.2" nexusPublish = "2.0.0" checkstyleTools = "10.21.0" From f0cc99501b05078e3702191c31fcf1592f5c422d Mon Sep 17 00:00:00 2001 From: Aldin Date: Mon, 16 Dec 2024 13:45:12 +0100 Subject: [PATCH 09/16] fix: cluster command was not migrated to cloud 2.0 (#1555) ### Motivation When migrating to cloud 2.0 we had to remove the queue from parsers and replace it with CommandInput. The parser of network nodes was left out. So we have to do it now. ### Modification Replace Queue with CommandInput in network cluster node parser. ### Result The parser works correctly. --- .../cloudnetservice/node/command/sub/ClusterCommand.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/node/src/main/java/eu/cloudnetservice/node/command/sub/ClusterCommand.java b/node/src/main/java/eu/cloudnetservice/node/command/sub/ClusterCommand.java index 0aaf35b3ba..f0e2bbc1a6 100644 --- a/node/src/main/java/eu/cloudnetservice/node/command/sub/ClusterCommand.java +++ b/node/src/main/java/eu/cloudnetservice/node/command/sub/ClusterCommand.java @@ -52,7 +52,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Queue; import java.util.stream.Collectors; import java.util.stream.Stream; import lombok.NonNull; @@ -62,7 +61,6 @@ import org.incendo.cloud.annotations.Permission; import org.incendo.cloud.annotations.parser.Parser; import org.incendo.cloud.annotations.suggestion.Suggestions; -import org.incendo.cloud.context.CommandContext; import org.incendo.cloud.context.CommandInput; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -136,11 +134,8 @@ public ClusterCommand( } @Parser(suggestions = "networkClusterNode") - public @NonNull NetworkClusterNode defaultNetworkClusterNodeParser( - @NonNull CommandContext $, - @NonNull Queue input - ) { - var nodeId = input.remove(); + public @NonNull NetworkClusterNode defaultNetworkClusterNodeParser(@NonNull CommandInput input) { + var nodeId = input.readString(); var clusterNode = this.clusterNodeProvider.node(nodeId); if (clusterNode == null) { throw new ArgumentNotAvailableException(I18n.trans("command-cluster-node-not-found")); From eb8664c79edb55cccb6d9cf108154847269e7f79 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 10:35:13 +0100 Subject: [PATCH 10/16] chore: update all dependencies with patch changes (#1556) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [software.amazon.awssdk:s3](https://aws.amazon.com/sdkforjava) | `2.29.34` -> `2.29.35` | [![age](https://developer.mend.io/api/mc/badges/age/maven/software.amazon.awssdk:s3/2.29.35?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/software.amazon.awssdk:s3/2.29.35?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/software.amazon.awssdk:s3/2.29.34/2.29.35?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/software.amazon.awssdk:s3/2.29.34/2.29.35?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.junit.platform:junit-platform-launcher](https://junit.org/junit5/) ([source](https://redirect.github.com/junit-team/junit5)) | `1.11.3` -> `1.11.4` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.junit.platform:junit-platform-launcher/1.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.junit.platform:junit-platform-launcher/1.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.junit.platform:junit-platform-launcher/1.11.3/1.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.junit.platform:junit-platform-launcher/1.11.3/1.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.junit.jupiter:junit-jupiter-engine](https://junit.org/junit5/) ([source](https://redirect.github.com/junit-team/junit5)) | `5.11.3` -> `5.11.4` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.junit.jupiter:junit-jupiter-engine/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.junit.jupiter:junit-jupiter-engine/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.junit.jupiter:junit-jupiter-engine/5.11.3/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.junit.jupiter:junit-jupiter-engine/5.11.3/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.junit.jupiter:junit-jupiter-params](https://junit.org/junit5/) ([source](https://redirect.github.com/junit-team/junit5)) | `5.11.3` -> `5.11.4` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.junit.jupiter:junit-jupiter-params/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.junit.jupiter:junit-jupiter-params/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.junit.jupiter:junit-jupiter-params/5.11.3/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.junit.jupiter:junit-jupiter-params/5.11.3/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [org.junit.jupiter:junit-jupiter-api](https://junit.org/junit5/) ([source](https://redirect.github.com/junit-team/junit5)) | `5.11.3` -> `5.11.4` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.junit.jupiter:junit-jupiter-api/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.junit.jupiter:junit-jupiter-api/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.junit.jupiter:junit-jupiter-api/5.11.3/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.junit.jupiter:junit-jupiter-api/5.11.3/5.11.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ‘» **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/CloudNetService/CloudNet). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a43a7811b7..fb4dd8f43f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,9 +13,9 @@ gson = "2.11.0" guava = "33.3.1-jre" # testing -junit = "5.11.3" +junit = "5.11.4" mockito = "5.14.2" -junitLauncher = "1.11.3" +junitLauncher = "1.11.4" testcontainers = "1.20.4" # compile time processing @@ -40,7 +40,7 @@ oshi = "6.6.5" vavr = "0.10.5" sshj = "0.39.0" aerogel = "2.1.0" -awsSdk = "2.29.34" +awsSdk = "2.29.35" unirest = "4.4.5" caffeine = "3.1.8" reflexion = "1.8.0" From 8460c5611ae3fe3300b5e5f94c64e9d7339da18b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:39:54 +0100 Subject: [PATCH 11/16] chore: update dependency com.google.guava:guava to v33.4.0-jre (#1559) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.guava:guava](https://redirect.github.com/google/guava) | `33.3.1-jre` -> `33.4.0-jre` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.guava:guava/33.4.0-jre?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.guava:guava/33.4.0-jre?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.guava:guava/33.3.1-jre/33.4.0-jre?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.guava:guava/33.3.1-jre/33.4.0-jre?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/CloudNetService/CloudNet). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fb4dd8f43f..7b55e92f80 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ checkstyleTools = "10.21.0" # google libs gson = "2.11.0" -guava = "33.3.1-jre" +guava = "33.4.0-jre" # testing junit = "5.11.4" From d88453fb1903205dfff4f33212b9108f11a21fd5 Mon Sep 17 00:00:00 2001 From: Aldin Date: Wed, 18 Dec 2024 14:12:46 +0100 Subject: [PATCH 12/16] fix: properly include adventure in bridge jar (#1557) ### Motivation Our update to fabric loom 1.9.2 resulted in bridge jars without adventure shaded into it. ### Modification Moved our class copy to the jar task. ### Result Adventure is shaded again. --- modules/bridge/build.gradle.kts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/bridge/build.gradle.kts b/modules/bridge/build.gradle.kts index 58da53665b..be8bc99611 100644 --- a/modules/bridge/build.gradle.kts +++ b/modules/bridge/build.gradle.kts @@ -52,13 +52,10 @@ tasks.withType { manifest { attributes["paperweight-mappings-namespace"] = "mojang" } -} -tasks.withType { // depend on adventure helper jar task dependsOn(":ext:adventure-helper:jar") - // base setup - archiveFileName.set(Files.bridge) + duplicatesStrategy = DuplicatesStrategy.EXCLUDE // includes all dependencies of runtimeImpl but excludes gson because we don't need it from(configurations.getByName("runtimeImpl").map { if (it.isDirectory) it else zipTree(it) }) @@ -67,6 +64,10 @@ tasks.withType { } } +tasks.withType { + archiveFileName.set(Files.bridge) +} + loom { accessWidenerPath.set(project.file("src/main/resources/cloudnet_bridge.accesswidener")) } From af4a659e4f09914e0be3d307a194b58614d14f41 Mon Sep 17 00:00:00 2001 From: Aldin Date: Fri, 20 Dec 2024 20:24:03 +0100 Subject: [PATCH 13/16] fix: service copy without default template (#1558) ### Motivation When copying a service without providing a template we try to fallback to the "/default" template. But our fallback logic is not working correctly and causing an NPE. ### Modification We now only accept a single service when copying. If no default template exists and no template is provided we respond with an message indicating the missing template. ### Result The `service copy` Command is working again. ##### Other context Fixes #1550 --- .../node/command/sub/ServiceCommand.java | 59 +++++++------------ node/src/main/resources/lang/de_DE.properties | 2 +- node/src/main/resources/lang/en_US.properties | 2 +- 3 files changed, 24 insertions(+), 39 deletions(-) diff --git a/node/src/main/java/eu/cloudnetservice/node/command/sub/ServiceCommand.java b/node/src/main/java/eu/cloudnetservice/node/command/sub/ServiceCommand.java index 2730cbe0ef..f66471c79b 100644 --- a/node/src/main/java/eu/cloudnetservice/node/command/sub/ServiceCommand.java +++ b/node/src/main/java/eu/cloudnetservice/node/command/sub/ServiceCommand.java @@ -22,14 +22,12 @@ import eu.cloudnetservice.common.column.RowedFormatter; import eu.cloudnetservice.common.language.I18n; import eu.cloudnetservice.common.resource.ResourceFormatter; -import eu.cloudnetservice.common.tuple.Tuple2; import eu.cloudnetservice.common.util.WildcardUtil; import eu.cloudnetservice.driver.channel.ChannelMessageSender; import eu.cloudnetservice.driver.event.EventListener; import eu.cloudnetservice.driver.event.EventManager; import eu.cloudnetservice.driver.event.events.service.CloudServiceLogEntryEvent; import eu.cloudnetservice.driver.provider.CloudServiceProvider; -import eu.cloudnetservice.driver.provider.SpecificCloudServiceProvider; import eu.cloudnetservice.driver.service.ServiceDeployment; import eu.cloudnetservice.driver.service.ServiceInfoSnapshot; import eu.cloudnetservice.driver.service.ServiceRemoteInclusion; @@ -51,7 +49,6 @@ import java.util.Objects; import java.util.Set; import java.util.regex.Pattern; -import java.util.stream.Collectors; import java.util.stream.Stream; import lombok.NonNull; import org.incendo.cloud.annotation.specifier.Greedy; @@ -203,44 +200,32 @@ public void copyService( @Nullable @Flag("includes") @Quoted String includes, @Flag("case-sensitive") boolean caseSensitive ) { - // associate all services with a template - Collection> targets = services.stream() - .map(service -> { - if (template != null) { - return new Tuple2<>(service.provider(), template); - } else { - // find a matching template - return service.configuration().templates().stream() - .filter(st -> st.prefix().equalsIgnoreCase(service.serviceId().taskName())) - .filter(st -> st.name().equalsIgnoreCase("default")) - .map(st -> new Tuple2<>(service.provider(), st)) - .findFirst() - .orElse(null); - } - }) - .collect(Collectors.toSet()); - // check if we found a result - if (targets.isEmpty()) { - source.sendMessage(I18n.trans("command-service-copy-no-default-template")); - return; + var service = services.iterator().next(); + var serviceProvider = service.provider(); + if (template == null) { + template = serviceProvider.installedTemplates().stream() + .filter(st -> st.prefix().equalsIgnoreCase(service.serviceId().taskName())) + .filter(st -> st.name().equalsIgnoreCase("default")) + .findFirst() + .orElse(null); + + if (template == null) { + source.sendMessage(I18n.trans("command-service-copy-no-default-template", service.serviceId().name())); + return; + } } + // split on a semicolon and try to fix the patterns the user entered var parsedExcludes = parseDeploymentPatterns(excludes, caseSensitive); var parsedIncludes = parseDeploymentPatterns(includes, caseSensitive); - for (var target : targets) { - target.first().addServiceDeployment(ServiceDeployment.builder() - .template(target.second()) - .excludes(parsedExcludes) - .includes(parsedIncludes) - .withDefaultExclusions() - .build()); - target.first().removeAndExecuteDeployments(); - // send a message for each service we did copy the template of - //noinspection ConstantConditions - source.sendMessage(I18n.trans("command-service-copy-success", - target.first().serviceInfo().name(), - target.second().toString())); - } + serviceProvider.addServiceDeployment(ServiceDeployment.builder() + .template(template) + .excludes(parsedExcludes) + .includes(parsedIncludes) + .withDefaultExclusions() + .build()); + serviceProvider.removeAndExecuteDeployments(); + source.sendMessage(I18n.trans("command-service-copy-success", service.serviceId().name(), template)); } @Command("service|ser delete|del") diff --git a/node/src/main/resources/lang/de_DE.properties b/node/src/main/resources/lang/de_DE.properties index 5218127da1..adf8dc9dc2 100644 --- a/node/src/main/resources/lang/de_DE.properties +++ b/node/src/main/resources/lang/de_DE.properties @@ -175,7 +175,7 @@ command-cluster-start-sync=Die Cluster Synchronisation wird gestartet # Command Service # command-service-description=Verwaltet alle Services in dem Cluster -command-service-copy-no-default-template=Der von Dir angegebene Service hat keine default Template. Benutze "copy {0$name$} template\=storage\:prefix/name" um ein Template anzugeben, in das du kopieren mΓΆchtest +command-service-copy-no-default-template=Der angegebene Service hat kein default Template. Um ein Template anzugeben kann "service {0$name$} copy --template storage\:prefix/name" verwendet werden command-service-copy-success=Der Service {0$name$} wurde erfolgreich in das Template {1$template$} kopiert command-service-add-deployment-success=Das Deployment {0$deployment$} wurde erfolgreich zu der Warteschlange hinzugefΓΌgt command-service-deploy-deployment-success=Die Ressourcen des Services wurden erfolgreich deployed diff --git a/node/src/main/resources/lang/en_US.properties b/node/src/main/resources/lang/en_US.properties index a32309620b..1f40c3ee4d 100644 --- a/node/src/main/resources/lang/en_US.properties +++ b/node/src/main/resources/lang/en_US.properties @@ -175,7 +175,7 @@ command-cluster-start-sync=The cluster sync starts now # Command Service # command-service-description=Manages all services in the cluster -command-service-copy-no-default-template=The service you provided does not have a default template, use "copy {0$name$} template=storage:prefix/name" to provide a template you would like to copy to +command-service-copy-no-default-template=The provided service does not have a default template. To specify a template "service {0$name$} copy --template storage:prefix/name" can be used command-service-copy-success=The service {0$name$} was successfully copied to the template {1$template$} command-service-add-deployment-success=The deployment {0$deployment$} was successfully added to the waiting deployments command-service-deploy-deployment-success=The resources of the service were successfully deployed From b38fb78d76faa38a5170d816c40bdacb0ca14552 Mon Sep 17 00:00:00 2001 From: 0utplay Date: Fri, 20 Dec 2024 20:48:48 +0100 Subject: [PATCH 14/16] chore: release version 4.0.0-RC11.2 --- build-extensions/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-extensions/src/main/kotlin/Versions.kt b/build-extensions/src/main/kotlin/Versions.kt index 0b1de19864..b1edf6a5e7 100644 --- a/build-extensions/src/main/kotlin/Versions.kt +++ b/build-extensions/src/main/kotlin/Versions.kt @@ -17,6 +17,6 @@ object Versions { // internal versions - const val cloudNet = "4.0.0-RC12-SNAPSHOT" + const val cloudNet = "4.0.0-RC11.2" const val cloudNetCodeName = "Blizzard" } From 9389d8968d5545603cc95f712ad3838db942f97a Mon Sep 17 00:00:00 2001 From: 0utplay Date: Fri, 20 Dec 2024 20:53:54 +0100 Subject: [PATCH 15/16] chore: prepare for next development iteration --- build-extensions/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-extensions/src/main/kotlin/Versions.kt b/build-extensions/src/main/kotlin/Versions.kt index b1edf6a5e7..0b1de19864 100644 --- a/build-extensions/src/main/kotlin/Versions.kt +++ b/build-extensions/src/main/kotlin/Versions.kt @@ -17,6 +17,6 @@ object Versions { // internal versions - const val cloudNet = "4.0.0-RC11.2" + const val cloudNet = "4.0.0-RC12-SNAPSHOT" const val cloudNetCodeName = "Blizzard" } From 790ec42ed0e706b4387e954dc9478b9a2eeedd94 Mon Sep 17 00:00:00 2001 From: Aldin Date: Tue, 24 Dec 2024 13:55:20 +0100 Subject: [PATCH 16/16] fix: command parsing and executing caused console dead lock (#1565) ### Motivation Executing a lot of commands while e.g. services are starting (printing messages to the console) can lead to dead locks. This issue was probably introduced with the cloud 2.0 migration. Prior to cloud 2.0 the framework used to run suggestions on the caller thread. With cloud 2.0 a shared thread pool for suggestion, parsing and executing can be used. This then leads to dead locks. ### Modification Explicitly set the thread pool for parsing & executing only. Suggestions are processed on the caller thread (thus restoring cloud 1.0 behavior. ### Result No dead-locks of the console. --- checkstyle.xml | 2 ++ .../node/command/defaults/DefaultCommandManager.java | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/checkstyle.xml b/checkstyle.xml index 99ecceb069..30eeafd672 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -36,6 +36,8 @@ + + diff --git a/node/src/main/java/eu/cloudnetservice/node/command/defaults/DefaultCommandManager.java b/node/src/main/java/eu/cloudnetservice/node/command/defaults/DefaultCommandManager.java index f58b23fbc1..7e91128f6d 100644 --- a/node/src/main/java/eu/cloudnetservice/node/command/defaults/DefaultCommandManager.java +++ b/node/src/main/java/eu/cloudnetservice/node/command/defaults/DefaultCommandManager.java @@ -38,8 +38,12 @@ final class DefaultCommandManager extends CommandManager { * a thread pool with 4 threads. */ private DefaultCommandManager() { + var executor = Executors.newFixedThreadPool(4); super( - ExecutionCoordinator.builder().executor(Executors.newFixedThreadPool(4)).build(), + ExecutionCoordinator.builder() + .parsingExecutor(executor) + .executionSchedulingExecutor(executor) + .build(), CommandRegistrationHandler.nullCommandRegistrationHandler()); this.registerCapability(CloudCapability.StandardCapabilities.ROOT_COMMAND_DELETION); }