junit_4_12 part 2

24 files changed, 394 insertions, 12 deletions

diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/pkgs/development/java-modules/apache/ant-launcher.nix
new file mode 100644
index 00000000000..0e4d7b26765
--- /dev/null
+++ b/pkgs/development/java-modules/apache/ant-launcher.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  antLauncher_1_8_2 = map (obj: fetchMaven {
+    version = "1.8.2";
+    baseName = "ant-launcher";
+    package = "/org/apache/ant";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3h1xmlamkh39lz3dgpbyxj0mai9a266qmxkcyb7kqpzkl0xxvgyi8i2l4nnn02n4qbxznhmvsba77v52ldh67qmhxk3vw1q3xqnn2xx"; }
+    { type = "pom"; sha512 = "3fvz9di9lbfgy5370gwwdp2d380gl42sn44kr97l8i7k0n9crrbjrxs2dpy9cnsnnavvk14nrrkc72n9f1gkg1dvdxqpxlwm0y9lxhy"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/apache/ant.nix b/pkgs/development/java-modules/apache/ant.nix
new file mode 100644
index 00000000000..fa83663f5ec
--- /dev/null
+++ b/pkgs/development/java-modules/apache/ant.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  ant_1_8_2 = map (obj: fetchMaven {
+    version = "1.8.2";
+    baseName = "ant";
+    package = "/org/apache/ant";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3x9m09i4kn57avkjbz57v1chx0356lp4mz77adslcbmr59gxfs3km1f4dq3lm1nxspldwxqk654yzh5sgrcfz13r1zlg3bvlsjbb1bs"; }
+    { type = "pom"; sha512 = "2h8ajn6x40cn8cicx3h167blkv9p6478l610xrp2n1k1zlfnh1rz2kcsi74gy7psb4h98118p3zp90gvw4h8gsphz1n30f3c96qnpiq"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/pkgs/development/java-modules/apache/commons-io.nix
new file mode 100644
index 00000000000..612dcb85f8e
--- /dev/null
+++ b/pkgs/development/java-modules/apache/commons-io.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  commonsIo_2_1 = map (obj: fetchMaven {
+    version = "2.1";
+    baseName = "commons-io";
+    package = "/commons-io";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "30bzhsnn2vhi3wfmkas58spl6sxvl9rvwkzaqf9z1lr3iz4iym6x1xgspgq1dvy7pwr7ajny1dfpj1l6vzh7adqm2b4pidjf2w00fp2"; }
+    { type = "jar"; sha512 = "14b2kcjsn12cnrl1qc7v7r48m9vmpw5h9jljhsx58ac8xrlb8g6l71j9lnhp8cf8vc3jwz4drrwn4l9p3r5sk02cparl3h2r0y4cp2c"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix
index 8987823e470..f6dc6b407ef 100644
--- a/pkgs/development/java-modules/apache/commons-lang.nix
+++ b/pkgs/development/java-modules/apache/commons-lang.nix
@@ -22,4 +22,15 @@ rec {
     { type = "pom"; sha512 = "0i94xb3fgq0ig0aids9r1h1kblhlf762gsjxh422ra23saa4474q4iywgfk596bpcflngf2sarq8ch6lw09p0g43779d23b74bd939n"; }
     { type = "jar"; sha512 = "1f30pryvd39m2yazflzy5l1h4l473dj8ccrd9v8z8lb6iassn4xc142f2snkzxlc7ncqsi6fbfd3zfxsy8afivmxmxds6mbsrxayqwk"; }
   ];
+
+  commonsLang_2_6 = map (obj: fetchMaven {
+    version = "2.6";
+    baseName = "commons-lang";
+    package = "/commons-lang";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "2b3yp5bawbh9b0gh56g35x03swrjv2c5jpvwjwric7ywadaf4p6cw1kmabldmi0y3rja5cypz7gfdm1pwdrpr9lmi48ijjssimmgsh1"; }
+    { type = "jar"; sha512 = "11gnsj6c1rz61j19wnr0j5rbdnl63hq9axwm7wwampmdq70n3m1szbn014phl8y3nccvrq2ifcgwb48q6jwqs50rki4bij196z3snja"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index a056953f9ab..203fa88aa00 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
     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 install -Dmaven.test.skip=true -gs $out/m2/settings.xml
+    ${maven}/bin/mvn clean package -Dmaven.test.skip=true -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
     cp -v ./target/*.jar $out/target/
   '';
 }
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index 8304b1a8a01..5418679b78f 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -2,7 +2,9 @@
 
 with pkgs.javaPackages;
 
-rec {
+let
+  poms = import (../poms.nix) { inherit fetchMaven; };
+in rec {
   junitGen = { mavenDeps, sha512, version }: mavenbuild rec {
     inherit mavenDeps sha512 version;
 
@@ -48,7 +50,9 @@ rec {
   ];
 
   junit_4_12 = junitGen {
-    mavenDeps = [ mavenPlugins.animalSniffer_1_11 hamcrestCore_1_3 plexusUtils_1_1 ];
+    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 ]);
     sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9";
     version = "4.12";
   };
diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix
index 56ae8132c61..88e8efca1a1 100644
--- a/pkgs/development/java-modules/m2install.nix
+++ b/pkgs/development/java-modules/m2install.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
-{ version, baseName, package, sha512, type ? "jar" }:
+{ version, baseName, package, sha512, type ? "jar", suffix ? "" }:
 
 let
   name = "${baseName}-${version}";
   m2Path = "${package}/${baseName}/${version}";
-  m2File = "${name}.${type}";
+  m2File = "${name}${suffix}.${type}";
   src = fetchurl rec {
       inherit sha512;
       url = "mirror://maven/${m2Path}/${m2File}";
diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix
index 2b72293ac93..3949882f98b 100644
--- a/pkgs/development/java-modules/maven/common-artifact-filters.nix
+++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven {
+    version = "1.2";
+    baseName = "maven-common-artifact-filters";
+    package = "/org/apache/maven/shared";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "33g4qwxxnwdzx8h5xh5gjx8ijy6cmc5iyv0jgn70hvz1zqnilr49ibzjnichyb3m77zma30zb1njgw7fbnlx177ph5h2w0radkh3m88"; }
+    { type = "jar"; sha512 = "1z55x8hrb9g4kk21jsk9n4r26ncgsxinr18nmjgxsrcbaxcjhxbhx3nin24gwvcy6zh2d6gv26dng8i90ccc1qxvpmga2ahk68jfyjk"; }
+  ];
+
   mavenCommonArtifactFilters_1_3 = map (obj: fetchMaven {
     version = "1.3";
     baseName = "maven-common-artifact-filters";
diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix
index 782e3e14100..6bd8928cf0f 100644
--- a/pkgs/development/java-modules/maven/plugin-annotations.nix
+++ b/pkgs/development/java-modules/maven/plugin-annotations.nix
@@ -11,4 +11,15 @@ rec {
     { type = "pom"; sha512 = "2q1y622vaks1y2qjbq4005jmi41hpkivsrnmkf5kr3zndz4d6ai47d90jwr70pby8xqqsj461baljcjsicl6rrbq0v9ppyryr13q828"; }
     { type = "jar"; sha512 = "1jd8b32kl9kh4dxpdg5i9qf3haqc5br0mz8bl1ri4hb9qgwkzsijvx6jr7pv9zgplanwvgca3lhpgzsgs03n8jlqnbxbmgsv1pl93zb"; }
   ];
+
+  mavenPluginAnnotations_3_2 = map (obj: fetchMaven {
+    version = "3.2";
+    baseName = "maven-plugin-annotations";
+    package = "/org/apache/maven/plugin-tools";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "0ggvy7xhlgbpb7abc7vj0bhdqzfc6x0d4ldj7bl8qyi0qhv404qlfy4iqhn5jv3qwmj2pp9w4fa9jv5vsaz6yh8hpkzgdbpcwxdrmb9"; }
+    { type = "jar"; sha512 = "2j2lrm2dlikbpncz20r4yxhyi7h5dnhkxalvkih35m7fz57csbgd53whq969hixpfhyj18svd6695a3v4bfa94hg99mw78lzq8lwb37"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix
index 880f821f76c..25911fcdee8 100644
--- a/pkgs/development/java-modules/maven/project.nix
+++ b/pkgs/development/java-modules/maven/project.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenProject_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-project";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "09dyyxwyjlr9q65r8zh7bsf41glpqxc9b6902s2s1clrs98k672kg04vq4fn569vx6hishna3kpxk8y7q5k5zpfy3g9wqsxcxhbqznx"; }
+    { type = "pom"; sha512 = "2fl4dl48cni9hqx0i7arrylcs028vymvmsa0wncbsz37g2gsxq462lqqd1swhgjnjqn1g6386rh6wq6j9mhpbm8kf741aypz9sf33wm"; }
+  ];
+
   mavenProject_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-project";
diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix
index e7a561814e4..cd422bbb758 100644
--- a/pkgs/development/java-modules/maven/surefire-api.nix
+++ b/pkgs/development/java-modules/maven/surefire-api.nix
@@ -11,4 +11,15 @@ rec {
     { type = "jar"; sha512 = "0chjp4jpfrhd99mpvh6v4sz71wgg8r0nyv8j2mgbsxsvbf0wha0za5g5bv16l4pflfigd4rhb2h1mkz51pb71qli8w39ycb3dw4lfpn"; }
     { type = "pom"; sha512 = "28ra2n9ln8nb5j1xh6mnxc4kfabnvyqyrgy2wwm66pxhp1fxxxqz1izfvih9jzr3cps7pbvqwql770i14cfyjzvl0zccjsscsjyy50r"; }
   ];
+
+  mavenSurefireApi_2_17 = map (obj: fetchMaven {
+    version = "2.17";
+    baseName = "surefire-api";
+    package = "/org/apache/maven/surefire";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "319kkasis86cqimkvsvmry60sj9m1f8vmhawpa8a56arqxfiqifnjiqfppydzlm3hlk8m4qgx3k5s291acbrv05297db8qbcrb2n688"; }
+    { type = "pom"; sha512 = "0p0yc6sq26jsa19iiqy8d0mw3q0i1jmqz21m8fp855i8q07iyqbd1lmzasfdbblki52fdyk986mdw26yhznkr29hgpy8qv7f0l6a5pz"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix
index 8f4d79a9807..f7fb8068a26 100644
--- a/pkgs/development/java-modules/maven/surefire-booter.nix
+++ b/pkgs/development/java-modules/maven/surefire-booter.nix
@@ -11,4 +11,15 @@ rec {
     { type = "jar"; sha512 = "08l0r0s1jhjdgljh26m4i612kf6wqs6g8lwx9n0cccjjzlpn3sxg7dryagwp2gz2g9y5kpdmbpsxmp5imbdak3qrwa56wxrmik16jh8"; }
     { type = "pom"; sha512 = "3rj97rbbdm0m0f1cpbvw7mc9hc5jmfkqbg1w1ggr640bd8fzrgmxrcynxf440mf0wg4xy55v27g6v5c3z20zlw1h4qi500x6wfm0l5s"; }
   ];
+
+  mavenSurefireBooter_2_17 = map (obj: fetchMaven {
+    version = "2.17";
+    baseName = "surefire-booter";
+    package = "/org/apache/maven/surefire";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1x8nldyxzx56an3zskbq40i3aq4sp21jlnybmrd6pjzf4c3pgrd8qsxkvz23pxyfzvskpkgmibfpshng9qk18c5dm2h4n5sljp1ayni"; }
+    { type = "pom"; sha512 = "0w2ql9a70ncdvzicv0947q8jil4ksha42xxswqk1aas1bsg7qwpg8v4pih887y4zirnl861qaw6d1v09l1s3jqq7hxid0w3jxnlcasb"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix
index c7bd2995c3a..4e56b0c5a86 100644
--- a/pkgs/development/java-modules/maven/surefire-common.nix
+++ b/pkgs/development/java-modules/maven/surefire-common.nix
@@ -11,4 +11,15 @@ rec {
     { type = "jar"; sha512 = "3ny5b6mnmka3lzyqk03flmizj82c0hdbiqgcqxj7261pvcf2drrk85p5q2z6f2h15w60mhyvl80p39pzqa35ziqhqnp6walg7rdk0hb"; }
     { type = "pom"; sha512 = "3iagspjgilwhbh5sxi64b2q8dpgrwa0s9wiw2417z2lvghy8knszha62n3j9qvbn7pxy819f2981s41aan6wcwx5scr9sg8jwbvcmff"; }
   ];
+
+  mavenSurefireCommon_2_17 = map (obj: fetchMaven {
+    version = "2.17";
+    baseName = "maven-surefire-common";
+    package = "/org/apache/maven/surefire";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2ikw1ddnxxfglb3k4920lfr8ziav5n2wp13452bxyd1gbhpwkq0js58wy9jbhyzqgdblqhfj3syxka0mxd4vngyg4iqw3c2phslmn6i"; }
+    { type = "pom"; sha512 = "1l2dkbzbi80bjsh4ri6gxw84iwzsm5g6mmhrj1ndrsr66d4cg7vg5nfyqxvf7xhzwj45768y5id09r70zijliavpsxrvjq5j0g05yb6"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix
index 80622361512..97ea74a5e52 100644
--- a/pkgs/development/java-modules/maven/toolchain.nix
+++ b/pkgs/development/java-modules/maven/toolchain.nix
@@ -22,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "37jjcjfx51bszg13wjhkv2spyw1b2n8glgyaaflzfqxmfhizr43y1fq2zhn2khp2jba6avilkqi9p0f2sd30glrg7lpc0srzqns3yn8"; }
     { type = "pom"; sha512 = "1r6w6za6smam46fpdfda2612ayz4a8gm87lgwa4f5jp5k92mzaj22rcsxlnibzly19vrgvycci63w9rgmzkwi2zvxxwxmf8sc5542c7"; }
   ];
+
+  mavenToolchain_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-toolchain";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "02ya75k4n4w62s9p5y1mq758s33s6vqcqli77hknr4wn22rr5fgaax8qscdnj90w3y6rkr6w0afiw438wr4hxwns5vp90fkzym87bp6"; }
+    { type = "pom"; sha512 = "1iv6k0pwyq2w5l4gfkmh818mrja0il48sajmgnpnn7ayi2238mbja07sqccm75wmzapb4039p7xq2jfp0vm41y3s00410gq3jgnf2pw"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/pkgs/development/java-modules/mojo/animal-sniffer.nix
new file mode 100644
index 00000000000..b6a5565f6fc
--- /dev/null
+++ b/pkgs/development/java-modules/mojo/animal-sniffer.nix
@@ -0,0 +1,15 @@
+{ fetchMaven }:
+
+rec {
+  mojoAnimalSniffer_1_11 = map (obj: fetchMaven {
+    version = "1.11";
+    baseName = "animal-sniffer";
+    package = "/org/codehaus/mojo";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "36qx2q1zaja470zj7w3ygafb5n07vb623yicgwjqf1nak7ianin5nlmh7pp2pzpdd9arvg7d005rnsn79bqmxcb6y1ihsxsh6l7bmsv"; }
+    { type = "pom"; sha512 = "1dp427c8vyiw255193s4m0ffag6ngqxfkj1cwl7v40p5c1bh8avxaj8cg56nn8ajp39shxr5wgwgjs7xwjz46yjnblh9pl29z58lm4i"; }
+  ];
+}
+
diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix
index 44b5ff3441a..308287a2904 100644
--- a/pkgs/development/java-modules/plexus/classworlds.nix
+++ b/pkgs/development/java-modules/plexus/classworlds.nix
@@ -11,4 +11,15 @@ rec {
     { type = "jar"; sha512 = "0w6mhv2xjafqr45zx5fwm8iyp8kabrdvyx91qxwy04k71ah6zxzqx1l8ppq7xma4r40lpp98valr1ydgfm1cay87j1kbdgaw2j48vns"; }
     { type = "pom"; sha512 = "12kxa236gg61gs6cshgwnsj0yfpywcb606j10l9hflp951vxvlcwpcdh1nlpir0zyqj7rnk5g8609grwahq2m62fs1ymqp8db2rqi56"; }
   ];
+
+  plexusClassworlds_2_4 = map (obj: fetchMaven {
+    version = "2.4";
+    baseName = "plexus-classworlds";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1299qgrf60pz9a40wccb1376wibk99rf79x8dw9z2c97gyzxb3narkpna3fk9wqs7a89p18d2b7zi7vxr3wcdhw6n8saxggz44w9gpq"; }
+    { type = "pom"; sha512 = "1g2xisql030wjb8kvrfp0qcip2b4jbf4islmxa0k1fvjyrzms5babgdpx7m75g29dl8s649z8fb90wrrqc7g14y9g74lydc9i6rd2q5"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix
index 137ac01c02d..2cfdd60ccae 100644
--- a/pkgs/development/java-modules/plexus/utils.nix
+++ b/pkgs/development/java-modules/plexus/utils.nix
@@ -67,6 +67,17 @@ rec {
     { type = "pom"; sha512 = "29knasqhkvjif27gm3ycqhc206ycgc9920mccw7biybxmiqqajyfvv74f02sqpavlk5h6l45cfb20bmldwfznvzz9bw4zhvc12s9y5h"; }
   ];
 
+  plexusUtils_1_5_6 = map (obj: fetchMaven {
+    version = "1.5.6";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "26p385szy6sphplalxc9750f29z7fnvmaz7m1fv0mx7p7qmvkk6pm5m4kl636m8jsflkfmzh4f4y5vj5vhxypfyc4pdzfsp9xyc3vwq"; }
+    { type = "pom"; sha512 = "261yv9sgjmslxjsfx7fj1ma53ld930qxic4br5m88wv96skyni09w2nh9sslgrmpxj3q89ykhq3fciscn40066v1qn0h0f6lbk3w68r"; }
+  ];
+
   plexusUtils_1_5_8 = map (obj: fetchMaven {
     version = "1.5.8";
     baseName = "plexus-utils";
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index 2b3f2861399..ee19aaf2103 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -17,6 +17,22 @@ rec {
     type = "pom";
   };
 
+  antParent_1_8_2 = fetchMaven {
+    version = "1.8.2";
+    baseName = "ant-parent";
+    package = "/org/apache/ant";
+    sha512 = "1q560n9xbqk9qpprvm0nigd5nhm9s8m027qxjmzhay083sjrazscpaly4mzgry5lpdmr3xyhly1r1s88879y04qr5xqzqh0j45j943x";
+    type = "pom";
+  };
+
+  apache_1 = fetchMaven {
+    version = "1";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "0vbf7mbs61n13dmxndvzkafr0sg9p7g45ng9j1917cz8a9m4zflqf7xvpp9wfprmb4d1wd3ay2hhy9brxryqmvx41wfjlk9ahg34k0h";
+    type = "pom";
+  };
+
   apache_3 = fetchMaven {
     version = "3";
     baseName = "apache";
@@ -49,6 +65,14 @@ rec {
     type = "pom";
   };
 
+  apache_7 = fetchMaven {
+    version = "7";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "2yvwxxifqypmpgxyx10ggj6l52jnl64f9554kyfdph7z56n02bcalj3cr43m6br0as6yc67k5p23l2k3gvdr66c5dfw1l8rwhahk9lr";
+    type = "pom";
+  };
+
   apache_9 = fetchMaven {
     version = "9";
     baseName = "apache";
@@ -105,6 +129,14 @@ rec {
     type = "pom";
   };
 
+  commonsParent_17 = fetchMaven {
+    version = "17";
+    baseName = "commons-parent";
+    package = "/org/apache/commons";
+    sha512 = "31ijvmfj2yybfy0n4qh7ga8192wg75hs5v26vwm98hgvlppxs9irik4qlqzh4iqq0azp0xl8idz6nn6yb9vzsjxax4c3v5wyk3yvyfy";
+    type = "pom";
+  };
+
   commonsParent_22 = fetchMaven {
     version = "22";
     baseName = "commons-parent";
@@ -169,6 +201,14 @@ rec {
     type = "pom";
   };
 
+  maven_2_0_1 = fetchMaven {
+    version = "2.0.1";
+    baseName = "maven";
+    package = "/org/apache/maven";
+    sha512 = "02n3kpll7w5iqaijawmm4rzr35sbv826c9vp1fzfnrgbvpfw22yrsjv2z416pzk2qyjh3wx7pc5xxxxdchmpzcxm694vsdl67ki2rrz";
+    type = "pom";
+  };
+
   maven_2_0_6 = fetchMaven {
     version = "2.0.6";
     baseName = "maven";
@@ -305,6 +345,14 @@ rec {
     type = "pom";
   };
 
+  mavenPluginTools_3_2 = fetchMaven {
+    version = "3.2";
+    baseName = "maven-plugin-tools";
+    package = "/org/apache/maven/plugin-tools";
+    sha512 = "28qhbacsb69rcp86l3lkc3d83267qdwwpl0zm134rxi58wy4y4rd8nz2yzk6yx4x8h0drq776b2qnr4ps1da1ybsvsi2sc655scx3lf";
+    type = "pom";
+  };
+
   mavenReporting_2_0_6 = fetchMaven {
     version = "2.0.6";
     baseName = "maven-reporting";
@@ -321,6 +369,14 @@ rec {
     type = "pom";
   };
 
+  mavenSharedComponents_11 = fetchMaven {
+    version = "11";
+    baseName = "maven-shared-components";
+    package = "/org/apache/maven/shared";
+    sha512 = "3g30bgx3nhw1pwq5nq7ns17vs53cck3zrk6b4sqh56my7vhdv08v0n94l326q9f51sxvnsn11zmpnn8zri8hz2ci1g61ymgi2d0mxyd";
+    type = "pom";
+  };
+
   mavenSharedComponents_12 = fetchMaven {
     version = "12";
     baseName = "maven-shared-components";
@@ -385,6 +441,14 @@ rec {
     type = "pom";
   };
 
+  plexus_1_0_12 = fetchMaven {
+    version = "1.0.12";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "2ckzb1z4hgmp2r61a05v3aqapkfnyfs4b7wrf60aiymrz57kliyq3nn50h7bj6ak9hlpyzxpqgqps0chzfpizr8v0abdkjmbplvw2ai";
+    type = "pom";
+  };
+
   plexus_2_0_2 = fetchMaven {
     version = "2.0.2";
     baseName = "plexus";
@@ -545,6 +609,38 @@ rec {
     type = "pom";
   };
 
+  sisuInject_2_1_1 = fetchMaven {
+    version = "2.1.1";
+    baseName = "sisu-inject";
+    package = "/org/sonatype/sisu";
+    sha512 = "0720p7ai7l1wqs2rfcgpvgd1rc3p2bdpp51a57jmqbgh9msr54iy0c6n0ipybd9lrl88iz4l8cc1s73qj5appf8r481bbwgv4wxi19v";
+    type = "pom";
+  };
+
+  sisuInjectGuiceBean_2_1_1 = fetchMaven {
+    version = "2.1.1";
+    baseName = "guice-bean";
+    package = "/org/sonatype/sisu/inject";
+    sha512 = "2arva9197d03whnavfspz8wm7fw8iqrhacp10984lxwig221m34p5bb9vmhn8bbswf7d8whzf9q5lsq9mxbmd2c90kc1m7n7qja6qq5";
+    type = "pom";
+  };
+
+  sisuInjectGuicePlexus_2_1_1 = fetchMaven {
+    version = "2.1.1";
+    baseName = "guice-plexus";
+    package = "/org/sonatype/sisu/inject";
+    sha512 = "0gspz9n6vbnlbx33xynm4sg0wxlr89i8490gcl0y0qw6mvjjqfwv1dqgncm9xp41mb21i00gxq0ml6d4wfr0sdayk9m736b826lrvq4";
+    type = "pom";
+  };
+
+  sisuParent_2_1_1 = fetchMaven {
+    version = "2.1.1";
+    baseName = "sisu-parent";
+    package = "/org/sonatype/sisu";
+    sha512 = "2z006ib6azrxf5s02ixv5plc1db0rglnv2m8k4il0s144v63ay98wjxawcc1chld64iribhhby6wnlv2fxvv8sl9mr03qb2q2isflgc";
+    type = "pom";
+  };
+
   slf4jApi_1_5_6 = fetchMaven {
     version = "1.5.6";
     baseName = "slf4j-api";
@@ -593,6 +689,14 @@ rec {
     type = "pom";
   };
 
+  sonatypeForgeParent_7 = fetchMaven {
+    version = "7";
+    baseName = "forge-parent";
+    package = "/org/sonatype/forge";
+    sha512 = "3l6c336cm6wnrw2l7lr0wg83w1304bggvw4qydh5bqbbyfpdgwqa3pbfkq4x760k3wqwarnlpf31fz2dp6abrynjl4rr1lv68j1hhyn";
+    type = "pom";
+  };
+
   sonatypeForgeParent_10 = fetchMaven {
     version = "10";
     baseName = "forge-parent";
diff --git a/pkgs/development/java-modules/sisu/guice.nix b/pkgs/development/java-modules/sisu/guice.nix
new file mode 100644
index 00000000000..9fb70fad446
--- /dev/null
+++ b/pkgs/development/java-modules/sisu/guice.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  sisuGuice_2_9_4 = map (obj: fetchMaven {
+    version = "2.9.4";
+    baseName = "sisu-guice";
+    package = "/org/sonatype/sisu";
+    suffix = "-no_aop";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1529vg4r0gy3ss68lprkdf13r79r0lng4iyx68gj94cf806li9kayi9p2byl6axbx174cvam9w3l90qcdsdz14vrvm163b2r8sq927m"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/pkgs/development/java-modules/sisu/inject-bean.nix
new file mode 100644
index 00000000000..fba7130cfbd
--- /dev/null
+++ b/pkgs/development/java-modules/sisu/inject-bean.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  sisuInjectBean_2_1_1 = map (obj: fetchMaven {
+    version = "2.1.1";
+    baseName = "sisu-inject-bean";
+    package = "/org/sonatype/sisu";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0cqplf149dlqyqwaqk3bjlki97fbnav57vv5d9kkd2lvdradp7k89m5niwg5qgsfdlj91zidgrrkls5vyr4dcdy3lhxs1wyr4y8r0qb"; }
+    { type = "pom"; sha512 = "39dwwfh1p56crmx187wbm2kskxbcr0dfysdvqiwjfx91yhh64l9672axi28hdaw1qd5dh6whzxfqqlfjac94r37wv6fq5pkx6acp2dn"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/pkgs/development/java-modules/sisu/inject-plexus.nix
new file mode 100644
index 00000000000..73335ec951e
--- /dev/null
+++ b/pkgs/development/java-modules/sisu/inject-plexus.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  sisuInjectPlexus_2_1_1 = map (obj: fetchMaven {
+    version = "2.1.1";
+    baseName = "sisu-inject-plexus";
+    package = "/org/sonatype/sisu";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0qklkc024xc58ayl6503ig1yhpsvhxk5fc9vfb7xny9v8w2ds3f9yvd275n8iyy6iza0kj8xlk0clq1i50k96j11lf401r2vcfnk69g"; }
+    { type = "pom"; sha512 = "1fcpyrjz82v0lncyndrw61bb1p9kxzlikiw6qk2v71zgfz2cggw694g26nxsppab2d1ps689sijb9i934vf5bpkdvkc52ipbc43jwr4"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/xerces/impl.nix b/pkgs/development/java-modules/xerces/impl.nix
new file mode 100644
index 00000000000..7b04e21f50e
--- /dev/null
+++ b/pkgs/development/java-modules/xerces/impl.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  xercesImpl_2_8_0 = map (obj: fetchMaven {
+    version = "2.8.0";
+    baseName = "xercesImpl";
+    package = "/xerces";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "09nwhb52g4ak92l8d0aymasbgjxmk4s7vp7i55l38x21zq1plxxkdp2sdk110qyg5mw06y433v28fm867jybpca8zrx51w4g7wg0w2y"; }
+    { type = "pom"; sha512 = "3lv2zqm25mmirazrpp53dicd3ficy32mdr3r7bc7xhmjky2r0051vzh5k0c01rwlb4kx0rinysxw9k20ml96ivw6ipwlrvpxjwgb74f"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/pkgs/development/java-modules/xml-apis/default.nix
new file mode 100644
index 00000000000..44044a35a57
--- /dev/null
+++ b/pkgs/development/java-modules/xml-apis/default.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  xmlApis_1_3_03 = map (obj: fetchMaven {
+    version = "1.3.03";
+    baseName = "xml-apis";
+    package = "/xml-apis";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2sx6rm0lgzidcq1q81gnwxcj1himyny986ys6r60r3ws1p4bgxprargh5fdrmkp90djqzvy6d5b0sa0zfg1r9spynjbc8rjbr6agys9"; }
+    { type = "pom"; sha512 = "2n2pjaclvgllb8nzqkibvp1pida7sr9kmz0ngmsdrpk7sh5wrh32ri82gdj5l9mc1z88dwjyn1ydz6aazw36gdqqdwj3ba1mqs6pqmh"; }
+  ];
+}
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index fac982b5be2..2865418eb92 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -13,6 +13,12 @@ in {
   inherit (callPackage ../development/java-modules/eclipse/aether-util.nix { inherit fetchMaven; })
     aetherUtil_0_9_0_M2;
 
+  inherit (callPackage ../development/java-modules/apache/ant.nix { inherit fetchMaven; })
+    ant_1_8_2;
+
+  inherit (callPackage ../development/java-modules/apache/ant-launcher.nix { inherit fetchMaven; })
+    antLauncher_1_8_2;
+
   inherit (callPackage ../development/java-modules/beanshell/bsh.nix { inherit fetchMaven; })
     bsh_2_0_b4;
 
@@ -23,9 +29,13 @@ in {
   inherit (callPackage ../development/java-modules/apache/commons-cli.nix { inherit fetchMaven; })
     commonsCli_1_0;
 
+  inherit (callPackage ../development/java-modules/apache/commons-io.nix { inherit fetchMaven; })
+    commonsIo_2_1;
+
   inherit (callPackage ../development/java-modules/apache/commons-lang.nix { inherit fetchMaven; })
     commonsLang_2_1
-    commonsLang_2_3;
+    commonsLang_2_3
+    commonsLang_2_6;
 
   inherit (callPackage ../development/java-modules/apache/commons-lang3.nix { inherit fetchMaven; })
     commonsLang3_3_1;
@@ -65,6 +75,7 @@ in {
     mavenArtifactManager_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/common-artifact-filters.nix { inherit fetchMaven; })
+    mavenCommonArtifactFilters_1_2
     mavenCommonArtifactFilters_1_3
     mavenCommonArtifactFilters_1_4;
 
@@ -107,7 +118,8 @@ in {
     mavenMonitor_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/plugin-annotations.nix { inherit fetchMaven; })
-    mavenPluginAnnotations_3_1;
+    mavenPluginAnnotations_3_1
+    mavenPluginAnnotations_3_2;
 
   inherit (callPackage ../development/java-modules/maven/plugin-api.nix { inherit fetchMaven; })
     mavenPluginApi_2_0_6
@@ -136,6 +148,7 @@ in {
     mavenProfile_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; })
+    mavenProject_2_0_1
     mavenProject_2_0_6
     mavenProject_2_0_9
     mavenProject_2_2_1;
@@ -161,17 +174,24 @@ in {
     mavenSharedUtils_0_1;
 
   inherit (callPackage ../development/java-modules/maven/surefire-api.nix { inherit fetchMaven; })
-    mavenSurefireApi_2_12_4;
+    mavenSurefireApi_2_12_4
+    mavenSurefireApi_2_17;
 
   inherit (callPackage ../development/java-modules/maven/surefire-booter.nix { inherit fetchMaven; })
-    mavenSurefireBooter_2_12_4;
+    mavenSurefireBooter_2_12_4
+    mavenSurefireBooter_2_17;
 
   inherit (callPackage ../development/java-modules/maven/surefire-common.nix { inherit fetchMaven; })
-    mavenSurefireCommon_2_12_4;
+    mavenSurefireCommon_2_12_4
+    mavenSurefireCommon_2_17;
 
   inherit (callPackage ../development/java-modules/maven/toolchain.nix { inherit fetchMaven; })
     mavenToolchain_1_0
-    mavenToolchain_2_0_9;
+    mavenToolchain_2_0_9
+    mavenToolchain_2_2_1;
+
+  inherit (callPackage ../development/java-modules/mojo/animal-sniffer.nix { inherit fetchMaven; })
+    mojoAnimalSniffer_1_11;
 
   inherit (callPackage ../development/java-modules/plexus/archiver.nix { inherit fetchMaven; })
     plexusArchiver_2_1;
@@ -180,7 +200,8 @@ in {
     plexusBuildApi_0_0_4;
 
   inherit (callPackage ../development/java-modules/plexus/classworlds.nix { inherit fetchMaven; })
-    plexusClassworlds_2_2_2;
+    plexusClassworlds_2_2_2
+    plexusClassworlds_2_4;
 
   inherit (callPackage ../development/java-modules/plexus/compiler-api.nix { inherit fetchMaven; })
     plexusCompilerApi_2_2;
@@ -224,6 +245,7 @@ in {
     plexusUtils_1_4_5
     plexusUtils_1_5_1
     plexusUtils_1_5_5
+    plexusUtils_1_5_6
     plexusUtils_1_5_8
     plexusUtils_1_5_15
     plexusUtils_2_0_5
@@ -232,6 +254,21 @@ in {
     plexusUtils_3_0_5
     plexusUtils_3_0_8;
 
+  inherit (callPackage ../development/java-modules/sisu/guice.nix { inherit fetchMaven; })
+    sisuGuice_2_9_4;
+
+  inherit (callPackage ../development/java-modules/sisu/inject-bean.nix { inherit fetchMaven; })
+    sisuInjectBean_2_1_1;
+
+  inherit (callPackage ../development/java-modules/sisu/inject-plexus.nix { inherit fetchMaven; })
+    sisuInjectPlexus_2_1_1;
+
   inherit (callPackage ../development/java-modules/apache/xbean-reflect.nix { inherit fetchMaven; })
     xbeanReflect_3_4;
+
+  inherit (callPackage ../development/java-modules/xerces/impl.nix { inherit fetchMaven; })
+    xercesImpl_2_8_0;
+
+  inherit (callPackage ../development/java-modules/xml-apis { inherit fetchMaven; })
+    xmlApis_1_3_03;
 }