javaPackages: Use artifactId/groupId

pkgs/development/java-modules/apache/ant-launcher.nix

@@ -3,8 +3,8 @@
 rec {
   antLauncher_1_8_2 = map (obj: fetchMaven {
     version = "1.8.2";
-    baseName = "ant-launcher";
-    package = "/org/apache/ant";
+    artifactId = "ant-launcher";
+    groupId = "org.apache.ant";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/apache/ant.nix

@@ -3,8 +3,8 @@
 rec {
   ant_1_8_2 = map (obj: fetchMaven {
     version = "1.8.2";
-    baseName = "ant";
-    package = "/org/apache/ant";
+    artifactId = "ant";
+    groupId = "org.apache.ant";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/apache/commons-cli.nix

@@ -3,8 +3,8 @@
 rec {
   commonsCli_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "commons-cli";
-    package = "/commons-cli";
+    artifactId = "commons-cli";
+    groupId = "commons-cli";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   commonsCli_1_2 = map (obj: fetchMaven {
     version = "1.2";
-    baseName = "commons-cli";
-    package = "/commons-cli";
+    artifactId = "commons-cli";
+    groupId = "commons-cli";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/apache/commons-io.nix

@@ -3,8 +3,8 @@
 rec {
   commonsIo_2_1 = map (obj: fetchMaven {
     version = "2.1";
-    baseName = "commons-io";
-    package = "/commons-io";
+    artifactId = "commons-io";
+    groupId = "commons-io";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/apache/commons-lang.nix

@@ -3,8 +3,8 @@
 rec {
   commonsLang_2_1 = map (obj: fetchMaven {
     version = "2.1";
-    baseName = "commons-lang";
-    package = "/commons-lang";
+    artifactId = "commons-lang";
+    groupId = "commons-lang";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   commonsLang_2_3 = map (obj: fetchMaven {
     version = "2.3";
-    baseName = "commons-lang";
-    package = "/commons-lang";
+    artifactId = "commons-lang";
+    groupId = "commons-lang";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   commonsLang_2_6 = map (obj: fetchMaven {
     version = "2.6";
-    baseName = "commons-lang";
-    package = "/commons-lang";
+    artifactId = "commons-lang";
+    groupId = "commons-lang";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/apache/commons-lang3.nix

@@ -3,8 +3,8 @@
 rec {
   commonsLang3_3_1 = map (obj: fetchMaven {
     version = "3.1";
-    baseName = "commons-lang3";
-    package = "/org/apache/commons";
+    artifactId = "commons-lang3";
+    groupId = "org.apache.commons";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/apache/commons-logging-api.nix

@@ -3,8 +3,8 @@
 rec {
   commonsLoggingApi_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "commons-logging-api";
-    package = "/commons-logging";
+    artifactId = "commons-logging-api";
+    groupId = "commons-logging";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/apache/xbean-reflect.nix

@@ -3,8 +3,8 @@
 rec {
   xbeanReflect_3_4 = map (obj: fetchMaven {
     version = "3.4";
-    baseName = "xbean-reflect";
-    package = "/org/apache/xbean";
+    artifactId = "xbean-reflect";
+    groupId = "org.apache.xbean";
     sha512 = obj.sha512;
     type = obj.type;
   }) [