From cd68893c330f05a7960ec55036588e0cf7f392d6 Mon Sep 17 00:00:00 2001 From: Sulkta Date: Sun, 28 Jun 2026 02:33:21 +0000 Subject: [PATCH 1/5] Update dependency org.eclipse.jetty:jetty-server to v9.4.57.v20241219 [SECURITY] --- DynmapCore/build.gradle | 2 +- forge-1.12.2/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle index 7a5f1601..e860eb1b 100644 --- a/DynmapCore/build.gradle +++ b/DynmapCore/build.gradle @@ -13,7 +13,7 @@ sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = co dependencies { implementation project(':DynmapCoreAPI') implementation 'javax.servlet:javax.servlet-api:3.1.0' - implementation'org.eclipse.jetty:jetty-server:9.4.26.v20200117' + implementation'org.eclipse.jetty:jetty-server:9.4.57.v20241219' implementation 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117' implementation 'com.googlecode.json-simple:json-simple:1.1.1' implementation 'org.yaml:snakeyaml:1.23' // DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES diff --git a/forge-1.12.2/build.gradle b/forge-1.12.2/build.gradle index a4755357..1c130a4f 100644 --- a/forge-1.12.2/build.gradle +++ b/forge-1.12.2/build.gradle @@ -25,7 +25,7 @@ eclipse { dependencies { implementation 'javax.servlet:javax.servlet-api:3.1.0' - implementation'org.eclipse.jetty:jetty-server:9.4.26.v20200117' + implementation'org.eclipse.jetty:jetty-server:9.4.57.v20241219' implementation 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117' implementation 'com.googlecode.json-simple:json-simple:1.1.1' implementation 'org.yaml:snakeyaml:1.23' // DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES From d55da4d86e56fc0c8563088779a13556cc54d82a Mon Sep 17 00:00:00 2001 From: Sulkta Date: Sun, 28 Jun 2026 02:33:54 +0000 Subject: [PATCH 2/5] Update dependency org.assertj:assertj-core to v3.27.7 [SECURITY] --- DynmapCore/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle index 7a5f1601..0f8082b1 100644 --- a/DynmapCore/build.gradle +++ b/DynmapCore/build.gradle @@ -29,7 +29,7 @@ dependencies { // Test dependencies (Java 8 compatible versions) testImplementation 'junit:junit:4.13.2' testImplementation 'org.mockito:mockito-core:4.11.0' - testImplementation 'org.assertj:assertj-core:3.24.2' + testImplementation 'org.assertj:assertj-core:3.27.7' } test { From 6ef40ad553868452b3815052d146f362daa8713c Mon Sep 17 00:00:00 2001 From: Sulkta Date: Sun, 28 Jun 2026 06:28:38 +0000 Subject: [PATCH 3/5] Update dependency org.eclipse.jetty:jetty-server to v9.4.58.v20250814 --- DynmapCore/build.gradle | 2 +- forge-1.12.2/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle index e860eb1b..6cf50de6 100644 --- a/DynmapCore/build.gradle +++ b/DynmapCore/build.gradle @@ -13,7 +13,7 @@ sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = co dependencies { implementation project(':DynmapCoreAPI') implementation 'javax.servlet:javax.servlet-api:3.1.0' - implementation'org.eclipse.jetty:jetty-server:9.4.57.v20241219' + implementation'org.eclipse.jetty:jetty-server:9.4.58.v20250814' implementation 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117' implementation 'com.googlecode.json-simple:json-simple:1.1.1' implementation 'org.yaml:snakeyaml:1.23' // DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES diff --git a/forge-1.12.2/build.gradle b/forge-1.12.2/build.gradle index 1c130a4f..b0d66b0a 100644 --- a/forge-1.12.2/build.gradle +++ b/forge-1.12.2/build.gradle @@ -25,7 +25,7 @@ eclipse { dependencies { implementation 'javax.servlet:javax.servlet-api:3.1.0' - implementation'org.eclipse.jetty:jetty-server:9.4.57.v20241219' + implementation'org.eclipse.jetty:jetty-server:9.4.58.v20250814' implementation 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117' implementation 'com.googlecode.json-simple:json-simple:1.1.1' implementation 'org.yaml:snakeyaml:1.23' // DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES From d471a8f9493affad21ec71893f03b8cfd85f5e45 Mon Sep 17 00:00:00 2001 From: Sulkta Date: Sun, 28 Jun 2026 13:52:02 -0700 Subject: [PATCH 4/5] docs: note NeoForge 1.21.1 fork branch in README --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 640ac88b..e1bd7b8a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,13 @@ # Dynmap® - dynamic web maps for Minecraft servers +> **About this fork.** This repository tracks [Dynmap](https://github.com/webbukkit/dynmap) +> with an added **NeoForge 1.21.1** build. The `main` branch mirrors the upstream +> multi-platform project (Spigot/Paper, Forge, Fabric, and the original README below); +> the **`neoforge-1.21.1`** branch holds the standalone NeoForge 1.21.1 port and its own +> build/install instructions. For the canonical project, see +> [webbukkit/dynmap](https://github.com/webbukkit/dynmap). + + # Jump around the README * [How to build](#how-to-build) * [What platforms are supported?](#what-platforms-are-supported) From d37d35a8dc86292bbd571b5a342167f08ef5597a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 29 Jun 2026 06:14:35 +0000 Subject: [PATCH 5/5] Update dependency org.spigotmc:spigot-api --- bukkit-helper-118/build.gradle | 2 +- bukkit-helper-120-2/build.gradle | 2 +- bukkit-helper-120-4/build.gradle | 2 +- bukkit-helper-120-5/build.gradle | 2 +- bukkit-helper-121-11/build.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bukkit-helper-118/build.gradle b/bukkit-helper-118/build.gradle index f7093a23..0e5baa45 100644 --- a/bukkit-helper-118/build.gradle +++ b/bukkit-helper-118/build.gradle @@ -12,6 +12,6 @@ dependencies { implementation project(':bukkit-helper') implementation project(':dynmap-api') implementation project(path: ':DynmapCore', configuration: 'shadow') - compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.18-R0.1-SNAPSHOT' + compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.18-rc3-R0.1-SNAPSHOT' compileOnly group: 'org.spigotmc', name: 'spigot', version:'1.18-R0.1-SNAPSHOT' } diff --git a/bukkit-helper-120-2/build.gradle b/bukkit-helper-120-2/build.gradle index 6cca6f43..5ba3115b 100644 --- a/bukkit-helper-120-2/build.gradle +++ b/bukkit-helper-120-2/build.gradle @@ -12,6 +12,6 @@ dependencies { implementation project(':bukkit-helper') implementation project(':dynmap-api') implementation project(path: ':DynmapCore', configuration: 'shadow') - compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.2-R0.1-SNAPSHOT' + compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.2-experimental-SNAPSHOT' compileOnly group: 'org.spigotmc', name: 'spigot', version:'1.20.2-R0.1-SNAPSHOT' } diff --git a/bukkit-helper-120-4/build.gradle b/bukkit-helper-120-4/build.gradle index 33dc9cf4..3afd340f 100644 --- a/bukkit-helper-120-4/build.gradle +++ b/bukkit-helper-120-4/build.gradle @@ -12,6 +12,6 @@ dependencies { implementation project(':bukkit-helper') implementation project(':dynmap-api') implementation project(path: ':DynmapCore', configuration: 'shadow') - compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.4-R0.1-SNAPSHOT' + compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.4-experimental-SNAPSHOT' compileOnly group: 'org.spigotmc', name: 'spigot', version:'1.20.4-R0.1-SNAPSHOT' } diff --git a/bukkit-helper-120-5/build.gradle b/bukkit-helper-120-5/build.gradle index 15448e08..aa461c3f 100644 --- a/bukkit-helper-120-5/build.gradle +++ b/bukkit-helper-120-5/build.gradle @@ -12,6 +12,6 @@ dependencies { implementation project(':bukkit-helper') implementation project(':dynmap-api') implementation project(path: ':DynmapCore', configuration: 'shadow') - compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.4-R0.1-SNAPSHOT' + compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.20.4-experimental-SNAPSHOT' compileOnly group: 'org.spigotmc', name: 'spigot', version:'1.20.5-R0.1-SNAPSHOT' } diff --git a/bukkit-helper-121-11/build.gradle b/bukkit-helper-121-11/build.gradle index 5a8ccc1f..df6746ce 100644 --- a/bukkit-helper-121-11/build.gradle +++ b/bukkit-helper-121-11/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation project(':bukkit-helper') implementation project(':dynmap-api') implementation project(path: ':DynmapCore', configuration: 'shadow') - compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.21.11-R0.1-SNAPSHOT' + compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'1.21.11-R0.2-SNAPSHOT' compileOnly ('org.spigotmc:spigot:1.21.11-R0.1-SNAPSHOT') { exclude group: "com.mojang", module: "jtracy" }