maven.buildMavenPackage: rename from javaPackages.mavenfod

pkgs/development/tools/build-managers/apache-maven/default.nix

@@ -3,6 +3,7 @@
 , fetchurl
 , jdk
 , makeWrapper
+, callPackage
 }:
 
 assert jdk != null;
@@ -34,6 +35,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.buildMavenPackage = callPackage ./build-package.nix {
+    maven = finalAttrs.finalPackage;
+  };
+
   meta = with lib; {
     mainProgram = "mvn";
     description = "Build automation tool (used primarily for Java projects)";

pkgs/top-level/java-packages.nix

@@ -8,7 +8,7 @@ let
   openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { };
   openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { };
 
-  mavenfod = callPackage ../development/java-modules/maven-fod.nix { };
+  mavenfod = pkgs.maven.buildMavenPackage;
 
 in {
   inherit mavenfod openjfx11 openjfx15 openjfx17 openjfx19;