Fixup

6 files changed, 164 insertions, 138 deletions

diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index 499a48b22281..9449e3e17b15 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -4,10 +4,12 @@
 with builtins;
 with lib;
 
-stdenv.mkDerivation rec {
+let
+  mavenMinimal = import ./maven-minimal.nix { inherit pkgs lib stdenv maven; };
+in stdenv.mkDerivation rec {
   inherit mavenDeps src name meta m2Path;
 
-  flatDeps = unique (flatten (mavenDeps ++ pkgs.javaPackages.mavenPlugins.mavenMinimal));
+  flatDeps = unique (flatten (mavenDeps ++ mavenMinimal.mavenMinimal));
 
   propagatedBuildInput = [ maven ] ++ flatDeps;
 
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
new file mode 100644
index 000000000000..e97a97b69ea6
--- /dev/null
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -0,0 +1,138 @@
+{ stdenv, pkgs, lib, maven }:
+
+with pkgs.javaPackages;
+
+let
+  fetchMaven = pkgs.callPackage ./m2install.nix { };
+  poms = import ./poms.nix { inherit fetchMaven; };
+  plugins = import ./mavenPlugins.nix { inherit stdenv lib pkgs maven; };
+in rec {
+# "Minimal"
+  mavenMinimal = lib.flatten
+    (with plugins; [
+    classworlds_1_1
+    commonsCli_1_0
+    findbugsJsr305_2_0_1
+    junit_3_8_1
+    mavenArchiver_2_5
+    mavenArtifact_2_0_6
+    mavenArtifact_2_0_9
+    mavenArtifactManager_2_0_6
+    mavenArtifactManager_2_0_9
+    mavenArtifactManager_2_2_1
+    mavenClean_2_5
+    mavenCompiler_3_1
+    mavenCore_2_0_6
+    mavenCore_2_0_9
+    mavenCore_2_2_1
+    mavenDoxiaSinkApi_1_0_alpha7
+    mavenErrorDiagnostics_2_0_6
+    mavenErrorDiagnostics_2_0_9
+    mavenErrorDiagnostics_2_2_1
+    mavenFiltering_1_1
+    mavenInstall_2_4
+    mavenJar_2_4
+    mavenModel_2_0_6
+    mavenModel_2_0_9
+    mavenModel_2_2_1
+    mavenMonitor_2_0_6
+    mavenMonitor_2_0_9
+    mavenMonitor_2_2_1
+    mavenPluginDescriptor_2_0_6
+    mavenPluginDescriptor_2_0_9
+    mavenPluginDescriptor_2_2_1
+    mavenPluginParameterDocumenter_2_0_6
+    mavenPluginParameterDocumenter_2_0_9
+    mavenPluginParameterDocumenter_2_2_1
+    mavenProfile_2_0_6
+    mavenProfile_2_0_9
+    mavenProfile_2_2_1
+    mavenProject_2_0_6
+    mavenProject_2_0_9
+    mavenPluginAnnotations_3_1
+    mavenPluginApi_2_0_6
+    mavenPluginApi_2_0_9
+    mavenPluginApi_2_2_1
+    mavenPluginRegistry_2_0_6
+    mavenPluginRegistry_2_0_9
+    mavenPluginRegistry_2_2_1
+    mavenReportingApi_2_0_6
+    mavenReportingApi_2_0_9
+    mavenRepositoryMetadata_2_0_6
+    mavenRepositoryMetadata_2_0_9
+    mavenRepositoryMetadata_2_2_1
+    mavenResources_2_6
+    mavenSettings_2_0_6
+    mavenSettings_2_0_9
+    mavenSettings_2_2_1
+    mavenSharedIncremental_1_1
+    mavenSharedUtils_0_1
+    mavenSurefire_2_12_4
+    mavenSurefireApi_2_12_4
+    mavenSurefireBooter_2_12_4
+    mavenSurefireCommon_2_12_4
+    mavenToolchain_1_0
+    mavenToolchain_2_0_9
+    plexusBuildApi_0_0_4
+    plexusCompilerApi_2_2
+    plexusContainerDefault_1_0_alpha9_stable1
+    plexusInteractivityApi_1_0_alpha4
+    plexusInterpolation_1_13
+    plexusUtils_1_5_1
+    plexusUtils_2_0_5
+    plexusUtils_3_0
+    ])
+    ++
+    (with
+    poms;
+    [
+    apache_3
+    apache_4
+    apache_5
+    apache_6
+    apache_9
+    apache_10
+    apache_11
+    apache_13
+    doxia_1_0_alpha7
+    maven_2_0_6
+    maven_2_0_9
+    maven_2_2_1
+    mavenParent_5
+    mavenParent_8
+    mavenParent_11
+    mavenParent_13
+    mavenParent_21
+    mavenParent_22
+    mavenParent_23
+    mavenPlugins_22
+    mavenPlugins_23
+    mavenPlugins_24
+    mavenPluginTools_3_1
+    mavenReporting_2_0_6
+    mavenReporting_2_0_9
+    mavenSharedComponents_12
+    mavenSharedComponents_17
+    mavenSharedComponents_18
+    mavenSharedComponents_19
+    plexus_1_0_4
+    plexus_1_0_11
+    plexus_2_0_3
+    plexus_2_0_6
+    plexus_2_0_7
+    plexus_3_3_1
+    plexusCompiler_2_2
+    plexusComponents_1_1_15
+    plexusComponents_1_3_1
+    plexusComponentAnnotations_1_5_5
+    plexusContainers_1_0_3
+    plexusContainers_1_5_5
+    sonatypeForgeParent_3
+    sonatypeForgeParent_5
+    sonatypeForgeParent_10
+    sonatypeSpiceParent_10
+    sonatypeSpiceParent_16
+    sonatypeSpiceParent_17
+    surefire_2_12_4
+    ]);
+}
diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix
index da7d52242a3b..c00d0a4f9a21 100644
--- a/pkgs/development/java-modules/maven/plugin-annotations.nix
+++ b/pkgs/development/java-modules/maven/plugin-annotations.nix
@@ -1,7 +1,7 @@
 { fetchMaven }:
 
 rec {
-  mavenPluginAnnotations = map (obj: fetchMaven {
+  mavenPluginAnnotations_3_1 = map (obj: fetchMaven {
     version = "3.1";
     baseName = "maven-plugin-annotations";
     package = "/org/apache/maven/plugin-tools";
diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix
index b696beae4c46..550490a32b1b 100644
--- a/pkgs/development/java-modules/maven/surefire-api.nix
+++ b/pkgs/development/java-modules/maven/surefire-api.nix
@@ -1,9 +1,9 @@
 { fetchMaven }:
 
 rec {
-  mavenSurefireBooter_2_12_4 = map (obj: fetchMaven {
+  mavenSurefireApi_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "maven-surefire-booter";
+    baseName = "maven-surefire-api";
     package = "/org/apache/maven/surefire";
     sha512 = obj.sha512;
     type = obj.type;
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix
index 15be1594117f..7c564037108a 100644
--- a/pkgs/development/java-modules/mavenPlugins.nix
+++ b/pkgs/development/java-modules/mavenPlugins.nix
@@ -1,142 +1,12 @@
-{ pkgs, stdenv, lib, maven, fetchurl }:
+{ pkgs, stdenv, lib, maven }:
 
+with pkgs;
 with pkgs.javaPackages;
 
 let
-  mavenbuild = pkgs.callPackage ./build-maven-package.nix { };
   fetchMaven = pkgs.callPackage ./m2install.nix { };
-  poms = import ./poms.nix { inherit fetchMaven; };
 in rec {
-  inherit mavenbuild fetchMaven poms;
-
-  # "Minimal"
-  mavenMinimal = lib.flatten
-[
-classworlds_1_1
-commonsCli_1_0
-findbugsJsr305_2_0_1
-junit_3_8_1
-mavenArchiver_2_5
-mavenArtifact_2_0_6
-mavenArtifact_2_0_9
-mavenArtifactManager_2_0_6
-mavenArtifactManager_2_0_9
-mavenArtifactManager_2_2_1
-mavenClean_2_5
-mavenCompiler_3_1
-mavenCore_2_0_6
-mavenCore_2_0_9
-mavenCore_2_2_1
-mavenDoxiaSinkApi_1_0_alpha7
-mavenErrorDiagnostics_2_0_6
-mavenErrorDiagnostics_2_0_9
-mavenErrorDiagnostics_2_2_1
-mavenFiltering_1_1
-mavenInstall_2_4
-mavenJar_2_4
-mavenModel_2_0_6
-mavenModel_2_0_9
-mavenModel_2_2_1
-mavenMonitor_2_0_6
-mavenMonitor_2_0_9
-mavenMonitor_2_2_1
-mavenPluginDescriptor_2_0_6
-mavenPluginDescriptor_2_0_9
-mavenPluginDescriptor_2_2_1
-mavenPluginParameterDocumenter_2_0_6
-mavenPluginParameterDocumenter_2_0_9
-mavenPluginParameterDocumenter_2_2_1
-mavenProfile_2_0_6
-mavenProfile_2_0_9
-mavenProfile_2_2_1
-mavenProject_2_0_6
-mavenProject_2_0_9
-mavenPluginAnnotations_3_1
-mavenPluginApi_2_0_6
-mavenPluginApi_2_0_9
-mavenPluginApi_2_2_1
-mavenPluginRegistry_2_0_6
-mavenPluginRegistry_2_0_9
-mavenPluginRegistry_2_2_1
-mavenReportingApi_2_0_6
-mavenReportingApi_2_0_9
-mavenRepositoryMetadata_2_0_6
-mavenRepositoryMetadata_2_0_9
-mavenRepositoryMetadata_2_2_1
-mavenResources_2_6
-mavenSettings_2_0_6
-mavenSettings_2_0_9
-mavenSettings_2_2_1
-mavenSharedIncremental_1_1
-mavenSharedUtils_0_1
-mavenSurefire_2_12_4
-mavenSurefireApi_2_12_4
-mavenSurefireBooter_2_12_4
-mavenSurefireCommon_2_12_4
-mavenToolchain_1_0
-mavenToolchain_2_0_9
-plexusBuildApi_0_0_4
-plexusCompilerApi_2_2
-plexusContainerDefault_1_0_alpha9_stable1
-plexusInteractivityApi_1_0_alpha4
-plexusInterpolation_1_13
-plexusUtils_1_5_1
-plexusUtils_2_0_5
-plexusUtils_3_0
-]
-++
-(with
-poms;
-[
-apache_3
-apache_4
-apache_5
-apache_6
-apache_9
-apache_10
-apache_11
-apache_13
-doxia_1_0_alpha7
-maven_2_0_6
-maven_2_0_9
-maven_2_2_1
-mavenParent_5
-mavenParent_8
-mavenParent_11
-mavenParent_13
-mavenParent_21
-mavenParent_22
-mavenParent_23
-mavenPlugins_22
-mavenPlugins_23
-mavenPlugins_24
-mavenPluginTools_3_1
-mavenReporting_2_0_6
-mavenReporting_2_0_9
-mavenSharedComponents_12
-mavenSharedComponents_17
-mavenSharedComponents_18
-mavenSharedComponents_19
-plexus_1_0_4
-plexus_1_0_11
-plexus_2_0_3
-plexus_2_0_6
-plexus_2_0_7
-plexus_3_3_1
-plexusCompiler_2_2
-plexusComponents_1_1_15
-plexusComponents_1_3_1
-plexusComponentAnnotations_1_5_5
-plexusContainers_1_0_3
-plexusContainers_1_5_5
-sonatypeForgeParent_3
-sonatypeForgeParent_5
-sonatypeForgeParent_10
-sonatypeSpiceParent_10
-sonatypeSpiceParent_16
-sonatypeSpiceParent_17
-surefire_2_12_4
-]);
+  inherit fetchMaven;
 
   animalSniffer_1_11 = map (obj: fetchMaven {
     version = "1.11";
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index 3e5ef87223f6..18944e27a865 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -193,6 +193,22 @@ rec {
     type = "pom";
   };
 
+  mavenParent_11 = fetchMaven {
+    version = "11";
+    baseName = "maven-parent";
+    package = "/org/apache/maven";
+    sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp";
+    type = "pom";
+  };
+
+  mavenParent_13 = fetchMaven {
+    version = "13";
+    baseName = "maven-parent";
+    package = "/org/apache/maven";
+    sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp";
+    type = "pom";
+  };
+
   mavenParent_15 = fetchMaven {
     version = "15";
     baseName = "maven-parent";