Create mavenLibs

3 files changed, 86 insertions, 47 deletions

diff --git a/pkgs/development/java-modules/collections.nix b/pkgs/development/java-modules/collections.nix
new file mode 100644
index 000000000000..39b274b5030a
--- /dev/null
+++ b/pkgs/development/java-modules/collections.nix
@@ -0,0 +1,77 @@
+{ pkgs }:
+
+with pkgs.javaPackages;
+
+rec {
+  mavenLibs_2_0_1 = [
+    mavenArtifact_2_0_1
+    mavenArtifactManager_2_0_1
+    mavenCore_2_0_1
+    mavenErrorDiagnostics_2_0_1
+    mavenModel_2_0_1
+    mavenMonitor_2_0_1
+    mavenPluginApi_2_0_1
+    mavenPluginDescriptor_2_0_1
+    mavenPluginParameterDocumenter_2_0_1
+    mavenPluginRegistry_2_0_1
+    mavenProfile_2_0_1
+    mavenProject_2_0_1
+    mavenReportingApi_2_0_1
+    mavenRepositoryMetadata_2_0_1
+    mavenSettings_2_0_1
+  ];
+
+  mavenLibs_2_0_6 = [
+    mavenArtifact_2_0_6
+    mavenArtifactManager_2_0_6
+    mavenCore_2_0_6
+    mavenErrorDiagnostics_2_0_6
+    mavenModel_2_0_6
+    mavenMonitor_2_0_6
+    mavenPluginApi_2_0_6
+    mavenPluginDescriptor_2_0_6
+    mavenPluginParameterDocumenter_2_0_6
+    mavenPluginRegistry_2_0_6
+    mavenProfile_2_0_6
+    mavenProject_2_0_6
+    mavenReportingApi_2_0_6
+    mavenRepositoryMetadata_2_0_6
+    mavenSettings_2_0_6
+  ];
+
+  mavenLibs_2_0_9 = [
+    mavenArtifact_2_0_9
+    mavenArtifactManager_2_0_9
+    mavenCore_2_0_9
+    mavenErrorDiagnostics_2_0_9
+    mavenModel_2_0_9
+    mavenMonitor_2_0_9
+    mavenPluginApi_2_0_9
+    mavenPluginDescriptor_2_0_9
+    mavenPluginParameterDocumenter_2_0_9
+    mavenPluginRegistry_2_0_9
+    mavenProfile_2_0_9
+    mavenProject_2_0_9
+    mavenReportingApi_2_0_9
+    mavenRepositoryMetadata_2_0_9
+    mavenSettings_2_0_9
+  ];
+
+  mavenLibs_2_2_1 = [
+    mavenArtifact_2_2_1
+    mavenArtifactManager_2_2_1
+    mavenCore_2_2_1
+    mavenErrorDiagnostics_2_2_1
+    mavenModel_2_2_1
+    mavenMonitor_2_2_1
+    mavenPluginApi_2_2_1
+    mavenPluginDescriptor_2_2_1
+    mavenPluginParameterDocumenter_2_2_1
+    mavenPluginRegistry_2_2_1
+    mavenProfile_2_2_1
+    mavenProject_2_2_1
+    mavenReportingApi_2_2_1
+    mavenRepositoryMetadata_2_2_1
+    mavenSettings_2_2_1
+  ];
+}
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index 84ccef3975d2..2f315fa3161f 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -4,6 +4,7 @@ with pkgs.javaPackages;
 
 let
   poms = import (../poms.nix) { inherit fetchMaven; };
+  collections = import (../collections.nix) { inherit pkgs; };
 in rec {
   junitGen = { mavenDeps, sha512, version }: mavenbuild rec {
     inherit mavenDeps sha512 version;
@@ -51,7 +52,8 @@ in rec {
 
   junit_4_12 = junitGen {
     mavenDeps = (with mavenPlugins; [ animalSniffer_1_11 mavenEnforcer_1_3_1 mavenReplacer_1_5_3 mavenSurefire_2_17 ])
-                  ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsCli_1_2 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_2_0_1 mavenArtifact_2_0_8 mavenArtifact_3_0_3 mavenArtifactManager_2_0_1 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenCore_2_0_1 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha6 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenErrorDiagnostics_2_0_1 mavenModel_2_0_1 mavenModel_3_0_3 mavenMonitor_2_0_1 mavenPluginApi_2_0_1 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenPluginDescriptor_2_0_1 mavenPluginParameterDocumenter_2_0_1 mavenPluginRegistry_2_0_1 mavenPluginTestingHarness_1_1 mavenProfile_2_0_1 mavenProject_2_0_1 mavenProject_2_0_8 mavenReportingApi_2_0_1 mavenReportingApi_2_2_1 mavenRepositoryMetadata_2_0_1 mavenSettings_2_0_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 mojoJavaBootClasspathDetector_1_11 ow2AsmAll_4_0 plexusArchiver_1_0_alpha7 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_0_5 plexusUtils_1_1 plexusUtils_1_4_9 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ]
+                  ++ collections.mavenLibs_2_0_1
+                  ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsCli_1_2 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_2_0_8 mavenArtifact_3_0_3 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha6 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenModel_3_0_3 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenPluginTestingHarness_1_1 mavenProject_2_0_8 mavenReportingApi_2_2_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 mojoJavaBootClasspathDetector_1_11 ow2AsmAll_4_0 plexusArchiver_1_0_alpha7 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_0_5 plexusUtils_1_1 plexusUtils_1_4_9 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ]
                   ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 antParent_1_8_2 apache_1 apache_7 asmParent_4_0 beanshell_2_0_b4 codehausParent_4 commonsParent_11 commonsParent_17 doxia_1_0_alpha6 doxia_1_0_alpha10 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_1 maven_2_0_8 maven_3_0_3 mavenParent_6 mavenParent_15 mavenPluginTools_3_2 mavenReporting_2_0_1 mavenReporting_2_2_1 mavenSharedComponents_7 mavenSharedComponents_11 mojoParent_32 ow2_1_3 plexus_1_0_12 plexusComponents_1_1_4 plexusComponents_1_1_6 sisuInjectGuiceBean_2_1_1 sisuInject_2_1_1 sisuInjectGuicePlexus_2_1_1 sisuParent_2_1_1 sonatypeForgeParent_7 sonatypeParent_7 surefire_2_17 ]);
     sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9";
     version = "4.12";
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index 359060c8dae2..df87f51768df 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -4,13 +4,17 @@ with stdenv.lib;
 with pkgs.javaPackages;
 
 let
+  collections = import ./collections.nix { inherit pkgs; };
   fetchMaven = pkgs.callPackage ./m2install.nix { };
-  poms = import ./poms.nix { inherit fetchMaven; };
   plugins = import ./mavenPlugins.nix { inherit stdenv pkgs maven; };
+  poms = import ./poms.nix { inherit fetchMaven; };
 in rec {
   # Maven needs all of these to function
   mavenMinimal = flatten
-    [
+    collections.mavenLibs_2_0_6
+    ++ collections.mavenLibs_2_0_9
+    ++ collections.mavenLibs_2_2_1
+    ++ [
       classworlds_1_1_alpha2
       classworlds_1_1
       commonsCli_1_0
@@ -23,54 +27,10 @@ in rec {
       junit_3_8_2
       log4j_1_2_12
       mavenArchiver_2_5
-      mavenArtifact_2_0_6
-      mavenArtifact_2_0_9
-      mavenArtifact_2_2_1
-      mavenArtifactManager_2_0_6
-      mavenArtifactManager_2_0_9
-      mavenArtifactManager_2_2_1
       mavenCommonArtifactFilters_1_3
-      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
-      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
-      mavenProject_2_2_1
       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
-      mavenSettings_2_0_6
-      mavenSettings_2_0_9
-      mavenSettings_2_2_1
       mavenSharedIncremental_1_1
       mavenSharedUtils_0_1
       mavenSurefireApi_2_12_4