diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt
index 054756aa..e454f9cf 100644
--- a/doc/LazyVim.txt
+++ b/doc/LazyVim.txt
@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 21
+*LazyVim.txt*             For Neovim            Last change: 2025 September 22
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*
diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index d4eb5f6e..28441c5c 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -71,11 +71,6 @@ return {
       servers = {
         jdtls = {},
       },
-      setup = {
-        jdtls = function()
-          return true -- avoid duplicate servers
-        end,
-      },
     },
   },
 
@@ -150,19 +145,10 @@ return {
       if LazyVim.has("mason.nvim") then
         local mason_registry = require("mason-registry")
         if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
-          local jar_patterns = {
-            vim.fn.expand("$MASON/share/java-debug-adapter/com.microsoft.java.debug.plugin-*.jar"),
-          }
+          bundles = vim.fn.glob("$MASON/share/java-debug-adapter/com.microsoft.java.debug.plugin-*jar", false, true)
           -- java-test also depends on java-debug-adapter.
           if opts.test and mason_registry.is_installed("java-test") then
-            vim.list_extend(jar_patterns, {
-              vim.fn.expand("$MASON/share/java-test/*.jar"),
-            })
-          end
-          for _, jar_pattern in ipairs(jar_patterns) do
-            for _, bundle in ipairs(vim.split(vim.fn.glob(jar_pattern), "\n")) do
-              table.insert(bundles, bundle)
-            end
+            vim.list_extend(bundles, vim.fn.glob("$MASON/share/java-test/*.jar", false, true))
           end
         end
       end