javaPackages: Use artifactId/groupId

author: Tim Steinbach <tim@nequissimus.com> 2016-11-16 12:39:59 -0500
committer: Tim Steinbach <tim@nequissimus.com> 2017-02-13 18:40:13 -0500
commit: 8a7a44c9181217e3640534b49b7a135023d22890 (patch)
tree: 9124a1770522de78230acf5751b6e7ac3d6f78ab /pkgs/development/java-modules
parent: 82c1ff501aec3f625ad423c795e53fbe5ea761be (diff)
download: nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar
nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar.gz
nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar.bz2
nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar.lz
nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar.xz
nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar.zst
nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.zip
72 files changed, 549 insertions, 549 deletions
diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/pkgs/development/java-modules/apache/ant-launcher.nix
index 0e4d7b26765..e6a2b0cae99 100644
--- a/pkgs/development/java-modules/apache/ant-launcher.nix
+++ b/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;
   }) [
diff --git a/pkgs/development/java-modules/apache/ant.nix b/pkgs/development/java-modules/apache/ant.nix
index fa83663f5ec..b4a6aa68f44 100644
--- a/pkgs/development/java-modules/apache/ant.nix
+++ b/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;
   }) [
diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix
index ffad5632b0a..050d511b0a1 100644
--- a/pkgs/development/java-modules/apache/commons-cli.nix
+++ b/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;
   }) [
diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/pkgs/development/java-modules/apache/commons-io.nix
index 612dcb85f8e..70ce940ccf1 100644
--- a/pkgs/development/java-modules/apache/commons-io.nix
+++ b/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;
   }) [
diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix
index f6dc6b407ef..a2d71e9db0c 100644
--- a/pkgs/development/java-modules/apache/commons-lang.nix
+++ b/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;
   }) [
diff --git a/pkgs/development/java-modules/apache/commons-lang3.nix b/pkgs/development/java-modules/apache/commons-lang3.nix
index 8b5498f362d..63f68b92543 100644
--- a/pkgs/development/java-modules/apache/commons-lang3.nix
+++ b/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;
   }) [
diff --git a/pkgs/development/java-modules/apache/commons-logging-api.nix b/pkgs/development/java-modules/apache/commons-logging-api.nix
index 9aae04e4206..47750abe462 100644
--- a/pkgs/development/java-modules/apache/commons-logging-api.nix
+++ b/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;
   }) [
diff --git a/pkgs/development/java-modules/apache/xbean-reflect.nix b/pkgs/development/java-modules/apache/xbean-reflect.nix
index c1e9916443c..f0614ec99e3 100644
--- a/pkgs/development/java-modules/apache/xbean-reflect.nix
+++ b/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;
   }) [
diff --git a/pkgs/development/java-modules/beanshell/bsh.nix b/pkgs/development/java-modules/beanshell/bsh.nix
index e636fe557ec..41756bb80d5 100644
--- a/pkgs/development/java-modules/beanshell/bsh.nix
+++ b/pkgs/development/java-modules/beanshell/bsh.nix
@@ -3,8 +3,8 @@
 rec {
   bsh_2_0_b4 = map (obj: fetchMaven {
     version = "2.0b4";
-    baseName = "bsh";
-    package = "/org/beanshell";
+    artifactId = "bsh";
+    groupId = "org.beanshell";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix
index 3a85cc4363e..f8bbc07f102 100644
--- a/pkgs/development/java-modules/classworlds/classworlds.nix
+++ b/pkgs/development/java-modules/classworlds/classworlds.nix
@@ -3,8 +3,8 @@
 rec {
   classworlds_1_1_alpha2 = map (obj: fetchMaven {
     version = "1.1-alpha-2";
-    baseName = "classworlds";
-    package = "/classworlds";
+    artifactId = "classworlds";
+    groupId = "classworlds";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   classworlds_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "classworlds";
-    package = "/classworlds";
+    artifactId = "classworlds";
+    groupId = "classworlds";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/eclipse/aether-util.nix b/pkgs/development/java-modules/eclipse/aether-util.nix
index 33ba3d5edd7..60aac560b9b 100644
--- a/pkgs/development/java-modules/eclipse/aether-util.nix
+++ b/pkgs/development/java-modules/eclipse/aether-util.nix
@@ -3,8 +3,8 @@
 rec {
   aetherUtil_0_9_0_M2 = map (obj: fetchMaven {
     version = "0.9.0.M2";
-    baseName = "aether-util";
-    package = "/org/eclipse/aether";
+    artifactId = "aether-util";
+    groupId = "org.eclipse.aether";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/findbugs/jsr305.nix b/pkgs/development/java-modules/findbugs/jsr305.nix
index 466ce247633..2e842410aaf 100644
--- a/pkgs/development/java-modules/findbugs/jsr305.nix
+++ b/pkgs/development/java-modules/findbugs/jsr305.nix
@@ -3,8 +3,8 @@
 rec {
   findbugsJsr305_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "jsr305";
-    package = "/com/google/code/findbugs";
+    artifactId = "jsr305";
+    groupId = "com.google.code.findbugs";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/google/collections.nix b/pkgs/development/java-modules/google/collections.nix
index 9898ddeaf31..ec874c73e36 100644
--- a/pkgs/development/java-modules/google/collections.nix
+++ b/pkgs/development/java-modules/google/collections.nix
@@ -3,8 +3,8 @@
 rec {
   googleCollections_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "google-collections";
-    package = "/com/google/collections";
+    artifactId = "google-collections";
+    groupId = "com.google.collections";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/pkgs/development/java-modules/hamcrest/all.nix
index 2bba1ac9249..bab9e1b115d 100644
--- a/pkgs/development/java-modules/hamcrest/all.nix
+++ b/pkgs/development/java-modules/hamcrest/all.nix
@@ -3,8 +3,8 @@
 rec {
   hamcrestAll_1_3 = map (obj: fetchMaven {
     version = "1.3";
-    baseName = "hamcrest-all";
-    package = "/org/hamcrest";
+    artifactId = "hamcrest-all";
+    groupId = "org.hamcrest";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix
index 104331f6f13..3842b8c5afa 100644
--- a/pkgs/development/java-modules/hamcrest/core.nix
+++ b/pkgs/development/java-modules/hamcrest/core.nix
@@ -3,8 +3,8 @@
 rec {
   hamcrestCore_1_3 = map (obj: fetchMaven {
     version = "1.3";
-    baseName = "hamcrest-core";
-    package = "/org/hamcrest";
+    artifactId = "hamcrest-core";
+    groupId = "org.hamcrest";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index 2f315fa3161..5017cb39602 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -30,8 +30,8 @@ in rec {
 
   junit_3_8_1 = map (obj: fetchMaven {
     version = "3.8.1";
-    baseName = "junit";
-    package = "/junit";
+    artifactId = "junit";
+    groupId = "junit";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -41,8 +41,8 @@ in rec {
 
   junit_3_8_2 = map (obj: fetchMaven {
     version = "3.8.2";
-    baseName = "junit";
-    package = "/junit";
+    artifactId = "junit";
+    groupId = "junit";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/log4j/default.nix b/pkgs/development/java-modules/log4j/default.nix
index 65aaa41adb1..a8b1ea9f021 100644
--- a/pkgs/development/java-modules/log4j/default.nix
+++ b/pkgs/development/java-modules/log4j/default.nix
@@ -3,8 +3,8 @@
 rec {
   log4j_1_2_12 = map (obj: fetchMaven {
     version = "1.2.12";
-    baseName = "log4j";
-    package = "/log4j";
+    artifactId = "log4j";
+    groupId = "log4j";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix
index 88e8efca1a1..7ebe655580e 100644
--- a/pkgs/development/java-modules/m2install.nix
+++ b/pkgs/development/java-modules/m2install.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
-{ version, baseName, package, sha512, type ? "jar", suffix ? "" }:
+{ version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }:
 
 let
-  name = "${baseName}-${version}";
-  m2Path = "${package}/${baseName}/${version}";
+  name = "${artifactId}-${version}";
+  m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
   m2File = "${name}${suffix}.${type}";
   src = fetchurl rec {
       inherit sha512;
diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix
index ecab1f1e99c..14c5a99d42f 100644
--- a/pkgs/development/java-modules/maven/archiver.nix
+++ b/pkgs/development/java-modules/maven/archiver.nix
@@ -3,8 +3,8 @@
 rec {
   mavenArchiver_2_5 = map (obj: fetchMaven {
     version = "2.5";
-    baseName = "maven-archiver";
-    package = "/org/apache/maven";
+    artifactId = "maven-archiver";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix
index 6d7e0caadfd..0796d066510 100644
--- a/pkgs/development/java-modules/maven/artifact-manager.nix
+++ b/pkgs/development/java-modules/maven/artifact-manager.nix
@@ -3,8 +3,8 @@
 rec {
   mavenArtifactManager_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact-manager";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenArtifactManager_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact-manager";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenArtifactManager_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact-manager";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenArtifactManager_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact-manager";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix
index 224570f910f..bb0e578d5d6 100644
--- a/pkgs/development/java-modules/maven/artifact.nix
+++ b/pkgs/development/java-modules/maven/artifact.nix
@@ -3,8 +3,8 @@
 rec {
   mavenArtifact_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenArtifact_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenArtifact_2_0_8 = map (obj: fetchMaven {
     version = "2.0.8";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenArtifact_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -47,8 +47,8 @@ rec {
 
   mavenArtifact_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -58,8 +58,8 @@ rec {
 
   mavenArtifact_3_0_3 = map (obj: fetchMaven {
     version = "3.0.3";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix
index 3949882f98b..948dbc3baf6 100644
--- a/pkgs/development/java-modules/maven/common-artifact-filters.nix
+++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix
@@ -3,8 +3,8 @@
 rec {
   mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven {
     version = "1.2";
-    baseName = "maven-common-artifact-filters";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-common-artifact-filters";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenCommonArtifactFilters_1_3 = map (obj: fetchMaven {
     version = "1.3";
-    baseName = "maven-common-artifact-filters";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-common-artifact-filters";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenCommonArtifactFilters_1_4 = map (obj: fetchMaven {
     version = "1.4";
-    baseName = "maven-common-artifact-filters";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-common-artifact-filters";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix
index ed3313bba59..5b45f89e9d5 100644
--- a/pkgs/development/java-modules/maven/core.nix
+++ b/pkgs/development/java-modules/maven/core.nix
@@ -3,8 +3,8 @@
 rec {
   mavenCore_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-core";
-    package = "/org/apache/maven";
+    artifactId = "maven-core";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenCore_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-core";
-    package = "/org/apache/maven";
+    artifactId = "maven-core";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenCore_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-core";
-    package = "/org/apache/maven";
+    artifactId = "maven-core";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenCore_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-core";
-    package = "/org/apache/maven";
+    artifactId = "maven-core";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/dependency-tree.nix b/pkgs/development/java-modules/maven/dependency-tree.nix
index cdd626e5848..00d089ea249 100644
--- a/pkgs/development/java-modules/maven/dependency-tree.nix
+++ b/pkgs/development/java-modules/maven/dependency-tree.nix
@@ -3,8 +3,8 @@
 rec {
   mavenDependencyTree_2_1 = map (obj: fetchMaven {
     version = "2.1";
-    baseName = "maven-dependency-tree";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-dependency-tree";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix
index 18ccf4b707a..9fa1051cd80 100644
--- a/pkgs/development/java-modules/maven/doxia-sink-api.nix
+++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix
@@ -3,8 +3,8 @@
 rec {
   mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven {
     version = "1.0-alpha-6";
-    baseName = "doxia-sink-api";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia-sink-api";
+    groupId = "org.apache.maven.doxia";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenDoxiaSinkApi_1_0_alpha7 = map (obj: fetchMaven {
     version = "1.0-alpha-7";
-    baseName = "doxia-sink-api";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia-sink-api";
+    groupId = "org.apache.maven.doxia";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenDoxiaSinkApi_1_0_alpha10 = map (obj: fetchMaven {
     version = "1.0-alpha-10";
-    baseName = "doxia-sink-api";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia-sink-api";
+    groupId = "org.apache.maven.doxia";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/enforcer.nix b/pkgs/development/java-modules/maven/enforcer.nix
index 83037e6adee..014f678bc14 100644
--- a/pkgs/development/java-modules/maven/enforcer.nix
+++ b/pkgs/development/java-modules/maven/enforcer.nix
@@ -3,8 +3,8 @@
 rec {
   mavenEnforcerApi_1_3_1 = map (obj: fetchMaven {
     version = "1.3.1";
-    baseName = "enforcer-api";
-    package = "/org/apache/maven/enforcer";
+    artifactId = "enforcer-api";
+    groupId = "org.apache.maven.enforcer";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenEnforcerRules_1_3_1 = map (obj: fetchMaven {
     version = "1.3.1";
-    baseName = "enforcer-rules";
-    package = "/org/apache/maven/enforcer";
+    artifactId = "enforcer-rules";
+    groupId = "org.apache.maven.enforcer";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix
index 6f22316edc7..80cbf993a60 100644
--- a/pkgs/development/java-modules/maven/error-diagnostics.nix
+++ b/pkgs/development/java-modules/maven/error-diagnostics.nix
@@ -3,8 +3,8 @@
 rec {
   mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    artifactId = "maven-error-diagnostics";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenErrorDiagnostics_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    artifactId = "maven-error-diagnostics";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenErrorDiagnostics_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    artifactId = "maven-error-diagnostics";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenErrorDiagnostics_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    artifactId = "maven-error-diagnostics";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/filtering.nix b/pkgs/development/java-modules/maven/filtering.nix
index 5851a3db195..963d6c6b646 100644
--- a/pkgs/development/java-modules/maven/filtering.nix
+++ b/pkgs/development/java-modules/maven/filtering.nix
@@ -3,8 +3,8 @@
 rec {
   mavenFiltering_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "maven-filtering";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-filtering";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix
index 70bfd34e737..2ae3bfe6034 100644
--- a/pkgs/development/java-modules/maven/model.nix
+++ b/pkgs/development/java-modules/maven/model.nix
@@ -3,8 +3,8 @@
 rec {
   mavenModel_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-model";
-    package = "/org/apache/maven";
+    artifactId = "maven-model";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenModel_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-model";
-    package = "/org/apache/maven";
+    artifactId = "maven-model";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenModel_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-model";
-    package = "/org/apache/maven";
+    artifactId = "maven-model";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenModel_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-model";
-    package = "/org/apache/maven";
+    artifactId = "maven-model";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -47,8 +47,8 @@ rec {
 
   mavenModel_3_0_3 = map (obj: fetchMaven {
     version = "3.0.3";
-    baseName = "maven-model";
-    package = "/org/apache/maven";
+    artifactId = "maven-model";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix
index 0a71d7ba5a4..ce6c7c17694 100644
--- a/pkgs/development/java-modules/maven/monitor.nix
+++ b/pkgs/development/java-modules/maven/monitor.nix
@@ -3,8 +3,8 @@
 rec {
   mavenMonitor_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-monitor";
-    package = "/org/apache/maven";
+    artifactId = "maven-monitor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenMonitor_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-monitor";
-    package = "/org/apache/maven";
+    artifactId = "maven-monitor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenMonitor_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-monitor";
-    package = "/org/apache/maven";
+    artifactId = "maven-monitor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenMonitor_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-monitor";
-    package = "/org/apache/maven";
+    artifactId = "maven-monitor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix
index 6bd8928cf0f..f852cc957a5 100644
--- a/pkgs/development/java-modules/maven/plugin-annotations.nix
+++ b/pkgs/development/java-modules/maven/plugin-annotations.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginAnnotations_3_1 = map (obj: fetchMaven {
     version = "3.1";
-    baseName = "maven-plugin-annotations";
-    package = "/org/apache/maven/plugin-tools";
+    artifactId = "maven-plugin-annotations";
+    groupId = "org.apache.maven.plugin-tools";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenPluginAnnotations_3_2 = map (obj: fetchMaven {
     version = "3.2";
-    baseName = "maven-plugin-annotations";
-    package = "/org/apache/maven/plugin-tools";
+    artifactId = "maven-plugin-annotations";
+    groupId = "org.apache.maven.plugin-tools";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix
index e4d8fbec39b..be9642b0e20 100644
--- a/pkgs/development/java-modules/maven/plugin-api.nix
+++ b/pkgs/development/java-modules/maven/plugin-api.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginApi_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-plugin-api";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-api";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenPluginApi_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-plugin-api";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-api";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenPluginApi_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-plugin-api";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-api";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenPluginApi_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-plugin-api";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-api";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -47,8 +47,8 @@ rec {
 
   mavenPluginApi_3_0_3 = map (obj: fetchMaven {
     version = "3.0.3";
-    baseName = "maven-plugin-api";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-api";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix
index 76f1bf5de1b..dbdc09a4673 100644
--- a/pkgs/development/java-modules/maven/plugin-descriptor.nix
+++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-descriptor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenPluginDescriptor_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-descriptor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenPluginDescriptor_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-descriptor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenPluginDescriptor_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-descriptor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
index f3ef7c7fc5b..9e11c0f4082 100644
--- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
+++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-parameter-documenter";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenPluginParameterDocumenter_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-parameter-documenter";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenPluginParameterDocumenter_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-parameter-documenter";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenPluginParameterDocumenter_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-parameter-documenter";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix
index b75806182cf..f0074ef816e 100644
--- a/pkgs/development/java-modules/maven/plugin-registry.nix
+++ b/pkgs/development/java-modules/maven/plugin-registry.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginRegistry_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-registry";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenPluginRegistry_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-registry";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenPluginRegistry_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-registry";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenPluginRegistry_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-registry";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
index 754bcc08031..a65f1962048 100644
--- a/pkgs/development/java-modules/maven/plugin-testing-harness.nix
+++ b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginTestingHarness_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "maven-plugin-testing-harness";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-plugin-testing-harness";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix
index b160fb4e943..6940fafae82 100644
--- a/pkgs/development/java-modules/maven/profile.nix
+++ b/pkgs/development/java-modules/maven/profile.nix
@@ -3,8 +3,8 @@
 rec {
   mavenProfile_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-profile";
-    package = "/org/apache/maven";
+    artifactId = "maven-profile";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenProfile_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-profile";
-    package = "/org/apache/maven";
+    artifactId = "maven-profile";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenProfile_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-profile";
-    package = "/org/apache/maven";
+    artifactId = "maven-profile";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenProfile_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-profile";
-    package = "/org/apache/maven";
+    artifactId = "maven-profile";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix
index f1ff4f05c4c..0b07d8b8679 100644
--- a/pkgs/development/java-modules/maven/project.nix
+++ b/pkgs/development/java-modules/maven/project.nix
@@ -3,8 +3,8 @@
 rec {
   mavenProject_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-project";
-    package = "/org/apache/maven";
+    artifactId = "maven-project";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenProject_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-project";
-    package = "/org/apache/maven";
+    artifactId = "maven-project";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenProject_2_0_8 = map (obj: fetchMaven {
     version = "2.0.8";
-    baseName = "maven-project";
-    package = "/org/apache/maven";
+    artifactId = "maven-project";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenProject_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-project";
-    package = "/org/apache/maven";
+    artifactId = "maven-project";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -47,8 +47,8 @@ rec {
 
   mavenProject_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-project";
-    package = "/org/apache/maven";
+    artifactId = "maven-project";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix
index afb949d79c5..8a508cf1505 100644
--- a/pkgs/development/java-modules/maven/reporting-api.nix
+++ b/pkgs/development/java-modules/maven/reporting-api.nix
@@ -3,8 +3,8 @@
 rec {
   mavenReportingApi_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting-api";
+    groupId = "org.apache.maven.reporting";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenReportingApi_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting-api";
+    groupId = "org.apache.maven.reporting";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenReportingApi_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting-api";
+    groupId = "org.apache.maven.reporting";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenReportingApi_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting-api";
+    groupId = "org.apache.maven.reporting";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix
index 1ed2717ac4f..443a1acd451 100644
--- a/pkgs/development/java-modules/maven/repository-metadata.nix
+++ b/pkgs/development/java-modules/maven/repository-metadata.nix
@@ -3,8 +3,8 @@
 rec {
   mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    artifactId = "maven-repository-metadata";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenRepositoryMetadata_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    artifactId = "maven-repository-metadata";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenRepositoryMetadata_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    artifactId = "maven-repository-metadata";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenRepositoryMetadata_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    artifactId = "maven-repository-metadata";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix
index a18532fa362..6b42082cfd8 100644
--- a/pkgs/development/java-modules/maven/settings.nix
+++ b/pkgs/development/java-modules/maven/settings.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSettings_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-settings";
-    package = "/org/apache/maven";
+    artifactId = "maven-settings";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenSettings_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-settings";
-    package = "/org/apache/maven";
+    artifactId = "maven-settings";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenSettings_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-settings";
-    package = "/org/apache/maven";
+    artifactId = "maven-settings";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenSettings_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-settings";
-    package = "/org/apache/maven";
+    artifactId = "maven-settings";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/shared-incremental.nix b/pkgs/development/java-modules/maven/shared-incremental.nix
index 2d4ec372be4..67c44986d0a 100644
--- a/pkgs/development/java-modules/maven/shared-incremental.nix
+++ b/pkgs/development/java-modules/maven/shared-incremental.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSharedIncremental_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "maven-shared-incremental";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-incremental";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/shared-utils.nix b/pkgs/development/java-modules/maven/shared-utils.nix
index 9b56075383d..b3cfc928091 100644
--- a/pkgs/development/java-modules/maven/shared-utils.nix
+++ b/pkgs/development/java-modules/maven/shared-utils.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSharedUtils_0_1 = map (obj: fetchMaven {
     version = "0.1";
-    baseName = "maven-shared-utils";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-utils";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix
index cd422bbb758..c1f7fcc3f76 100644
--- a/pkgs/development/java-modules/maven/surefire-api.nix
+++ b/pkgs/development/java-modules/maven/surefire-api.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSurefireApi_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "surefire-api";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-api";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenSurefireApi_2_17 = map (obj: fetchMaven {
     version = "2.17";
-    baseName = "surefire-api";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-api";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix
index f7fb8068a26..b62aa86bf45 100644
--- a/pkgs/development/java-modules/maven/surefire-booter.nix
+++ b/pkgs/development/java-modules/maven/surefire-booter.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSurefireBooter_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "surefire-booter";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-booter";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenSurefireBooter_2_17 = map (obj: fetchMaven {
     version = "2.17";
-    baseName = "surefire-booter";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-booter";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix
index 4e56b0c5a86..bc0573f6b70 100644
--- a/pkgs/development/java-modules/maven/surefire-common.nix
+++ b/pkgs/development/java-modules/maven/surefire-common.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSurefireCommon_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "maven-surefire-common";
-    package = "/org/apache/maven/surefire";
+    artifactId = "maven-surefire-common";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenSurefireCommon_2_17 = map (obj: fetchMaven {
     version = "2.17";
-    baseName = "maven-surefire-common";
-    package = "/org/apache/maven/surefire";
+    artifactId = "maven-surefire-common";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/pkgs/development/java-modules/maven/surefire-junit4.nix
index 83aaebc7f6d..1374080d087 100644
--- a/pkgs/development/java-modules/maven/surefire-junit4.nix
+++ b/pkgs/development/java-modules/maven/surefire-junit4.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "surefire-junit4";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-junit4";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix
index 97ea74a5e52..864d3b98f7b 100644
--- a/pkgs/development/java-modules/maven/toolchain.nix
+++ b/pkgs/development/java-modules/maven/toolchain.nix
@@ -3,8 +3,8 @@
 rec {
   mavenToolchain_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "maven-toolchain";
-    package = "/org/apache/maven";
+    artifactId = "maven-toolchain";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenToolchain_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-toolchain";
-    package = "/org/apache/maven";
+    artifactId = "maven-toolchain";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenToolchain_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-toolchain";
-    package = "/org/apache/maven";
+    artifactId = "maven-toolchain";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix
index 5cd022b6837..e9ce5b1ce8c 100644
--- a/pkgs/development/java-modules/mavenPlugins.nix
+++ b/pkgs/development/java-modules/mavenPlugins.nix
@@ -10,8 +10,8 @@ in rec {
 
   animalSniffer_1_11 = map (obj: fetchMaven {
     version = "1.11";
-    baseName = "animal-sniffer-maven-plugin";
-    package = "/org/codehaus/mojo";
+    artifactId = "animal-sniffer-maven-plugin";
+    groupId = "org.codehaus.mojo";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -21,8 +21,8 @@ in rec {
 
   mavenClean_2_5 = map (obj: fetchMaven rec {
     version = "2.5";
-    baseName = "maven-clean-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-clean-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -32,8 +32,8 @@ in rec {
 
   mavenCompiler_3_1 = map (obj: fetchMaven rec {
     version = "3.1";
-    baseName = "maven-compiler-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-compiler-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -43,8 +43,8 @@ in rec {
 
   mavenEnforcer_1_3_1 = map (obj: fetchMaven rec {
     version = "1.3.1";
-    baseName = "maven-enforcer-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-enforcer-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -54,8 +54,8 @@ in rec {
 
   mavenInstall_2_4 = map (obj: fetchMaven rec {
     version = "2.4";
-    baseName = "maven-install-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-install-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -65,8 +65,8 @@ in rec {
 
   mavenJar_2_4 = map (obj: fetchMaven rec {
     version = "2.4";
-    baseName = "maven-jar-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-jar-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -76,8 +76,8 @@ in rec {
 
   mavenReplacer_1_5_3 = map (obj: fetchMaven rec {
     version = "1.5.3";
-    baseName = "replacer";
-    package = "/com/google/code/maven-replacer-plugin";
+    artifactId = "replacer";
+    groupId = "com.google.code.maven-replacer-plugin";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -87,8 +87,8 @@ in rec {
 
   mavenResources_2_6 = map (obj: fetchMaven rec {
     version = "2.6";
-    baseName = "maven-resources-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-resources-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -98,8 +98,8 @@ in rec {
 
   mavenSurefire_2_12_4 = map (obj: fetchMaven rec {
     version = "2.12.4";
-    baseName = "maven-surefire-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-surefire-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -109,8 +109,8 @@ in rec {
 
   mavenSurefire_2_17 = map (obj: fetchMaven rec {
     version = "2.17";
-    baseName = "maven-surefire-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-surefire-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/pkgs/development/java-modules/mojo/animal-sniffer.nix
index b6a5565f6fc..dd9b1d1b0aa 100644
--- a/pkgs/development/java-modules/mojo/animal-sniffer.nix
+++ b/pkgs/development/java-modules/mojo/animal-sniffer.nix
@@ -3,8 +3,8 @@
 rec {
   mojoAnimalSniffer_1_11 = map (obj: fetchMaven {
     version = "1.11";
-    baseName = "animal-sniffer";
-    package = "/org/codehaus/mojo";
+    artifactId = "animal-sniffer";
+    groupId = "org.codehaus.mojo";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
index 95eb52ae3e8..245daa5fdb9 100644
--- a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
+++ b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
@@ -3,8 +3,8 @@
 rec {
   mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven {
     version = "1.11";
-    baseName = "java-boot-classpath-detector";
-    package = "/org/codehaus/mojo";
+    artifactId = "java-boot-classpath-detector";
+    groupId = "org.codehaus.mojo";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/pkgs/development/java-modules/ow2/asm-all.nix
index 2fee6529f16..08d18745ed7 100644
--- a/pkgs/development/java-modules/ow2/asm-all.nix
+++ b/pkgs/development/java-modules/ow2/asm-all.nix
@@ -3,8 +3,8 @@
 rec {
   ow2AsmAll_4_0 = map (obj: fetchMaven {
     version = "4.0";
-    baseName = "asm-all";
-    package = "/org/ow2/asm";
+    artifactId = "asm-all";
+    groupId = "org.ow2.asm";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix
index 3a2b0a347e3..384b9285976 100644
--- a/pkgs/development/java-modules/plexus/archiver.nix
+++ b/pkgs/development/java-modules/plexus/archiver.nix
@@ -3,8 +3,8 @@
 rec {
   plexusArchiver_1_0_alpha7 = map (obj: fetchMaven {
     version = "1.0-alpha-7";
-    baseName = "plexus-archiver";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-archiver";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   plexusArchiver_2_1 = map (obj: fetchMaven {
     version = "2.1";
-    baseName = "plexus-archiver";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-archiver";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/build-api.nix b/pkgs/development/java-modules/plexus/build-api.nix
index 2425a6f12ba..c417c955b69 100644
--- a/pkgs/development/java-modules/plexus/build-api.nix
+++ b/pkgs/development/java-modules/plexus/build-api.nix
@@ -3,8 +3,8 @@
 rec {
   plexusBuildApi_0_0_4 = map (obj: fetchMaven {
     version = "0.0.4";
-    baseName = "plexus-build-api";
-    package = "/org/sonatype/plexus";
+    artifactId = "plexus-build-api";
+    groupId = "org.sonatype.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix
index 308287a2904..6ff1755e8f5 100644
--- a/pkgs/development/java-modules/plexus/classworlds.nix
+++ b/pkgs/development/java-modules/plexus/classworlds.nix
@@ -3,8 +3,8 @@
 rec {
   plexusClassworlds_2_2_2 = map (obj: fetchMaven {
     version = "2.2.2";
-    baseName = "plexus-classworlds";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-classworlds";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   plexusClassworlds_2_4 = map (obj: fetchMaven {
     version = "2.4";
-    baseName = "plexus-classworlds";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-classworlds";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix
index 2ef5d3cdab1..11baab0950d 100644
--- a/pkgs/development/java-modules/plexus/compiler-api.nix
+++ b/pkgs/development/java-modules/plexus/compiler-api.nix
@@ -3,8 +3,8 @@
 rec {
   plexusCompilerApi_2_2 = map (obj: fetchMaven {
     version = "2.2";
-    baseName = "plexus-compiler-api";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-compiler-api";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix
index e3f4defd97a..a42064a0e9e 100644
--- a/pkgs/development/java-modules/plexus/compiler-javac.nix
+++ b/pkgs/development/java-modules/plexus/compiler-javac.nix
@@ -3,8 +3,8 @@
 rec {
   plexusCompilerJavac_2_2 = map (obj: fetchMaven {
     version = "2.2";
-    baseName = "plexus-compiler-javac";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-compiler-javac";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix
index 0675fff5004..f7221a96627 100644
--- a/pkgs/development/java-modules/plexus/compiler-manager.nix
+++ b/pkgs/development/java-modules/plexus/compiler-manager.nix
@@ -3,8 +3,8 @@
 rec {
   plexusCompilerManager_2_2 = map (obj: fetchMaven {
     version = "2.2";
-    baseName = "plexus-compiler-manager";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-compiler-manager";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/component-annotations.nix b/pkgs/development/java-modules/plexus/component-annotations.nix
index 949238001be..fd3fc80e7e0 100644
--- a/pkgs/development/java-modules/plexus/component-annotations.nix
+++ b/pkgs/development/java-modules/plexus/component-annotations.nix
@@ -3,8 +3,8 @@
 rec {
   plexusComponentAnnotations_1_5_5 = map (obj: fetchMaven {
     version = "1.5.5";
-    baseName = "plexus-component-annotations";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-component-annotations";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix
index 4b9949f3eb3..375a1913afc 100644
--- a/pkgs/development/java-modules/plexus/container-default.nix
+++ b/pkgs/development/java-modules/plexus/container-default.nix
@@ -3,8 +3,8 @@
 rec {
   plexusContainerDefault_1_0_alpha9 = map (obj: fetchMaven {
     version = "1.0-alpha-9";
-    baseName = "plexus-container-default";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-container-default";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   plexusContainerDefault_1_0_alpha9_stable1 = map (obj: fetchMaven {
     version = "1.0-alpha-9-stable-1";
-    baseName = "plexus-container-default";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-container-default";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   plexusContainerDefault_1_5_5 = map (obj: fetchMaven {
     version = "1.5.5";
-    baseName = "plexus-container-default";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-container-default";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/digest.nix b/pkgs/development/java-modules/plexus/digest.nix
index 8bd73891779..be2013a2676 100644
--- a/pkgs/development/java-modules/plexus/digest.nix
+++ b/pkgs/development/java-modules/plexus/digest.nix
@@ -3,8 +3,8 @@
 rec {
   plexusDigest_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "plexus-digest";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-digest";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/i18n.nix b/pkgs/development/java-modules/plexus/i18n.nix
index 7af0cd17de8..5b34cde0503 100644
--- a/pkgs/development/java-modules/plexus/i18n.nix
+++ b/pkgs/development/java-modules/plexus/i18n.nix
@@ -3,8 +3,8 @@
 rec {
   plexusI18n_1_0_beta6 = map (obj: fetchMaven {
     version = "1.0-beta-6";
-    baseName = "plexus-i18n";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-i18n";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/interactivity-api.nix b/pkgs/development/java-modules/plexus/interactivity-api.nix
index 9d62aec70f4..8ada106f48f 100644
--- a/pkgs/development/java-modules/plexus/interactivity-api.nix
+++ b/pkgs/development/java-modules/plexus/interactivity-api.nix
@@ -3,8 +3,8 @@
 rec {
   plexusInteractivityApi_1_0_alpha4 = map (obj: fetchMaven {
     version = "1.0-alpha-4";
-    baseName = "plexus-interactivity-api";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-interactivity-api";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix
index 2d08495532d..90ff3de6a3f 100644
--- a/pkgs/development/java-modules/plexus/interpolation.nix
+++ b/pkgs/development/java-modules/plexus/interpolation.nix
@@ -3,8 +3,8 @@
 rec {
   plexusInterpolation_1_11 = map (obj: fetchMaven {
     version = "1.11";
-    baseName = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-interpolation";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   plexusInterpolation_1_12 = map (obj: fetchMaven {
     version = "1.12";
-    baseName = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-interpolation";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   plexusInterpolation_1_13 = map (obj: fetchMaven {
     version = "1.13";
-    baseName = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-interpolation";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   plexusInterpolation_1_15 = map (obj: fetchMaven {
     version = "1.15";
-    baseName = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-interpolation";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/io.nix b/pkgs/development/java-modules/plexus/io.nix
index 1b17ae3c2ca..eee41f5ed2f 100644
--- a/pkgs/development/java-modules/plexus/io.nix
+++ b/pkgs/development/java-modules/plexus/io.nix
@@ -3,8 +3,8 @@
 rec {
   plexusIo_2_0_2 = map (obj: fetchMaven {
     version = "2.0.2";
-    baseName = "plexus-io";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-io";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix
index ca46c0d4d62..ce0537cea7d 100644
--- a/pkgs/development/java-modules/plexus/utils.nix
+++ b/pkgs/development/java-modules/plexus/utils.nix
@@ -3,8 +3,8 @@
 rec {
   plexusUtils_1_0_4 = map (obj: fetchMaven {
     version = "1.0.4";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   plexusUtils_1_0_5 = map (obj: fetchMaven {
     version = "1.0.5";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   plexusUtils_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   plexusUtils_1_4_1 = map (obj: fetchMaven {
     version = "1.4.1";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -47,8 +47,8 @@ rec {
 
   plexusUtils_1_4_5 = map (obj: fetchMaven {
     version = "1.4.5";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -58,8 +58,8 @@ rec {
 
   plexusUtils_1_4_9 = map (obj: fetchMaven {
     version = "1.4.9";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -69,8 +69,8 @@ rec {
 
   plexusUtils_1_5_1 = map (obj: fetchMaven {
     version = "1.5.1";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -80,8 +80,8 @@ rec {
 
   plexusUtils_1_5_5 = map (obj: fetchMaven {
     version = "1.5.5";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -91,8 +91,8 @@ rec {
 
   plexusUtils_1_5_6 = map (obj: fetchMaven {
     version = "1.5.6";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -102,8 +102,8 @@ rec {
 
   plexusUtils_1_5_8 = map (obj: fetchMaven {
     version = "1.5.8";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -113,8 +113,8 @@ rec {
 
   plexusUtils_1_5_15 = map (obj: fetchMaven {
     version = "1.5.15";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -124,8 +124,8 @@ rec {
 
   plexusUtils_2_0_5 = map (obj: fetchMaven {
     version = "2.0.5";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -135,8 +135,8 @@ rec {
 
   plexusUtils_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -146,8 +146,8 @@ rec {
 
   plexusUtils_3_0 = map (obj: fetchMaven {
     version = "3.0";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -157,8 +157,8 @@ rec {
 
   plexusUtils_3_0_5 = map (obj: fetchMaven {
     version = "3.0.5";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -168,8 +168,8 @@ rec {
 
   plexusUtils_3_0_8 = map (obj: fetchMaven {
     version = "3.0.8";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index 7feff9548a1..610f98a7e46 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -3,848 +3,848 @@
 rec {
   aether_0_9_0_M2 = fetchMaven {
     version = "0.9.0.M2";
-    baseName = "aether";
-    package = "/org/eclipse/aether";
+    artifactId = "aether";
+    groupId = "org.eclipse.aether";
     sha512 = "0ampl2jkkc1f5cbigmi1b5nnxhb9qqzz0nyfb5a2vzbw3ri7ry8dj6xgjznlpxib46zxgaxcsvhxq2yx6a9i8chnzvgghccwpl808yi";
     type = "pom";
   };
 
   animalSnifferParent_1_11 = fetchMaven {
     version = "1.11";
-    baseName = "animal-sniffer-parent";
-    package = "/org/codehaus/mojo";
+    artifactId = "animal-sniffer-parent";
+    groupId = "org.codehaus.mojo";
     sha512 = "3w9l3b4qxzmlwmaqppn1d794ycqf5piilv44fc74jccbgahdsq1as8dvyknnj2610yklwxx3146s7f0c3ms8y93alv02wybjwk5fd07";
     type = "pom";
   };
 
   antParent_1_8_2 = fetchMaven {
     version = "1.8.2";
-    baseName = "ant-parent";
-    package = "/org/apache/ant";
+    artifactId = "ant-parent";
+    groupId = "org.apache.ant";
     sha512 = "1q560n9xbqk9qpprvm0nigd5nhm9s8m027qxjmzhay083sjrazscpaly4mzgry5lpdmr3xyhly1r1s88879y04qr5xqzqh0j45j943x";
     type = "pom";
   };
 
   apache_1 = fetchMaven {
     version = "1";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "0vbf7mbs61n13dmxndvzkafr0sg9p7g45ng9j1917cz8a9m4zflqf7xvpp9wfprmb4d1wd3ay2hhy9brxryqmvx41wfjlk9ahg34k0h";
     type = "pom";
   };
 
   apache_3 = fetchMaven {
     version = "3";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "3vvqxycj7zxa9dfxa6f8i2azdvxc7ci68fk3nlkjvhsglmwr39wf6cwgj6qqlrw3mabzs714lgz0wdacsidncadxzfw774ck20dq1rf";
     type = "pom";
   };
 
   apache_4 = fetchMaven {
     version = "4";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6";
     type = "pom";
   };
 
   apache_5 = fetchMaven {
     version = "5";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "11l6b46mwm404vahylssab5mj4a1fw3zrjhsz3mcj5x3awnqa03131j8phias2n0rppn53xcg2p2xgr9mbp7llwabwx8jm0kz2mpgh0";
     type = "pom";
   };
 
   apache_6 = fetchMaven {
     version = "6";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "2nvwk7fhiqcbr4vrwl0d3g4wz25vll24ga9kyc89fzq6b9nr6bqfphrm5a73kdih97l5cqlszw8xc847viw2ss1mwabn590f01ykhj0";
     type = "pom";
   };
 
   apache_7 = fetchMaven {
     version = "7";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "2yvwxxifqypmpgxyx10ggj6l52jnl64f9554kyfdph7z56n02bcalj3cr43m6br0as6yc67k5p23l2k3gvdr66c5dfw1l8rwhahk9lr";
     type = "pom";
   };
 
   apache_9 = fetchMaven {
     version = "9";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "0wak95l7zlizrildiji9763zzs10dmhflxaqzg8r9qw2j8a20f2nmns03skvd8na2p12zzvrxa15p952gdfkvrynmvcv2vi1qz822g9";
     type = "pom";
   };
 
   apache_10 = fetchMaven {
     version = "10";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "0kmva6f2q5rq7rk9ljwn3rxa4w2j7sjkxsmvambzqpj61cagdnq4vj9jk0xxx8448kqckdh5w2xkr5lr33sgfl67jy9l5h2s6h13v6m";
     type = "pom";
   };
 
   apache_11 = fetchMaven {
     version = "11";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "09v6sghdaxinrk3pnpnc36x24z62gqn65v25q83mc0q6n49l0xir55xk21qzc8kc6hrdr9khnr7jxkqz207cyv6wky6sy7c3pqg0na0";
     type = "pom";
   };
 
   apache_13 = fetchMaven {
     version = "13";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "0sf86l1457wwp8czg32xhh96l5nlw8v84lbi59nfdxxzcrsn8b1ysgwda3r1ck0d86c5gjmh3qg7kbwlrspwa71w9zn9sby3bszj99v";
     type = "pom";
   };
 
   asmParent_4_0 = fetchMaven {
     version = "4.0";
-    baseName = "asm-parent";
-    package = "/org/ow2/asm";
+    artifactId = "asm-parent";
+    groupId = "org.ow2.asm";
     sha512 = "2vysz9nn1pn1qzd40n7d2njmcpz7qi37pi73k9ajjmmbzwza6h8gc1pvadfqxlnih47gzc1wn3hqrc1sqd3b84kh8nrznwjcp10y0lf";
     type = "pom";
   };
 
   backportUtilConcurrent_3_1 = fetchMaven {
     version = "3.1";
-    baseName = "backport-util-concurrent";
-    package = "/backport-util-concurrent";
+    artifactId = "backport-util-concurrent";
+    groupId = "backport-util-concurrent";
     sha512 = "38i04cb0dggdjjsvl32wpxfbczl1d696nlpzissjlq9ya197rwa0g0704p7vz71xsylvpdjssb0cyx916xsigcyb95k8c84b2hmdhvr";
     type = "pom";
   };
 
   beanshell_2_0_b4 = fetchMaven {
     version = "2.0b4";
-    baseName = "beanshell";
-    package = "/org/beanshell";
+    artifactId = "beanshell";
+    groupId = "org.beanshell";
     sha512 = "2xwgqmfwli40lvlgjx00ki5zm1290jhjvqg7wnq869kxkw9iam239zxb0jz46jcpbgy10qg6sd86cjw5g38njywcz33501f6byd0n3w";
     type = "pom";
   };
 
   codehausParent_4 = fetchMaven {
     version = "4";
-    baseName = "codehaus-parent";
-    package = "/org/codehaus";
+    artifactId = "codehaus-parent";
+    groupId = "org.codehaus";
     sha512 = "11dacs4155xc3rn3crdayg1yp15abw81lbk6qwi7207009rnyk1kxvs56am9pllkybgja53ri0k084k2ppp4dlhxrg6w3zccbafxlgp";
     type = "pom";
   };
 
   commonsParent_11 = fetchMaven {
     version = "11";
-    baseName = "commons-parent";
-    package = "/org/apache/commons";
+    artifactId = "commons-parent";
+    groupId = "org.apache.commons";
     sha512 = "3986i0mnawni27fqf74zfb1n9wvyn502nvslfmbwz5m3rgvhfdb7r1wj7qz8g3wznfvh3wd99h83d94300yvy6cilqy5sj9gfwxk3jv";
     type = "pom";
   };
 
   commonsParent_17 = fetchMaven {
     version = "17";
-    baseName = "commons-parent";
-    package = "/org/apache/commons";
+    artifactId = "commons-parent";
+    groupId = "org.apache.commons";
     sha512 = "31ijvmfj2yybfy0n4qh7ga8192wg75hs5v26vwm98hgvlppxs9irik4qlqzh4iqq0azp0xl8idz6nn6yb9vzsjxax4c3v5wyk3yvyfy";
     type = "pom";
   };
 
   commonsParent_22 = fetchMaven {
     version = "22";
-    baseName = "commons-parent";
-    package = "/org/apache/commons";
+    artifactId = "commons-parent";
+    groupId = "org.apache.commons";
     sha512 = "1sm8g7iwyc5gi4w73yx3p1f1l81kw8d5wzqzqgdgy7k7hfvmsxlm5r9n99h9r0g5y494ad46hjzf8cwjf8am4rv0qzhrmsqkxyd24wk";
     type = "pom";
   };
 
   doxia_1_0_alpha6 = fetchMaven {
     version = "1.0-alpha-6";
-    baseName = "doxia";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia";
+    groupId = "org.apache.maven.doxia";
     sha512 = "0ya69g2xfzawf30r2n45n85h2bag0ihd2cbkd0896ykwndx62jyagc594f9pkvb8x9vwgq1dkhfc5lfw1sjcmsxm9dmyzvy2nmykpsy";
     type = "pom";
   };
 
   doxia_1_0_alpha7 = fetchMaven {
     version = "1.0-alpha-7";
-    baseName = "doxia";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia";
+    groupId = "org.apache.maven.doxia";
     sha512 = "0fg3l7dyi0c7r1h9rzjn23gv57kc67jpzlcji6yh4nawp3byfbz1rq8wnbj3av3wd29v9h2ff34p06ia9wxbs8q3kz4xy31w7sw7fxg";
     type = "pom";
   };
 
   doxia_1_0_alpha10 = fetchMaven {
     version = "1.0-alpha-10";
-    baseName = "doxia";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia";
+    groupId = "org.apache.maven.doxia";
     sha512 = "3by91czdkjn4myc6xwzap37ydmhvic4myr8p2zflnpawrph00jkz9pivd84k2qykvmc5gxzbmklf1inwvkq1f5bsyhh440mlvsfsn1s";
     type = "pom";
   };
 
   doxia_1_0 = fetchMaven {
     version = "1.0";
-    baseName = "doxia";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia";
+    groupId = "org.apache.maven.doxia";
     sha512 = "3z04h87dwn5panpr68ajzflw5n4wgi98isl5snz6vrd2vz9744fdqggmn6698wljw9h4pzkvjyrxf9b7w4km6w7kma28akvn951vw99";
     type = "pom";
   };
 
   enforcer_1_3_1 = fetchMaven {
     version = "1.3.1";
-    baseName = "enforcer";
-    package = "/org/apache/maven/enforcer";
+    artifactId = "enforcer";
+    groupId = "org.apache.maven.enforcer";
     sha512 = "1m84z5x2gxlbj9bl2jrfzh26pl7nz1d79sv72clp565z4lr2r1abih2c7aigbd95zik948dqrbh2vzm7vp1iv0d23vk89rx4nmfg0rv";
     type = "pom";
   };
 
   googleParent_1 = fetchMaven {
     version = "1";
-    baseName = "google";
-    package = "/com/google";
+    artifactId = "google";
+    groupId = "com.google";
     sha512 = "22whj7li6dvh4xjcdx1hwlh13ar8c8d9snal6ynnbsd566n9g0kif2fx75q5j4kwmqzb2yj3c3vxdfzg82650gkyvjm2x6cb35vdi30";
     type = "pom";
   };
 
   hamcrestParent_1_3 = fetchMaven {
     version = "1.3";
-    baseName = "hamcrest-parent";
-    package = "/org/hamcrest";
+    artifactId = "hamcrest-parent";
+    groupId = "org.hamcrest";
     sha512 = "1da3ivp9n1h3hl35vhgd7avi4xh8p0802qj7xrk93gbz01s2av28p6ycdwiwp7kja0151wm5jvbgpnkxd8azqwkh7dh83w22k7jpwh3";
     type = "pom";
   };
 
   jclOverSlf4j_1_5_6 = fetchMaven {
     version = "1.5.6";
-    baseName = "jcl-over-slf4j";
-    package = "/org/slf4j";
+    artifactId = "jcl-over-slf4j";
+    groupId = "org.slf4j";
     sha512 = "3ync9p7ws4p8p494jifarwpqblmbkkl6r6rw4bms8fk6ija0ifxn6q5za3pxvp690p5lzw2zkgidr51rqxk8w1ms69pb1nib1r4j578";
     type = "pom";
   };
 
   maven_2_0_1 = fetchMaven {
     version = "2.0.1";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "02n3kpll7w5iqaijawmm4rzr35sbv826c9vp1fzfnrgbvpfw22yrsjv2z416pzk2qyjh3wx7pc5xxxxdchmpzcxm694vsdl67ki2rrz";
     type = "pom";
   };
 
   maven_2_0_6 = fetchMaven {
     version = "2.0.6";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "2k58pvcrdc52zsq6id4vl8a45srxllm2m49namqkzix4356haphk3i06px9jcc2cmkqw7bcpqh5xvvmkds5vhp2b9y9b0i2lcfgx8jw";
     type = "pom";
   };
 
   maven_2_0_8 = fetchMaven {
     version = "2.0.8";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "0mzlba0vbanxvdgfvj3kq6xw211j40b6hk6w0b7lc686m2c26vgxks9iisgm10888lq140i6510813326bs9yb053hqfvnz3m72lkss";
     type = "pom";
   };
 
   maven_2_0_9 = fetchMaven {
     version = "2.0.9";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "2b3wfqxbg0v2lm82a7nzw8wzw708isfrnzriy90bk89dhnj59qzpgvwrjbhs26a32gnpii5ivivh1msq51k1b7j5knmyf0hi1v0blw0";
     type = "pom";
   };
 
   maven_2_2_1 = fetchMaven {
     version = "2.2.1";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "1bdf85rb7b3dvw9gjv376pk908jgvb35hs8p6fp4pzp19pj71150if09lmhw07gvy7sdd92daw7jmijmi1f9w4gxhkbqhvzkb7qx1rs";
     type = "pom";
   };
 
   maven_3_0_3 = fetchMaven {
     version = "3.0.3";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "397qqkh9qd2aj346v4nvxrhaqz6k75l5xnm1xcqd0d4mmxg0p7jlz54yzkshqli2w5df9f7p8pavpkiw5xkl8ipxmp87vfcanvkx4x4";
     type = "pom";
   };
 
   mavenParent_5 = fetchMaven {
     version = "5";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "1810h5ziij9awpf2c6sgqlwd93dd3c54rxbnjxar97idw2zkmwqfxvxi74qjcpbqqam3ypxb893k3958jmhbrzmwhwbkhxyyiqgjsx0";
     type = "pom";
   };
 
   mavenParent_6 = fetchMaven {
     version = "6";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "2z9rkv875yx64mpbf1mgyb3hcxqbhr0ndczwqlmkgd05a679d4vyi92fndaz1bcfwc5bmmxf4s6zrg58swv05j2j9d6vqd2b0x385dq";
     type = "pom";
   };
 
   mavenParent_8 = fetchMaven {
     version = "8";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp";
     type = "pom";
   };
 
   mavenParent_11 = fetchMaven {
     version = "11";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "21lz2qb0sl9akirk7fcbj7ldfgnq5nqy90s3hfvmfvz2spk1ppa5yq3702m7z72l3jpbm9vrcm4dvarar314lwjp3477p558gwcpkqf";
     type = "pom";
   };
 
   mavenParent_13 = fetchMaven {
     version = "13";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "0vgjwpmnvcjfif84s5x19ixlxg4413mfma9f10v7klv88b08vwvkpwjnffgzrlqvp5524d8zyswshqkwpdqb0klgppxiipd52d546vw";
     type = "pom";
   };
 
   mavenParent_15 = fetchMaven {
     version = "15";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "390z5v0nygsw075fa5jzl5baxb0bripiiy6arqk550zlg8dw8mcg6cyscwnh3zw4gxyr1qbcy0v8wsj375xc65i2agkzg1qbv5z6xxp";
     type = "pom";
   };
 
   mavenParent_21 = fetchMaven {
     version = "21";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "2dph51qjkmh9sixd12rgxhrvl3w5r7nmr4n3ra4y1lifml6h0md0indj3qw4lxm0db811p3hxf2f9l0gf6w4q5ypjp20lk9ia2xm5s0";
     type = "pom";
   };
 
   mavenParent_22 = fetchMaven {
     version = "22";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "112xv5inpan05vkm12g2lpz37pgga1nm8rar2bqhibvwljg4yv1myx8z99g0nkd3gzbgw5098aagm006w6bnmwsibwd1js8is5d4r88";
     type = "pom";
   };
 
   mavenParent_23 = fetchMaven {
     version = "23";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "3c6ydqi3sf5aq3aj42kxgrjpcf8wpl0rf6hmr6vkas04w0h4dyvjb78ipyxsqzqgzjm6cmdfhxzx8hjb2lwvy3ipf1x39j6cj7dwdy8";
     type = "pom";
   };
 
   mavenPlugins_22 = fetchMaven {
     version = "22";
-    baseName = "maven-plugins";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-plugins";
+    groupId = "org.apache.maven.plugins";
     sha512 = "14xy4s69dvqllkspc5b8q1gdbi0wn494ghwcdfcvjzvgczjhhxbr1h698amv3zmg59gb7liz77ws4vmcar8j9lazywcv13cy1myiywa";
     type = "pom";
   };
 
   mavenPlugins_23 = fetchMaven {
     version = "23";
-    baseName = "maven-plugins";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-plugins";
+    groupId = "org.apache.maven.plugins";
     sha512 = "1vh7izahb4sskja66hqrygv1r8iwpl97kp65yx6z3fnm761brag89fdcl4jl9hypvm57alf283gvq9rsy5kqnqcdki20k5vw26y1b1a";
     type = "pom";
   };
 
   mavenPlugins_24 = fetchMaven {
     version = "24";
-    baseName = "maven-plugins";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-plugins";
+    groupId = "org.apache.maven.plugins";
     sha512 = "07flf37pkkc34466bnzi4rfwdlgvd3ydasm39qzy2hybxv26306zrhipglmgsjvd84z07dscij4n7qdd2jkx9hrkm900hid4xwvxzrs";
     type = "pom";
   };
 
   mavenPluginTools_3_1 = fetchMaven {
     version = "3.1";
-    baseName = "maven-plugin-tools";
-    package = "/org/apache/maven/plugin-tools";
+    artifactId = "maven-plugin-tools";
+    groupId = "org.apache.maven.plugin-tools";
     sha512 = "2410rvvhnpwdg67slwb05v7vnpbvq00d36mbsc77parw4v9n3sr1hqai803g8q54lzv05zzcm7knkjv5ip5wcbvzrh0dr4f5lm904wy";
     type = "pom";
   };
 
   mavenPluginTools_3_2 = fetchMaven {
     version = "3.2";
-    baseName = "maven-plugin-tools";
-    package = "/org/apache/maven/plugin-tools";
+    artifactId = "maven-plugin-tools";
+    groupId = "org.apache.maven.plugin-tools";
     sha512 = "28qhbacsb69rcp86l3lkc3d83267qdwwpl0zm134rxi58wy4y4rd8nz2yzk6yx4x8h0drq776b2qnr4ps1da1ybsvsi2sc655scx3lf";
     type = "pom";
   };
 
   mavenReporting_2_0_1 = fetchMaven {
     version = "2.0.1";
-    baseName = "maven-reporting";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting";
+    groupId = "org.apache.maven.reporting";
     sha512 = "3ns0j0w3g3xzvi4y2nbz7yl3w0bq6npvkpy56c2s2m8z0b0007vw97qm3z7b6iicwck69g9001qqqanhzr35x1qbzlqzrx5v271hvfa";
     type = "pom";
   };
 
   mavenReporting_2_0_6 = fetchMaven {
     version = "2.0.6";
-    baseName = "maven-reporting";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting";
+    groupId = "org.apache.maven.reporting";
     sha512 = "3bi678sg28yxhlby4d3a6mq9fhg1qnjb57kbkhi7dfx9g0c1p6cxhg8cixjz9wv31lkjpspbpp1fq0z29a93lqrjqczlg8a7i1sg554";
     type = "pom";
   };
 
   mavenReporting_2_0_9 = fetchMaven {
     version = "2.0.9";
-    baseName = "maven-reporting";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting";
+    groupId = "org.apache.maven.reporting";
     sha512 = "0cg49pq6rvk7c84xwnpq2p47b7y973sy9qfgzcq06bnrqm6cj26h8k7d9kpp3q3rd2hlw10db4sjfx0crlai27cbbz41i5m22lq21s5";
     type = "pom";
   };
 
   mavenReporting_2_2_1 = fetchMaven {
     version = "2.2.1";
-    baseName = "maven-reporting";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting";
+    groupId = "org.apache.maven.reporting";
     sha512 = "02gs0nk2hihvayh7gxn1ncbq7nq1hbpr40whby6c58adk7g6jq3cn84fi8svcv10w915f696drav1cimjpizcyjn00if1iql59dmfda";
     type = "pom";
   };
 
   mavenSharedComponents_7 = fetchMaven {
     version = "7";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "35zwvraafv86jpyfvfmi76n9bzmahq5z90j9axb3b6d0wfvildz5qb43kw27si2ldwghiwsfh2jikd3gf9ms553pfillf4baab13dp6";
     type = "pom";
   };
 
   mavenSharedComponents_11 = fetchMaven {
     version = "11";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "3g30bgx3nhw1pwq5nq7ns17vs53cck3zrk6b4sqh56my7vhdv08v0n94l326q9f51sxvnsn11zmpnn8zri8hz2ci1g61ymgi2d0mxyd";
     type = "pom";
   };
 
   mavenSharedComponents_12 = fetchMaven {
     version = "12";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "1x5q96gigd54qp60i20kvmwi604ga55fc70gkz1nwn5fjmy36rlxldhhdij3kcpnxpwqp4dwxq717ai8rqv3lzjif8pxd06wzmz0q09";
     type = "pom";
   };
 
   mavenSharedComponents_17 = fetchMaven {
     version = "17";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "3f2pifiapx09h3wv9lglm0mkd9gid268lfz27jhqb4ck2yxna31872db7cj5c9lsg0pl2l3bwgp526whq14zj2qffqxrdq8mn9m0rhy";
     type = "pom";
   };
 
   mavenSharedComponents_18 = fetchMaven {
     version = "18";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "2qqabrvgs4kb14v28qkfwj16n715mj5mh4m8aw0dybi5igmrvwh1d8jsjggdfbh929m6499w8x5s6aw0gbzmfzr3wjkz54dqxnm49p0";
     type = "pom";
   };
 
   mavenSharedComponents_19 = fetchMaven {
     version = "19";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "1na6rh2mlwq6yrg7jxxnkcjj4ki0lqcihwiq2cy2ygsd6q0z8fn755frrd1j1jvd5dnh8jxjqp1m5mpwwv13hxhy8lmq95a5pp2a2qh";
     type = "pom";
   };
 
   mojoParent_32 = fetchMaven {
     version = "32";
-    baseName = "mojo-parent";
-    package = "/org/codehaus/mojo";
+    artifactId = "mojo-parent";
+    groupId = "org.codehaus.mojo";
     sha512 = "15pzaqpdcr8c2w2b2ms3qc5d3r0flmzqav6h45nmg1l8nv7529lp6dkilhkwqag1i94vh8dvqnkxm475j9v2hxmz981azrvz7984z8w";
     type = "pom";
   };
 
   ow2_1_3 = fetchMaven {
     version = "1.3";
-    baseName = "ow2";
-    package = "/org/ow2";
+    artifactId = "ow2";
+    groupId = "org.ow2";
     sha512 = "1jqfqqmh19lvrjk45zzzp895jbxb8giw8sn1qdvwhh1yqxr1z5vkv98n4g0ib2l359qmb9fal4d21ba57zmbl0rqxqlggv9c5l87gfs";
     type = "pom";
   };
 
   plexus_1_0_4 = fetchMaven {
     version = "1.0.4";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "22zsqss9aws73zvgqaz1brnvhk8bqn0flzd644nikprbb9dh1jyv1jig7xaxj942wq1w8h6ybx6b3v1ysfr8kw1z70sb5yrb4zd4kkm";
     type = "pom";
   };
 
   plexus_1_0_8 = fetchMaven {
     version = "1.0.8";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "1nwv49smddfvqn1fhi8aj993pkzsxa033a9g97z7sc3aia5wzwz86azzyrklgxywc26c3k3mw8vfzv758rv3v7cn0hfmyfzfkrg8vwp";
     type = "pom";
   };
 
   plexus_1_0_11 = fetchMaven {
     version = "1.0.11";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "20fb1yvg26wg3lih55m8m4i1idiffyg3jlkvazmxqqvnahz2llgd5cfvqcrzg8lkinnypr4ic5glci4lza46k1sfl5nrviyfx0n7kgr";
     type = "pom";
   };
 
   plexus_1_0_12 = fetchMaven {
     version = "1.0.12";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "2ckzb1z4hgmp2r61a05v3aqapkfnyfs4b7wrf60aiymrz57kliyq3nn50h7bj6ak9hlpyzxpqgqps0chzfpizr8v0abdkjmbplvw2ai";
     type = "pom";
   };
 
   plexus_2_0_2 = fetchMaven {
     version = "2.0.2";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "095kxnh9238wlnxsbsl7wj3zsp2ijwx8p8bvbmsvj3iacw9fsvddv263j485zfjf4ipvp5dwqc3sc8mqkwbhx1qj7k1x1hj14nl6r8z";
     type = "pom";
   };
 
   plexus_2_0_3 = fetchMaven {
     version = "2.0.3";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "15adqpm0gz7c0jwjd4yk0k8h4h7vnz15v1fdmzb6rgs6avl1dx84r5l0fqs6b02kw008rg68inii7nl4m5xwqrj807wr8qzrjm02cam";
     type = "pom";
   };
 
   plexus_2_0_6 = fetchMaven {
     version = "2.0.6";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "07rrw1yldy4c2qvwv3hcf9rdbr0jf57qsnnv2ai9fajwhjyjkgjixm2zlsid41bm2w8hacg9crzy6nfz8yh1sdh5p767niy9jripq2h";
     type = "pom";
   };
 
   plexus_2_0_7 = fetchMaven {
     version = "2.0.7";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "2ddbjp60y8g7n56hya5qa59f980a8sdj0d1dicv3na3pbc6k4wgdrix78lgg32sp4fzmxl7fyzw9gy3z2vpzf65zkj3c9yh030jcysr";
     type = "pom";
   };
 
   plexus_3_0_1 = fetchMaven {
     version = "3.0.1";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "3rjh4msw1qjpj0vmc90f89zjkzcyahzh93jrpw25qb2wn0v18jgw65g0ai7ynssdh113kxi816syqcw8vbqwvhlr2b0acrmszy0jnps";
     type = "pom";
   };
 
   plexus_3_1 = fetchMaven {
     version = "3.1";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "1zyyzy6zvf73bnv8c76x2lmffllqqrgk1k8kpravcrd809acfslip1w7w8kr0rg3sc7554875wsq8fbhq3zdvxwjpzwgz4l5rjr3lmr";
     type = "pom";
   };
 
   plexus_3_2 = fetchMaven {
     version = "3.2";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "07y1vwz55l9yzfhix5w5fw5xvdj854c1ri1wws6r23xzyp5bqwrrz0x5ln26w05w78vpj1rvrq1mkk192vfr80si3ccr063aschf6ld";
     type = "pom";
   };
 
   plexus_3_3_1 = fetchMaven {
     version = "3.3.1";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "1q1p0sfzkhdpknaf0ysq7vzd0qip9q86z62nwamfh9gdsp7lh99kh6hmxav2daha462c3jra6clfniyqrbvs07jwjhf4c79rwhnqc2q";
     type = "pom";
   };
 
   plexusCipher_1_4 = fetchMaven {
     version = "1.4";
-    baseName = "plexus-cipher";
-    package = "/org/sonatype/plexus";
+    artifactId = "plexus-cipher";
+    groupId = "org.sonatype.plexus";
     sha512 = "1m4f7n6ch8gbwgvz7h8iab0jkan8ws3qq9776qc10k0kj6i3227kskk5s8pxlq9vrxw498jmjnkiga41fy33khrgvsvls2hrj9vv1g1";
     type = "pom";
   };
 
   plexusCompiler_2_2 = fetchMaven {
     version = "2.2";
-    baseName = "plexus-compiler";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-compiler";
+    groupId = "org.codehaus.plexus";
     sha512 = "26sr1hg214qf65nym85viv1z4nk1bgqahx7n4bq3did49s9ymgz2c08vw7zdlcqws5jndz9n2xlyq285plgv3xx2mxrrsi2r24zmw29";
     type = "pom";
   };
 
   plexusCompilers_2_2 = fetchMaven {
     version = "2.2";
-    baseName = "plexus-compilers";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-compilers";
+    groupId = "org.codehaus.plexus";
     sha512 = "0yvvc8mdz1vd7mpw9h568mhlfxh3qpbz4qpyr5iw7f5ifm46gxsmnfd36ah6mn9hxh6lpra3mi536y5cv1k5mrbr128a1lwyr8p14rg";
     type = "pom";
   };
 
   plexusComponents_1_1_4 = fetchMaven {
     version = "1.1.4";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "02kdl9z8nz26h4qf9mrdm8s1y2gy1f57n825yy0y3qifavlv51k2yxza7mjsdl1dwrq84c4qlj79iqlisnhrppfy0ncbbblnbir1yln";
     type = "pom";
   };
 
   plexusComponents_1_1_6 = fetchMaven {
     version = "1.1.6";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "1m6f5xzp6mk1n0svznqc8l5x3klr9kk75223ms31q65llx765dxvrsmkjlzgshb0ipb9nfxwk9hs5fvf5dgh0xlzrnc1w2pnqdi8jnh";
     type = "pom";
   };
 
   plexusComponents_1_1_7 = fetchMaven {
     version = "1.1.7";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "2mh1qfbaf6f6nv0nj0g8skgv82jv1l2zg7iivd2jjrzrwnpkc58ajfl1wmylwpz035d9dd713h9szkwy2hdd6pardbc4ja2w4qv5s91";
     type = "pom";
   };
 
   plexusComponents_1_1_14 = fetchMaven {
     version = "1.1.14";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "2gf578c23wz38cnjnp8w80b6hzmfnzrv6is1yf52qrfcijk84fnj4k8wrqg0jms9yz6l5rkkv40zm2j7kkbxgn862mnh4i4qxcb604g";
     type = "pom";
   };
 
   plexusComponents_1_1_15 = fetchMaven {
     version = "1.1.15";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "0lfzdq1wlsnkiapzjs8cqi2kzkaw9lfjhdhmf1pz2x83m5njfx2y59v14wgcs2k4cig8kjr45v4qnmd7mp03k8gginzflc1qi1y7yv6";
     type = "pom";
   };
 
   plexusComponents_1_1_19 = fetchMaven {
     version = "1.1.19";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "01mllmbwfrimvsgmc3wfxp60nm999xa4abp0ywpxdrvbb88dwr4g7sg3mlz22xhc8pky72mif882ppgrdxj01lx3lmm84p3g5f51bii";
     type = "pom";
   };
 
   plexusComponents_1_3_1 = fetchMaven {
     version = "1.3.1";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "16bnfja035zb508f340y64v4vk7pkldn8bvnxvbk0grk8a76rirsn4dl60x3hgmasgkb0y75gr9qp4y72m079klhgg0mbvcfvslkxqb";
     type = "pom";
   };
 
   plexusContainers_1_0_3 = fetchMaven {
     version = "1.0.3";
-    baseName = "plexus-containers";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-containers";
+    groupId = "org.codehaus.plexus";
     sha512 = "39sw2lxlrgbj1zlf67qz14j53sxd45p1qmna5cfizqikrwiqrnb6xwdxr2rsp3h2kadwwpz6id2ls6x3hr93znkad404rg4lg11v9nj";
     type = "pom";
   };
 
   plexusContainers_1_5_5 = fetchMaven {
     version = "1.5.5";
-    baseName = "plexus-containers";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-containers";
+    groupId = "org.codehaus.plexus";
     sha512 = "1dzg3ry73scisq02p1c96rn04rvdpyf9v6cbvvmy6hvcaw11y8mmjwjnlayljhr9za5hhq5bwv2vssmp683v3qjr5750f9aa62jxw0w";
     type = "pom";
   };
 
   plexusSecDispatcher_1_3 = fetchMaven {
     version = "1.3";
-    baseName = "plexus-sec-dispatcher";
-    package = "/org/sonatype/plexus";
+    artifactId = "plexus-sec-dispatcher";
+    groupId = "org.sonatype.plexus";
     sha512 = "09blh68dwrh3zix33cbfbvmxbbm7ck80pwp9x4v1ilf11y6hgm065jx39viqm0zlr86kwngrlm4skrgjw5v67aj2q7d7kd5jgj5s0qc";
     type = "pom";
   };
 
   sisuInject_2_1_1 = fetchMaven {
     version = "2.1.1";
-    baseName = "sisu-inject";
-    package = "/org/sonatype/sisu";
+    artifactId = "sisu-inject";
+    groupId = "org.sonatype.sisu";
     sha512 = "0720p7ai7l1wqs2rfcgpvgd1rc3p2bdpp51a57jmqbgh9msr54iy0c6n0ipybd9lrl88iz4l8cc1s73qj5appf8r481bbwgv4wxi19v";
     type = "pom";
   };
 
   sisuInjectGuiceBean_2_1_1 = fetchMaven {
     version = "2.1.1";
-    baseName = "guice-bean";
-    package = "/org/sonatype/sisu/inject";
+    artifactId = "guice-bean";
+    groupId = "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";
+    artifactId = "guice-plexus";
+    groupId = "org.sonatype.sisu.inject";
     sha512 = "0gspz9n6vbnlbx33xynm4sg0wxlr89i8490gcl0y0qw6mvjjqfwv1dqgncm9xp41mb21i00gxq0ml6d4wfr0sdayk9m736b826lrvq4";
     type = "pom";
   };
 
   sisuParent_2_1_1 = fetchMaven {
     version = "2.1.1";
-    baseName = "sisu-parent";
-    package = "/org/sonatype/sisu";
+    artifactId = "sisu-parent";
+    groupId = "org.sonatype.sisu";
     sha512 = "2z006ib6azrxf5s02ixv5plc1db0rglnv2m8k4il0s144v63ay98wjxawcc1chld64iribhhby6wnlv2fxvv8sl9mr03qb2q2isflgc";
     type = "pom";
   };
 
   slf4jApi_1_5_6 = fetchMaven {
     version = "1.5.6";
-    baseName = "slf4j-api";
-    package = "/org/slf4j";
+    artifactId = "slf4j-api";
+    groupId = "org.slf4j";
     sha512 = "3ahxd5zfxpwrp97yq74xfhrh02a7hnmcdxk5rwjn4v5hcms9b98iizsgd2ssjxa1vy784jh45f6k8qby1c1bdcwk9y18mkcw79zhl2n";
     type = "pom";
   };
 
   slf4jJdk14_1_5_6 = fetchMaven {
     version = "1.5.6";
-    baseName = "slf4j-jdk14";
-    package = "/org/slf4j";
+    artifactId = "slf4j-jdk14";
+    groupId = "org.slf4j";
     sha512 = "11yiy09mlm5dq2ir05n97nka3sqwn48k47x4d2vqmgjsk3vz255m8ilxvq5hjjzygyw0prcrp4zbwkphb5his00pw8f4hczd1w16nvr";
     type = "pom";
   };
 
   slf4jParent_1_5_6 = fetchMaven {
     version = "1.5.6";
-    baseName = "slf4j-parent";
-    package = "/org/slf4j";
+    artifactId = "slf4j-parent";
+    groupId = "org.slf4j";
     sha512 = "036cizr5vh557l65jiv706iiy1q1s3lkr1xqa1hd5yspawd111d5iq8q3qdsw07c3rmxq7n9sflgcj08bhs149ni119fdr7hn9cx0nl";
     type = "pom";
   };
 
   sonatypeForgeParent_3 = fetchMaven {
     version = "3";
-    baseName = "forge-parent";
-    package = "/org/sonatype/forge";
+    artifactId = "forge-parent";
+    groupId = "org.sonatype.forge";
     sha512 = "20x89zl6k0wgd1gb6ysxm6bmgqxwyz3d7zyjn8bwzkz93k7lxnxm0k7skvha283q9ay4cd2vkjisi5avl1f3wvz89rrwg136gmdlksv";
     type = "pom";
   };
 
   sonatypeForgeParent_4 = fetchMaven {
     version = "4";
-    baseName = "forge-parent";
-    package = "/org/sonatype/forge";
+    artifactId = "forge-parent";
+    groupId = "org.sonatype.forge";
     sha512 = "0j13rfddklh25sdwppxvdn97y3l8vy809g2w5zpflh74v0rh0q04ylm3j2nj5hf3ypmgx3lhdp161jbv3l47gl7gh60fk3rnq17kfbq";
     type = "pom";
   };
 
   sonatypeForgeParent_5 = fetchMaven {
     version = "5";
-    baseName = "forge-parent";
-    package = "/org/sonatype/forge";
+    artifactId = "forge-parent";
+    groupId = "org.sonatype.forge";
     sha512 = "1l3nll0i5cpf2rh5f4gqriwy2737n9sccr605nx1swn1qafbxbvvs4jl7argdzz0mkzrr8sir7vnksm9a273vrdica9l35nxivm6vrx";
     type = "pom";
   };
 
   sonatypeForgeParent_7 = fetchMaven {
     version = "7";
-    baseName = "forge-parent";
-    package = "/org/sonatype/forge";
+    artifactId = "forge-parent";
+    groupId = "org.sonatype.forge";
     sha512 = "3l6c336cm6wnrw2l7lr0wg83w1304bggvw4qydh5bqbbyfpdgwqa3pbfkq4x760k3wqwarnlpf31fz2dp6abrynjl4rr1lv68j1hhyn";
     type = "pom";
   };
 
   sonatypeForgeParent_10 = fetchMaven {
     version = "10";
-    baseName = "forge-parent";
-    package = "/org/sonatype/forge";
+    artifactId = "forge-parent";
+    groupId = "org.sonatype.forge";
     sha512 = "3fpnvrxfkxpxqdsn6g7w1zyql4v0z9iqbjprhh4c6rldrbvq4h3yh7dl5sw4h7av516zhmb3bkc9ycfdr5gs34sfb6f6x5hk7qc374a";
     type = "pom";
   };
 
   sonatypeParent_7 = fetchMaven {
     version = "7";
-    baseName = "oss-parent";
-    package = "/org/sonatype/oss";
+    artifactId = "oss-parent";
+    groupId = "org.sonatype.oss";
     sha512 = "3xk0q7y2kdarr3l42dqjzq9qz1r840abqw9zhvl4gpc8jw5xcbqd781fp8z41i3hrkyaf740f2kppji9l77ci7f759d5s9yg4grbc33";
     type = "pom";
   };
 
   sonatypeSpiceParent_10 = fetchMaven {
     version = "10";
-    baseName = "spice-parent";
-    package = "/org/sonatype/spice";
+    artifactId = "spice-parent";
+    groupId = "org.sonatype.spice";
     sha512 = "0gg2cxqvfmg6jk7qi2f4hcgskpd1ysnf1d5vay8dza40wfbk2vy7qvhgjhg55dpbjkadmsj483hg81qdzwqbxmagd2xr9j9062hbja8";
     type = "pom";
   };
 
   sonatypeSpiceParent_12 = fetchMaven {
     version = "12";
-    baseName = "spice-parent";
-    package = "/org/sonatype/spice";
+    artifactId = "spice-parent";
+    groupId = "org.sonatype.spice";
     sha512 = "3bx63k5frr99ma5wcjlqlym7qr6x1m031hns35rpvz039s9cxcn8r3f7slwqaa7s19i3j46kwgxirnhs4ylcddql4rsibaqjwy9lh0d";
     type = "pom";
   };
 
   sonatypeSpiceParent_16 = fetchMaven {
     version = "16";
-    baseName = "spice-parent";
-    package = "/org/sonatype/spice";
+    artifactId = "spice-parent";
+    groupId = "org.sonatype.spice";
     sha512 = "0awfi8vf4xc5c9510sas7xqlik4g8ljivay372cksvlcwlgyrgliikak0xxbxj72df5b9jzc9fzvjxd9rlllnnlnm4zllw5p2hakb0g";
     type = "pom";
   };
 
   sonatypeSpiceParent_17 = fetchMaven {
     version = "17";
-    baseName = "spice-parent";
-    package = "/org/sonatype/spice";
+    artifactId = "spice-parent";
+    groupId = "org.sonatype.spice";
     sha512 = "1jqqp5xylm9bjz33wab7mj49xqczvkhpp4aysrcngszxmil61kanpjmn5ks5r0hq4waj0bqnr91p2p9a7ylqnqjs6ib1x9psl5c9cyw";
     type = "pom";
   };
 
   surefire_2_12_4 = fetchMaven {
     version = "2.12.4";
-    baseName = "surefire";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire";
+    groupId = "org.apache.maven.surefire";
     sha512 = "1zyppjqqwpzcp16g7v49r9fsgdvrny325r583kpis5497ic0qbcczxn53x7s1hnmhgcs33dr0k3alrwl7m574lm2qdgj0s8x18pl6gb";
     type = "pom";
   };
 
   surefire_2_17 = fetchMaven {
     version = "2.17";
-    baseName = "surefire";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire";
+    groupId = "org.apache.maven.surefire";
     sha512 = "3yraw37xwayyrvwa62y6li3wbzrha08j389psz16j1dawxmg78zlm2x1jmgz3nzdb60n9kk143606bgs3vrf7ri9d5pwkg9lvw7hk92";
     type = "pom";
   };
 
   surefireProviders_2_12_4 = fetchMaven {
     version = "2.12.4";
-    baseName = "surefire-providers";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-providers";
+    groupId = "org.apache.maven.surefire";
     sha512 = "08di6wgiihz9svrdpkdvhlipdp83byd1s844fnjqfk3z0g5a72lpq718zy27rk41jma3hclmr4pv0g5dvbhf3v8hy92iby8w5rcxv5x";
     type = "pom";
   };
 
   xbean_3_4 = fetchMaven {
     version = "3.4";
-    baseName = "xbean";
-    package = "/org/apache/xbean";
+    artifactId = "xbean";
+    groupId = "org.apache.xbean";
     sha512 = "2qdd1srj7ahskmxp1cb3gkxgdmy0ms4m5mi43mvfrl085fp58f67ip2y0w4r0xfwzds12727yili6hciiwix9i6hx7wasi5sa9djcp6";
     type = "pom";
   };
diff --git a/pkgs/development/java-modules/sisu/guice.nix b/pkgs/development/java-modules/sisu/guice.nix
index 9fb70fad446..51a004ed545 100644
--- a/pkgs/development/java-modules/sisu/guice.nix
+++ b/pkgs/development/java-modules/sisu/guice.nix
@@ -3,8 +3,8 @@
 rec {
   sisuGuice_2_9_4 = map (obj: fetchMaven {
     version = "2.9.4";
-    baseName = "sisu-guice";
-    package = "/org/sonatype/sisu";
+    artifactId = "sisu-guice";
+    groupId = "org.sonatype.sisu";
     suffix = "-no_aop";
     sha512 = obj.sha512;
     type = obj.type;
diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/pkgs/development/java-modules/sisu/inject-bean.nix
index fba7130cfbd..bca16ccd114 100644
--- a/pkgs/development/java-modules/sisu/inject-bean.nix
+++ b/pkgs/development/java-modules/sisu/inject-bean.nix
@@ -3,8 +3,8 @@
 rec {
   sisuInjectBean_2_1_1 = map (obj: fetchMaven {
     version = "2.1.1";
-    baseName = "sisu-inject-bean";
-    package = "/org/sonatype/sisu";
+    artifactId = "sisu-inject-bean";
+    groupId = "org.sonatype.sisu";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/pkgs/development/java-modules/sisu/inject-plexus.nix
index 73335ec951e..0a181dc1a1e 100644
--- a/pkgs/development/java-modules/sisu/inject-plexus.nix
+++ b/pkgs/development/java-modules/sisu/inject-plexus.nix
@@ -3,8 +3,8 @@
 rec {
   sisuInjectPlexus_2_1_1 = map (obj: fetchMaven {
     version = "2.1.1";
-    baseName = "sisu-inject-plexus";
-    package = "/org/sonatype/sisu";
+    artifactId = "sisu-inject-plexus";
+    groupId = "org.sonatype.sisu";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/xerces/impl.nix b/pkgs/development/java-modules/xerces/impl.nix
index 7b04e21f50e..11295b3128f 100644
--- a/pkgs/development/java-modules/xerces/impl.nix
+++ b/pkgs/development/java-modules/xerces/impl.nix
@@ -3,8 +3,8 @@
 rec {
   xercesImpl_2_8_0 = map (obj: fetchMaven {
     version = "2.8.0";
-    baseName = "xercesImpl";
-    package = "/xerces";
+    artifactId = "xercesImpl";
+    groupId = "xerces";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/pkgs/development/java-modules/xml-apis/default.nix
index 44044a35a57..a96e3670b40 100644
--- a/pkgs/development/java-modules/xml-apis/default.nix
+++ b/pkgs/development/java-modules/xml-apis/default.nix
@@ -3,8 +3,8 @@
 rec {
   xmlApis_1_3_03 = map (obj: fetchMaven {
     version = "1.3.03";
-    baseName = "xml-apis";
-    package = "/xml-apis";
+    artifactId = "xml-apis";
+    groupId = "xml-apis";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
author	Tim Steinbach <tim@nequissimus.com>	2016-11-16 12:39:59 -0500
committer	Tim Steinbach <tim@nequissimus.com>	2017-02-13 18:40:13 -0500
commit	8a7a44c9181217e3640534b49b7a135023d22890 (patch)
tree	9124a1770522de78230acf5751b6e7ac3d6f78ab /pkgs/development/java-modules
parent	82c1ff501aec3f625ad423c795e53fbe5ea761be (diff)
download	nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar.gz nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar.bz2 nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar.lz nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar.xz nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.tar.zst nixpkgs-8a7a44c9181217e3640534b49b7a135023d22890.zip