Complete hello world with test

29 files changed, 451 insertions, 15 deletions

diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix
index 74087a04e0c..ffad5632b0a 100644
--- a/pkgs/development/java-modules/apache/commons-cli.nix
+++ b/pkgs/development/java-modules/apache/commons-cli.nix
@@ -11,4 +11,15 @@ rec {
     { type = "pom"; sha512 = "1pm5ba95viabcgpjhsqw21iwis9ajn8hwpyc6rzs9frr5k62hs7lj8darxmmp21hf14mxrs37a8swayhagq6i6g8js4nl4r8mmwjlvp"; }
     { type = "jar"; sha512 = "0ybdbpfzadkncwcmnzkscbp2fhmcsqmpy60qppz7s8hs00hgqy64jr4qpdyz5bj0l4bc434vn0pv4gzxzi7y1lhh7b2rk4zv1mgs3ff"; }
   ];
+
+  commonsCli_1_2 = map (obj: fetchMaven {
+    version = "1.2";
+    baseName = "commons-cli";
+    package = "/commons-cli";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "3lrjnrkq0vq1mjp1z6zbi6x0x45hj20yvs74aqnpzayd0prwv22hyfyadgrj343is54s6m2p5mx2kpziqz9wcih5hmwg5f80ni8mxp7"; }
+    { type = "jar"; sha512 = "2mdzpng0cybpnw5dw1q4dmpn2i89zhg13m8xjv8pdbn5q28zsf8m3m7w0y8irbjyplwrfdrxipkxxvnz5f61bxi4s85hnm0sc84d3qb"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index 10dabadb50c..d83b43ffd75 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -1,5 +1,5 @@
 { stdenv, maven, pkgs }:
-{ mavenDeps, src, name, meta, m2Path, skipTests ? true, ... }:
+{ mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }:
 
 with builtins;
 with stdenv.lib;
@@ -13,8 +13,8 @@ in stdenv.mkDerivation rec {
 
   propagatedBuildInput = [ maven ] ++ flatDeps;
 
-  find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}'';
-  copy = ''cp -rs ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2'';
+  find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}'';
+  copy = ''cp -rsfu ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2'';
 
   phases = [ "unpackPhase" "buildPhase" ];
 
@@ -23,10 +23,12 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/m2/${m2Path}
     ${optionalString (length flatDeps > 0) find}
     ${optionalString (length flatDeps > 0) copy}
+    if [ -f $out/m2/settings.xml ]; then rm $out/m2/settings.xml; fi
     echo "<settings><mirrors>\
-        <mirror><id>tmpm2</id><url>file://$out/m2</url><mirrorOf>*</mirrorOf></mirror></mirrors>\
-        <localRepository>$out/m2</localRepository></settings>" >> $out/m2/settings.xml
-    ${maven}/bin/mvn clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
+      <mirror><id>tmpm2</id><url>file://$out/m2</url><mirrorOf>*</mirrorOf></mirror></mirrors>\
+      <localRepository>$out/m2/</localRepository></settings>" >> $out/m2/settings.xml
+    ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
+    cp ./target/*.jar $out/m2/${m2Path}
     cp -v ./target/*.jar $out/target/
   '';
 }
diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/pkgs/development/java-modules/hamcrest/all.nix
new file mode 100644
index 00000000000..2bba1ac9249
--- /dev/null
+++ b/pkgs/development/java-modules/hamcrest/all.nix
@@ -0,0 +1,15 @@
+{ fetchMaven }:
+
+rec {
+  hamcrestAll_1_3 = map (obj: fetchMaven {
+    version = "1.3";
+    baseName = "hamcrest-all";
+    package = "/org/hamcrest";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3pmh19hhwr2vcvj3wqx0m8gipilny4ap9gax1xpks4k5pwykh74w0x9iwpns7cl8r7kqd6rbq4khhc0shcmfh6gydr8ax201wc7lvb8"; }
+    { type = "pom"; sha512 = "1w0byl3qy1gq2d8r66fzpffalc7pqm82iz5k3bqcxhclb60ifadmsxi1icqdhfpa29gvr5p1j5723zqpr11dk9w3p16njxc0arqxp2h"; }
+  ];
+}
+
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index 5418679b78f..84ccef3975d 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -51,8 +51,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 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_3_0_3 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenModel_3_0_3 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenProject_2_0_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_1 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 beanshell_2_0_b4 codehausParent_4 commonsParent_17 doxia_1_0_alpha10 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_1 maven_3_0_3 mavenParent_6 mavenParent_15 mavenPluginTools_3_2 mavenSharedComponents_11 mojoParent_32 plexus_1_0_12 plexusComponents_1_1_4 sisuInjectGuiceBean_2_1_1 sisuInject_2_1_1 sisuInjectGuicePlexus_2_1_1 sisuParent_2_1_1 sonatypeForgeParent_7 sonatypeParent_7 surefire_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 ]
+                  ++ (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-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix
index a1a6cfce6b4..1ac023ec534 100644
--- a/pkgs/development/java-modules/maven-hello/default.nix
+++ b/pkgs/development/java-modules/maven-hello/default.nix
@@ -2,9 +2,11 @@
 
 with pkgs.javaPackages;
 
-rec {
-  mavenHelloRec = { mavenDeps, sha512, version, skipTests }: mavenbuild rec {
-    inherit mavenDeps sha512 version skipTests;
+let
+  poms = import ../poms.nix { inherit fetchMaven; };
+in rec {
+  mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild rec {
+    inherit mavenDeps sha512 version skipTests quiet;
 
     name = "maven-hello-${version}";
     src = pkgs.fetchFromGitHub {
@@ -32,9 +34,10 @@ rec {
   };
 
   mavenHello_1_1 = mavenHelloRec {
-    mavenDeps = [ junit_4_12 ];
-    sha512 = "3dhgl5z3nzqskjjcggrjyz37r20b0m5vhfzbx382qyqcy4d2jdhkl7v1ajhcg8vkz0qdzq85k09w5is81hybv8sd09h3hgb3rrigdaq";
+    mavenDeps = [ junit_4_12 mavenSurefireJunit4_2_12_4 hamcrestCore_1_3 ] ++ (with poms; [ surefireProviders_2_12_4 ]);
+    sha512 = "2f13592blvfgwad61174fza99ncb5jlch4sjjindk1pcaixqw26fnjfxb4ck80cknkihvcsylhviyfvhpm1ivvpg0zkicxva37cr4ri";
     version = "1.1";
     skipTests = false;
+    quiet = false;
   };
 }
diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix
index 031bd37eb6f..6d7e0caadfd 100644
--- a/pkgs/development/java-modules/maven/artifact-manager.nix
+++ b/pkgs/development/java-modules/maven/artifact-manager.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenArtifactManager_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-artifact-manager";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0xciyvsl2l6fnd5k5dbhz5iih66fgacdagcrflk6cfiiv3qng5zrhx61v9fbjr0fpxbj7rswkczv7vn46359nlkb80513jwhzs8gqwv"; }
+    { type = "pom"; sha512 = "1j20ygljm0qa10ryw72j9q4jlwnsjdrcdg08a10ar456zi8gxzszp5cd0xsp0j29q69bp3wck2ggfr028v0zxivxgvakm4fa6l33sya"; }
+  ];
+
   mavenArtifactManager_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-artifact-manager";
diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix
index 1cbb347baf4..224570f910f 100644
--- a/pkgs/development/java-modules/maven/artifact.nix
+++ b/pkgs/development/java-modules/maven/artifact.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenArtifact_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-artifact";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3xmim81k0p3l7fpgr8xlbj3mcz83d1rw3nwzdlrnwh3nkc5xryxl8fx499351vjlmjs009bhd68a20v59y3flxz8hxiy07cijgcbqnx"; }
+    { type = "pom"; sha512 = "30y2mirgqvdm3gdalxkzjljswh9xhygsw6v2jfrd9y61wqng2hzyn7dawkn5q4cyiknmw1b9660pvbnysvh3rbic75lhw5xqqgdjmih"; }
+  ];
+
   mavenArtifact_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-artifact";
@@ -12,6 +23,17 @@ rec {
     { type = "pom"; sha512 = "37kvfxcpfajjn9lmvh5kay4y61ri1190hxxgiil8fqfvmvcm02jcqzfi4ry0nzc80g5fsarsd3s2ns2d8l0lnqjp28nn51dixm9a55w"; }
   ];
 
+  mavenArtifact_2_0_8 = map (obj: fetchMaven {
+    version = "2.0.8";
+    baseName = "maven-artifact";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0i2xd2fkvp5glb7yx8zhh96px4v2yq0bgxa6xxcy6if0sn8c3vps8jmd1z3ys27jzj1gvwgg4rpa17k0nk1c8szz1v7vwvyhp7s22pi"; }
+    { type = "pom"; sha512 = "37563kfswgk9yfzm46vk4nr44rncdd3y705vgg20lj4nsrqn7iwg55fx1a4f039gbaf8dzb6xwp0ypyspsx9q742wkwrsr5q41d99v7"; }
+  ];
+
   mavenArtifact_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-artifact";
diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix
index d135bd28657..ed3313bba59 100644
--- a/pkgs/development/java-modules/maven/core.nix
+++ b/pkgs/development/java-modules/maven/core.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenCore_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-core";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "1iv0bg9z6zmlihxnynccdq0ivgk0bdi2vk863ii59qqnqp9wqcswx0bc60hyfasjm4d8m30b60www56v6y05mjjbpir4mmrjdbxw9gd"; }
+    { type = "jar"; sha512 = "04hrkgcpvxdisdgcp1mslkylm0b461mp42mylwpm6xdi9lcfdbd97k2rybvwgxd0y9r9j72ahm4fsqjb53xlz4737w96cmynpr8mrz4"; }
+  ];
+
   mavenCore_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-core";
diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix
index 7454f7bbc96..18ccf4b707a 100644
--- a/pkgs/development/java-modules/maven/doxia-sink-api.nix
+++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven {
+    version = "1.0-alpha-6";
+    baseName = "doxia-sink-api";
+    package = "/org/apache/maven/doxia";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "156j8ic3m2j23nrh074j567qxcsqi8ahpl97ba68l88cq08al1z7mh72hm8jz24lq04kxkrf3r1icqbpki10jgv7qma0cpz86yw27x2"; }
+    { type = "jar"; sha512 = "12yqdygds5w4dx8zxq4ss65a28pqrhavzzmgi3n7473r1k5r3kiw5h5bm71zdhccv5lgb4lb9p9lswa2pjkwriykfm3fj0l3924x6dk"; }
+  ];
+
   mavenDoxiaSinkApi_1_0_alpha7 = map (obj: fetchMaven {
     version = "1.0-alpha-7";
     baseName = "doxia-sink-api";
diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix
index 8f3cd0a4485..6f22316edc7 100644
--- a/pkgs/development/java-modules/maven/error-diagnostics.nix
+++ b/pkgs/development/java-modules/maven/error-diagnostics.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-error-diagnostics";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2jva1b8myaxy6y56rkqh8lynj36rj1apsgasc8i9qrigrw2wjk9yhsywv2ylmbspva1aypn23di7bd5bfb7vhaxhlqrlakdx5pqv7kh"; }
+    { type = "pom"; sha512 = "250x4ajr37nlch6n502ggfmr558hvhdxfgwjr28svvbxlyhk73h2nz9r95gvkfymv32dml8j1d4cgy3zs3qy2wzb679pnyckjwpdq9z"; }
+  ];
+
   mavenErrorDiagnostics_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-error-diagnostics";
diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix
index 41b2458550d..70bfd34e737 100644
--- a/pkgs/development/java-modules/maven/model.nix
+++ b/pkgs/development/java-modules/maven/model.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenModel_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-model";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2y6dqd0xlkkmff5gwfnc5pk0w6zpircj7mrvfw2nwvsaxx9cw3fkn33m3bamzyz1zv5w1vlrlrnynifvm3mzfrgkl3dxa16p00yj5wp"; }
+    { type = "pom"; sha512 = "0mnjzcansaxakip9b2nq7pxl2nbf9033if8bap658q9i9fbm8b6djqs09frmdds1vns44vlirvmm94s2k7i1lswmsqjgv3p12lrvbb1"; }
+  ];
+
   mavenModel_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-model";
diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix
index 699d34bbf93..0a71d7ba5a4 100644
--- a/pkgs/development/java-modules/maven/monitor.nix
+++ b/pkgs/development/java-modules/maven/monitor.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenMonitor_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-monitor";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1jp0kf3hyvk3x25fnxb9qi1yxs4lk1bpc9r76fvkggm7xhda4k2cr4ql37py5qh08c67bixyl4qiqsvlzv41jqnkxrxr85z2962fy8m"; }
+    { type = "pom"; sha512 = "3i0fzz4lb6lckvnv61bxcb26cw5cd3ibyirzlh0nnaig80rykf1v0bvr2ll0xpz2ss25b3j320kpwncsir2qmlfi51vh6ms3zm7p1ik"; }
+  ];
+
   mavenMonitor_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-monitor";
diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix
index b06b83a8e94..e4d8fbec39b 100644
--- a/pkgs/development/java-modules/maven/plugin-api.nix
+++ b/pkgs/development/java-modules/maven/plugin-api.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenPluginApi_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-plugin-api";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "0fvx3mhmpr03cgyy3rx6ysdpvya6zs77yvjki1s9qfd3axzbnh2xl4w2d389rpx2vmqqx3a1lr8nj2yphm5r1wz3sb7v9rnba6jrfcr"; }
+    { type = "jar"; sha512 = "1fwfw7smywavmafbdma7xla07vaaihkg9md1v16ckp6xpbdxpsknb7s07dnx5jx757gd0gp5ak7mawg0a5sfrvjh955ynikhzjq13lz"; }
+  ];
+
   mavenPluginApi_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-plugin-api";
diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix
index 0a60032125c..76f1bf5de1b 100644
--- a/pkgs/development/java-modules/maven/plugin-descriptor.nix
+++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-plugin-descriptor";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2gwjmn4xnxh2hy9nnlr107q1fpnyy2yhkajvj2snpl1xmpn76m1vvj64zf52l9grpvpx91b0pvd8pxa8hzmh8kqdf1w3wqjg5k1p4zf"; }
+    { type = "pom"; sha512 = "0g9hl6i0kqfrifjmykrg5pfb2xh35by3dc1nfa4i1434xr1fzi4y5avdqaw3zlvhnybi611qxv1g2ydnwkq9mgnvjq8fis4ir60g82s"; }
+  ];
+
   mavenPluginDescriptor_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-plugin-descriptor";
diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
index 82b16e61620..f3ef7c7fc5b 100644
--- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
+++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-plugin-parameter-documenter";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3hx5wg0jqhhknfgb98j7d3xy452lyw5yr3ncbk0jfzx1xkxc3v101s5s192q3c2agjgj76xsk1axmipdmwfv3801rbk99hmyjhdqbkn"; }
+    { type = "pom"; sha512 = "0x56m654vdgakslrbzfnvarh699ag288drbk6vnwjp5xxa5jg9vizrm6kz1917d2qygrpqnn5b6yzwawj864qy9xdadzr9mbak33424"; }
+  ];
+
   mavenPluginParameterDocumenter_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-plugin-parameter-documenter";
diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix
index 547bda4fc9f..b75806182cf 100644
--- a/pkgs/development/java-modules/maven/plugin-registry.nix
+++ b/pkgs/development/java-modules/maven/plugin-registry.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenPluginRegistry_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-plugin-registry";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "392cx42731zgiyvjdpqcpbhqvpjbd4ydlxfnracws8vimifcsln33s48yzk2q671ydcwdzs3kla2npy410vqzvc535km5ssj60fhq2f"; }
+    { type = "pom"; sha512 = "3g1rbjz64x7cihfgmc061nm7sg52p7wr34cb1b1725w7d3hp0vz33s5ybql3vccbf7brx9vvfykxiwsgqbw6g19zv77276vdpy8v5nr"; }
+  ];
+
   mavenPluginRegistry_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-plugin-registry";
diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
new file mode 100644
index 00000000000..754bcc08031
--- /dev/null
+++ b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenPluginTestingHarness_1_1 = map (obj: fetchMaven {
+    version = "1.1";
+    baseName = "maven-plugin-testing-harness";
+    package = "/org/apache/maven/shared";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "38cqg736n2nlzhssabyw47yl0rqcaha3k8sqgjs7pgvcpphapxinx9gck2n2y5m77rhjwkz0n6lyym6zi2k382jbasm2n59y5gkpnkj"; }
+    { type = "pom"; sha512 = "26gfh7i9qg79yggsp3sl21qj9s4j6hdabllvbvnnr0m6j8whadzbhfx2ds7p6ddvzvyi5214xrsl6ag3nxw6k5rjw10k4g32b0nyvv2"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix
index d5e79d13c2c..b160fb4e943 100644
--- a/pkgs/development/java-modules/maven/profile.nix
+++ b/pkgs/development/java-modules/maven/profile.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenProfile_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-profile";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "39zjz3jh5q5k4ryyg8psj741gwy01blflmw2hk9krqid9fpmbbcj5f3h34i1q03qcz7kgb1sz1kp58j2fmbk8364y2i0xyrg4zalzz5"; }
+    { type = "pom"; sha512 = "32jcvvf47if22cy3z0ld2gf7873ysz4qcx6b2zp62r8pbmj1i2a1kd62llvjv7p2x5l960ndvlr1a80x6mm9mnsjrwxd4vy0iwyshmv"; }
+  ];
+
   mavenProfile_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-profile";
diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix
index 25911fcdee8..f1ff4f05c4c 100644
--- a/pkgs/development/java-modules/maven/project.nix
+++ b/pkgs/development/java-modules/maven/project.nix
@@ -23,6 +23,17 @@ rec {
     { type = "pom"; sha512 = "13z607rjazzrs3rjw6hlhpw6jip85lgdkvnkm1j17wsbhywa53x45ydyg1hzrcax8xr5zxn7mkrryp4wwwm4ihhsaz3nq8bh12yrh8p"; }
   ];
 
+  mavenProject_2_0_8 = map (obj: fetchMaven {
+    version = "2.0.8";
+    baseName = "maven-project";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2j3mwqh0zjm7pc7jydpdg6xp5gl3ila84zkhk1znn9663d84p4wgkv6zi1r16djc5jvy2g2z2id1zc7gr97spv5riwz3hbw1vw4ajzp"; }
+    { type = "pom"; sha512 = "1489hvb5g28afc2yjyc5qnlihg0qqiq0r1fkbl976hvr5kfj6pkx4h3sz69gv3pnsgpjkavqxafm11s7w1hgd8xsvajrnsy77hmpsqa"; }
+  ];
+
   mavenProject_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-project";
diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix
index 36818dc57e0..afb949d79c5 100644
--- a/pkgs/development/java-modules/maven/reporting-api.nix
+++ b/pkgs/development/java-modules/maven/reporting-api.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenReportingApi_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-reporting-api";
+    package = "/org/apache/maven/reporting";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "06721y3g8zxhv2hx9c743ai3pc8d2agdgkz8wyaia6h7k2sy0rjxcfixpdxpw9hzdm0fqjqc3hdjf0j5dlkd11xzv9q87dr1s1x24w2"; }
+    { type = "pom"; sha512 = "2xjij0375hnv807sar41gk0qk8f7xaqm1fkrgvrbcl5sbwm614rrdxir14wlkkgr78qjx3b8m3r1jrdi47j1n5p4c9zmgg4vjl3n1sy"; }
+  ];
+
   mavenReportingApi_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-reporting-api";
@@ -22,4 +33,15 @@ rec {
     { type = "jar"; sha512 = "0x7j7k3xbxps80swyp4ff1sw4rwrhlxsx80kyh0sj0i9jz50x18p1rba10gx2fqd4l29zri77nlm4qza5yrf61s68xby2zr2bygyc9r"; }
     { type = "pom"; sha512 = "054v1p9h0141pahs52pg8wb0x4jghm5222yns6mf4dbc9gpy7x9j2b0z2lv9q3slx98378s4zakx4kbk5ca9ldlm8sz9y10fpqm35s6"; }
   ];
+
+  mavenReportingApi_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-reporting-api";
+    package = "/org/apache/maven/reporting";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "38nbplfyi1xcf6q502m8sgz9iacqy06y9fq811sz75wsqxld8zxkr85lqg46zhpjm8k3hk7dg4an466j65mbpf0n7iswcjnqn78slil"; }
+    { type = "pom"; sha512 = "0clwbb7p9fm5xlwkjyxx97v0k9alpz98smlpv26gz9j22hlzl08zajgiw52abqarbk80x28c02clipv1ifgbwrxyji4s8rb5f689nkp"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix
index 7a076a3811e..1ed2717ac4f 100644
--- a/pkgs/development/java-modules/maven/repository-metadata.nix
+++ b/pkgs/development/java-modules/maven/repository-metadata.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-repository-metadata";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3aq5k4ifam2lm6mny7zyjlylcpk6is2jnas81w6z5p6qd5jfwfj1i3g89y0vsl7mamh2rp7xncx60mvqr0jm9hxgx8ibjcynkq92kaf"; }
+    { type = "pom"; sha512 = "29nynsxh8k1q91whs4glca3qxigid32dx70c87jvk1x1cfc8s78bvm6lzr14x7wvw5i5n61lrqvq5mc6mzsi8xmspaqjhm2m7azyx7y"; }
+  ];
+
   mavenRepositoryMetadata_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-repository-metadata";
diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix
index b4416607ee9..a18532fa362 100644
--- a/pkgs/development/java-modules/maven/settings.nix
+++ b/pkgs/development/java-modules/maven/settings.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenSettings_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-settings";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3jf3iix8zwbjrfxswn4x4q5jxmpkm5bqq0pb6yq5vjk74kipkk6cl5cfjhy8pakb1fymq7j7knsi791xp6jrhyyrzi31lgprdmlk06x"; }
+    { type = "pom"; sha512 = "2r0256akp6gkcg7mjpaf27s985x2hblqk2dqcjq4cl415j4hx1xvarvvkh9py8sk8sjp66nzabph2kyk7v01cy29ryay6b6hn1wzi62"; }
+  ];
+
   mavenSettings_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-settings";
diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/pkgs/development/java-modules/maven/surefire-junit4.nix
new file mode 100644
index 00000000000..83aaebc7f6d
--- /dev/null
+++ b/pkgs/development/java-modules/maven/surefire-junit4.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven {
+    version = "2.12.4";
+    baseName = "surefire-junit4";
+    package = "/org/apache/maven/surefire";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2m6k4dsy9d6yfcn33lrv1q4lb3hlg1q6c8ff0rhb05j7lzsiiqa55n2561a45bznhc8l85l31mrvva0h2hhca6xjyx1hw7k3ddgpzc5"; }
+    { type = "pom"; sha512 = "1na33q7j22fsdwcynd8pv8ivsq1fq51p818nyhhldaqnh7rm2478pnxyhq14wv9mrsgrfxffipaiqyvwq30y69y6ddn597arv16ihix"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
new file mode 100644
index 00000000000..95eb52ae3e8
--- /dev/null
+++ b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven {
+    version = "1.11";
+    baseName = "java-boot-classpath-detector";
+    package = "/org/codehaus/mojo";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0dn0ry30n47544bbhp8j3r5fm6ip7cs1i8wg0wdfr735ak7r38wpb297q0k5kfaqrlqwi8cmnz4lngjan223lpwywjc806v27adjh57"; }
+    { type = "pom"; sha512 = "1ndzid9lik3a3bh8d2n9fqql29wypx4cw4ybvjgqhx63rs8hbb038irmcdr18jsalb8v2sj0bmjv6nmrr58wgf158r1zjv311m95yw0"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/pkgs/development/java-modules/ow2/asm-all.nix
new file mode 100644
index 00000000000..2fee6529f16
--- /dev/null
+++ b/pkgs/development/java-modules/ow2/asm-all.nix
@@ -0,0 +1,15 @@
+{ fetchMaven }:
+
+rec {
+  ow2AsmAll_4_0 = map (obj: fetchMaven {
+    version = "4.0";
+    baseName = "asm-all";
+    package = "/org/ow2/asm";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3b38kqyzg15plsdwwr5kri06h0pag1pxnxzlyqcwpaa2ncd4pqh44zc7mzaxrsvpx8z5cdl413xs2p0qn1qhcz92w5lqykm4gnvb2az"; }
+    { type = "pom"; sha512 = "11gcdp8417immlsb8dvw70cmqykcqvzcl2xz37vsimdpwjx31px88dgmxs6l3k50z9mvs6h1cfgfbaw1i2qmzdkdlbyai8iwnl8q2mr"; }
+  ];
+}
+
diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix
index e831df44732..3a2b0a347e3 100644
--- a/pkgs/development/java-modules/plexus/archiver.nix
+++ b/pkgs/development/java-modules/plexus/archiver.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  plexusArchiver_1_0_alpha7 = map (obj: fetchMaven {
+    version = "1.0-alpha-7";
+    baseName = "plexus-archiver";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3r1c5bknlk9010wqw1m6asqhnbmqz6xammhpci929gjjims27fr0c9qmskqr55vnbswcmvsiikfjnjwa36msgscirzsay48zrs5iwfk"; }
+    { type = "pom"; sha512 = "05gnm321rx3zi5bnkgl64nbx6j8f3pz6y0v6nb3xfw44kgv7rxaq8b1v716wpr2p0bdrmarxmzidc92hps2w5src0ramg6xv35zfw6w"; }
+  ];
+
   plexusArchiver_2_1 = map (obj: fetchMaven {
     version = "2.1";
     baseName = "plexus-archiver";
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix
index 2cfdd60ccae..ca46c0d4d62 100644
--- a/pkgs/development/java-modules/plexus/utils.nix
+++ b/pkgs/development/java-modules/plexus/utils.nix
@@ -12,6 +12,17 @@ rec {
     { type = "pom"; sha512 = "35mm9fkfw1wljabr4lz6l5mq3mxgl7k87whlcz5qlddsbxy0j69j4xgf1fvjlyp06nqq2wz574v54aqpxgp8s6jwjyz9wyvqvsyka8d"; }
   ];
 
+  plexusUtils_1_0_5 = map (obj: fetchMaven {
+    version = "1.0.5";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2wj0xyywifivqq1rnmd3lj7c4kgprcyq3rb4v4y5rr89isdm40hnfhziz0zakyysk8wqw4l4wp3lg7vxhs3yd44rdfm0czvkjl726zj"; }
+    { type = "pom"; sha512 = "1pz98avnr6pml058mg2db79rpxckcxkgpl8z373l055kppsy1pvmkhjahkjpzfrg63pdsk2kgm2ls9ji5697whpbm7xcwi8j3ssx791"; }
+  ];
+
   plexusUtils_1_1 = map (obj: fetchMaven {
     version = "1.1";
     baseName = "plexus-utils";
@@ -45,6 +56,17 @@ rec {
     { type = "pom"; sha512 = "0liqhpc9pn81vn04qz4j3101jc33hygb415jnwpf0dhph3jay88l49gd9s1bwq6x4npn2v6863vidb8hdh5f8wd20k6m1lqhdpv882j"; }
   ];
 
+  plexusUtils_1_4_9 = map (obj: fetchMaven {
+    version = "1.4.9";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "12fhq89mqj8m5y0ks8h39ig2q4nr3qlygjwygp9wg60dkfqrm6rscfrycs18pqd9y9fkhk8rqi96gq2vy8wg1v1a24h2wlzak1d22ip"; }
+    { type = "pom"; sha512 = "23fpn9f8gq0a3hi2mlwzjpbr3kyrsr4wl58zyq8i6xbdnnfx0wfwc2xsfn8yp3mq2pjjpdlza9l3qdmwsyzmrz8micvms8bladpvcmv"; }
+  ];
+
   plexusUtils_1_5_1 = map (obj: fetchMaven {
     version = "1.5.1";
     baseName = "plexus-utils";
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index ee19aaf2103..7feff9548a1 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -105,6 +105,14 @@ rec {
     type = "pom";
   };
 
+  asmParent_4_0 = fetchMaven {
+    version = "4.0";
+    baseName = "asm-parent";
+    package = "/org/ow2/asm";
+    sha512 = "2vysz9nn1pn1qzd40n7d2njmcpz7qi37pi73k9ajjmmbzwza6h8gc1pvadfqxlnih47gzc1wn3hqrc1sqd3b84kh8nrznwjcp10y0lf";
+    type = "pom";
+  };
+
   backportUtilConcurrent_3_1 = fetchMaven {
     version = "3.1";
     baseName = "backport-util-concurrent";
@@ -129,6 +137,14 @@ rec {
     type = "pom";
   };
 
+  commonsParent_11 = fetchMaven {
+    version = "11";
+    baseName = "commons-parent";
+    package = "/org/apache/commons";
+    sha512 = "3986i0mnawni27fqf74zfb1n9wvyn502nvslfmbwz5m3rgvhfdb7r1wj7qz8g3wznfvh3wd99h83d94300yvy6cilqy5sj9gfwxk3jv";
+    type = "pom";
+  };
+
   commonsParent_17 = fetchMaven {
     version = "17";
     baseName = "commons-parent";
@@ -145,6 +161,14 @@ rec {
     type = "pom";
   };
 
+  doxia_1_0_alpha6 = fetchMaven {
+    version = "1.0-alpha-6";
+    baseName = "doxia";
+    package = "/org/apache/maven/doxia";
+    sha512 = "0ya69g2xfzawf30r2n45n85h2bag0ihd2cbkd0896ykwndx62jyagc594f9pkvb8x9vwgq1dkhfc5lfw1sjcmsxm9dmyzvy2nmykpsy";
+    type = "pom";
+  };
+
   doxia_1_0_alpha7 = fetchMaven {
     version = "1.0-alpha-7";
     baseName = "doxia";
@@ -217,6 +241,14 @@ rec {
     type = "pom";
   };
 
+  maven_2_0_8 = fetchMaven {
+    version = "2.0.8";
+    baseName = "maven";
+    package = "/org/apache/maven";
+    sha512 = "0mzlba0vbanxvdgfvj3kq6xw211j40b6hk6w0b7lc686m2c26vgxks9iisgm10888lq140i6510813326bs9yb053hqfvnz3m72lkss";
+    type = "pom";
+  };
+
   maven_2_0_9 = fetchMaven {
     version = "2.0.9";
     baseName = "maven";
@@ -353,6 +385,14 @@ rec {
     type = "pom";
   };
 
+  mavenReporting_2_0_1 = fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-reporting";
+    package = "/org/apache/maven/reporting";
+    sha512 = "3ns0j0w3g3xzvi4y2nbz7yl3w0bq6npvkpy56c2s2m8z0b0007vw97qm3z7b6iicwck69g9001qqqanhzr35x1qbzlqzrx5v271hvfa";
+    type = "pom";
+  };
+
   mavenReporting_2_0_6 = fetchMaven {
     version = "2.0.6";
     baseName = "maven-reporting";
@@ -369,6 +409,22 @@ rec {
     type = "pom";
   };
 
+  mavenReporting_2_2_1 = fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-reporting";
+    package = "/org/apache/maven/reporting";
+    sha512 = "02gs0nk2hihvayh7gxn1ncbq7nq1hbpr40whby6c58adk7g6jq3cn84fi8svcv10w915f696drav1cimjpizcyjn00if1iql59dmfda";
+    type = "pom";
+  };
+
+  mavenSharedComponents_7 = fetchMaven {
+    version = "7";
+    baseName = "maven-shared-components";
+    package = "/org/apache/maven/shared";
+    sha512 = "35zwvraafv86jpyfvfmi76n9bzmahq5z90j9axb3b6d0wfvildz5qb43kw27si2ldwghiwsfh2jikd3gf9ms553pfillf4baab13dp6";
+    type = "pom";
+  };
+
   mavenSharedComponents_11 = fetchMaven {
     version = "11";
     baseName = "maven-shared-components";
@@ -417,6 +473,14 @@ rec {
     type = "pom";
   };
 
+  ow2_1_3 = fetchMaven {
+    version = "1.3";
+    baseName = "ow2";
+    package = "/org/ow2";
+    sha512 = "1jqfqqmh19lvrjk45zzzp895jbxb8giw8sn1qdvwhh1yqxr1z5vkv98n4g0ib2l359qmb9fal4d21ba57zmbl0rqxqlggv9c5l87gfs";
+    type = "pom";
+  };
+
   plexus_1_0_4 = fetchMaven {
     version = "1.0.4";
     baseName = "plexus";
@@ -545,6 +609,14 @@ rec {
     type = "pom";
   };
 
+  plexusComponents_1_1_6 = fetchMaven {
+    version = "1.1.6";
+    baseName = "plexus-components";
+    package = "/org/codehaus/plexus";
+    sha512 = "1m6f5xzp6mk1n0svznqc8l5x3klr9kk75223ms31q65llx765dxvrsmkjlzgshb0ipb9nfxwk9hs5fvf5dgh0xlzrnc1w2pnqdi8jnh";
+    type = "pom";
+  };
+
   plexusComponents_1_1_7 = fetchMaven {
     version = "1.1.7";
     baseName = "plexus-components";
@@ -761,6 +833,14 @@ rec {
     type = "pom";
   };
 
+  surefireProviders_2_12_4 = fetchMaven {
+    version = "2.12.4";
+    baseName = "surefire-providers";
+    package = "/org/apache/maven/surefire";
+    sha512 = "08di6wgiihz9svrdpkdvhlipdp83byd1s844fnjqfk3z0g5a72lpq718zy27rk41jma3hclmr4pv0g5dvbhf3v8hy92iby8w5rcxv5x";
+    type = "pom";
+  };
+
   xbean_3_4 = fetchMaven {
     version = "3.4";
     baseName = "xbean";
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 488f4cb59db..0df0b5a51c9 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -27,7 +27,8 @@ in {
     classworlds_1_1;
 
   inherit (callPackage ../development/java-modules/apache/commons-cli.nix { inherit fetchMaven; })
-    commonsCli_1_0;
+    commonsCli_1_0
+    commonsCli_1_2;
 
   inherit (callPackage ../development/java-modules/apache/commons-io.nix { inherit fetchMaven; })
     commonsIo_2_1;
@@ -49,6 +50,9 @@ in {
   inherit (callPackage ../development/java-modules/google/collections.nix { inherit fetchMaven; })
     googleCollections_1_0;
 
+  inherit (callPackage ../development/java-modules/hamcrest/all.nix { inherit fetchMaven; })
+    hamcrestAll_1_3;
+
   inherit (callPackage ../development/java-modules/hamcrest/core.nix { inherit fetchMaven; })
     hamcrestCore_1_3;
 
@@ -64,12 +68,15 @@ in {
     mavenArchiver_2_5;
 
   inherit (callPackage ../development/java-modules/maven/artifact.nix { inherit fetchMaven; })
+    mavenArtifact_2_0_1
     mavenArtifact_2_0_6
+    mavenArtifact_2_0_8
     mavenArtifact_2_0_9
     mavenArtifact_2_2_1
     mavenArtifact_3_0_3;
 
   inherit (callPackage ../development/java-modules/maven/artifact-manager.nix { inherit fetchMaven; })
+    mavenArtifactManager_2_0_1
     mavenArtifactManager_2_0_6
     mavenArtifactManager_2_0_9
     mavenArtifactManager_2_2_1;
@@ -80,6 +87,7 @@ in {
     mavenCommonArtifactFilters_1_4;
 
   inherit (callPackage ../development/java-modules/maven/core.nix { inherit fetchMaven; })
+    mavenCore_2_0_1
     mavenCore_2_0_6
     mavenCore_2_0_9
     mavenCore_2_2_1;
@@ -88,6 +96,7 @@ in {
     mavenDependencyTree_2_1;
 
   inherit (callPackage ../development/java-modules/maven/doxia-sink-api.nix { inherit fetchMaven; })
+    mavenDoxiaSinkApi_1_0_alpha6
     mavenDoxiaSinkApi_1_0_alpha7
     mavenDoxiaSinkApi_1_0_alpha10;
 
@@ -96,6 +105,7 @@ in {
     mavenEnforcerRules_1_3_1;
 
   inherit (callPackage ../development/java-modules/maven/error-diagnostics.nix { inherit fetchMaven; })
+    mavenErrorDiagnostics_2_0_1
     mavenErrorDiagnostics_2_0_6
     mavenErrorDiagnostics_2_0_9
     mavenErrorDiagnostics_2_2_1;
@@ -108,12 +118,14 @@ in {
     mavenHello_1_1;
 
   inherit (callPackage ../development/java-modules/maven/model.nix { inherit fetchMaven; })
+    mavenModel_2_0_1
     mavenModel_2_0_6
     mavenModel_2_0_9
     mavenModel_2_2_1
     mavenModel_3_0_3;
 
   inherit (callPackage ../development/java-modules/maven/monitor.nix { inherit fetchMaven; })
+    mavenMonitor_2_0_1
     mavenMonitor_2_0_6
     mavenMonitor_2_0_9
     mavenMonitor_2_2_1;
@@ -123,27 +135,35 @@ in {
     mavenPluginAnnotations_3_2;
 
   inherit (callPackage ../development/java-modules/maven/plugin-api.nix { inherit fetchMaven; })
+    mavenPluginApi_2_0_1
     mavenPluginApi_2_0_6
     mavenPluginApi_2_0_9
     mavenPluginApi_2_2_1
     mavenPluginApi_3_0_3;
 
   inherit (callPackage ../development/java-modules/maven/plugin-descriptor.nix { inherit fetchMaven; })
+    mavenPluginDescriptor_2_0_1
     mavenPluginDescriptor_2_0_6
     mavenPluginDescriptor_2_0_9
     mavenPluginDescriptor_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/plugin-parameter-documenter.nix { inherit fetchMaven; })
+    mavenPluginParameterDocumenter_2_0_1
     mavenPluginParameterDocumenter_2_0_6
     mavenPluginParameterDocumenter_2_0_9
     mavenPluginParameterDocumenter_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/plugin-registry.nix { inherit fetchMaven; })
+    mavenPluginRegistry_2_0_1
     mavenPluginRegistry_2_0_6
     mavenPluginRegistry_2_0_9
     mavenPluginRegistry_2_2_1;
 
+  inherit (callPackage ../development/java-modules/maven/plugin-testing-harness.nix { inherit fetchMaven; })
+    mavenPluginTestingHarness_1_1;
+
   inherit (callPackage ../development/java-modules/maven/profile.nix { inherit fetchMaven; })
+    mavenProfile_2_0_1
     mavenProfile_2_0_6
     mavenProfile_2_0_9
     mavenProfile_2_2_1;
@@ -151,19 +171,24 @@ in {
   inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; })
     mavenProject_2_0_1
     mavenProject_2_0_6
+    mavenProject_2_0_8
     mavenProject_2_0_9
     mavenProject_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/reporting-api.nix { inherit fetchMaven; })
+    mavenReportingApi_2_0_1
     mavenReportingApi_2_0_6
-    mavenReportingApi_2_0_9;
+    mavenReportingApi_2_0_9
+    mavenReportingApi_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/repository-metadata.nix { inherit fetchMaven; })
+    mavenRepositoryMetadata_2_0_1
     mavenRepositoryMetadata_2_0_6
     mavenRepositoryMetadata_2_0_9
     mavenRepositoryMetadata_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/settings.nix { inherit fetchMaven; })
+    mavenSettings_2_0_1
     mavenSettings_2_0_6
     mavenSettings_2_0_9
     mavenSettings_2_2_1;
@@ -186,6 +211,9 @@ in {
     mavenSurefireCommon_2_12_4
     mavenSurefireCommon_2_17;
 
+  inherit (callPackage ../development/java-modules/maven/surefire-junit4.nix { inherit fetchMaven; })
+    mavenSurefireJunit4_2_12_4;
+
   inherit (callPackage ../development/java-modules/maven/toolchain.nix { inherit fetchMaven; })
     mavenToolchain_1_0
     mavenToolchain_2_0_9
@@ -194,7 +222,14 @@ in {
   inherit (callPackage ../development/java-modules/mojo/animal-sniffer.nix { inherit fetchMaven; })
     mojoAnimalSniffer_1_11;
 
+  inherit (callPackage ../development/java-modules/mojo/java-boot-classpath-detector.nix { inherit fetchMaven; })
+    mojoJavaBootClasspathDetector_1_11;
+
+  inherit (callPackage ../development/java-modules/ow2/asm-all.nix { inherit fetchMaven; })
+    ow2AsmAll_4_0;
+
   inherit (callPackage ../development/java-modules/plexus/archiver.nix { inherit fetchMaven; })
+    plexusArchiver_1_0_alpha7
     plexusArchiver_2_1;
 
   inherit (callPackage ../development/java-modules/plexus/build-api.nix { inherit fetchMaven; })
@@ -241,9 +276,11 @@ in {
 
   inherit (callPackage ../development/java-modules/plexus/utils.nix { inherit fetchMaven; })
     plexusUtils_1_0_4
+    plexusUtils_1_0_5
     plexusUtils_1_1
     plexusUtils_1_4_1
     plexusUtils_1_4_5
+    plexusUtils_1_4_9
     plexusUtils_1_5_1
     plexusUtils_1_5_5
     plexusUtils_1_5_6