javaPackages: Use artifactId/groupId

pkgs/build-support/fetchurl/mirrors.nix

@@ -398,7 +398,7 @@ rec {
 
   # Maven Central
   maven = [
-    http://repo1.maven.org/maven2
+    http://repo1.maven.org/maven2/
-    http://central.maven.org/maven2
+    http://central.maven.org/maven2/
   ];
 }

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";
+    artifactId = "ant-launcher";
-    package = "/org/apache/ant";
+    groupId = "org.apache.ant";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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

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

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

@@ -3,8 +3,8 @@
 rec {
   commonsCli_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "commons-cli";
+    artifactId = "commons-cli";
-    package = "/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";
+    artifactId = "commons-cli";
-    package = "/commons-cli";
+    groupId = "commons-cli";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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

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

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

@@ -3,8 +3,8 @@
 rec {
   commonsLang_2_1 = map (obj: fetchMaven {
     version = "2.1";
-    baseName = "commons-lang";
+    artifactId = "commons-lang";
-    package = "/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";
+    artifactId = "commons-lang";
-    package = "/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";
+    artifactId = "commons-lang";
-    package = "/commons-lang";
+    groupId = "commons-lang";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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

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

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

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

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

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

pkgs/development/java-modules/beanshell/bsh.nix

@@ -3,8 +3,8 @@
 rec {
   bsh_2_0_b4 = map (obj: fetchMaven {
     version = "2.0b4";
-    baseName = "bsh";
+    artifactId = "bsh";
-    package = "/org/beanshell";
+    groupId = "org.beanshell";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "classworlds";
-    package = "/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";
+    artifactId = "classworlds";
-    package = "/classworlds";
+    groupId = "classworlds";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "aether-util";
-    package = "/org/eclipse/aether";
+    groupId = "org.eclipse.aether";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "jsr305";
-    package = "/com/google/code/findbugs";
+    groupId = "com.google.code.findbugs";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/google/collections.nix

@@ -3,8 +3,8 @@
 rec {
   googleCollections_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "google-collections";
+    artifactId = "google-collections";
-    package = "/com/google/collections";
+    groupId = "com.google.collections";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/hamcrest/all.nix

@@ -3,8 +3,8 @@
 rec {
   hamcrestAll_1_3 = map (obj: fetchMaven {
     version = "1.3";
-    baseName = "hamcrest-all";
+    artifactId = "hamcrest-all";
-    package = "/org/hamcrest";
+    groupId = "org.hamcrest";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/hamcrest/core.nix

@@ -3,8 +3,8 @@
 rec {
   hamcrestCore_1_3 = map (obj: fetchMaven {
     version = "1.3";
-    baseName = "hamcrest-core";
+    artifactId = "hamcrest-core";
-    package = "/org/hamcrest";
+    groupId = "org.hamcrest";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "junit";
-    package = "/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";
+    artifactId = "junit";
-    package = "/junit";
+    groupId = "junit";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "log4j";
-    package = "/log4j";
+    groupId = "log4j";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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}";
+  name = "${artifactId}-${version}";
-  m2Path = "${package}/${baseName}/${version}";
+  m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
   m2File = "${name}${suffix}.${type}";
   src = fetchurl rec {
       inherit sha512;

pkgs/development/java-modules/maven/archiver.nix

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

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";
+    artifactId = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-artifact";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-artifact";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-artifact";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-artifact";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-artifact";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-artifact";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-common-artifact-filters";
-    package = "/org/apache/maven/shared";
+    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";
+    artifactId = "maven-common-artifact-filters";
-    package = "/org/apache/maven/shared";
+    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";
+    artifactId = "maven-common-artifact-filters";
-    package = "/org/apache/maven/shared";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-core";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-core";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-core";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-core";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-dependency-tree";
-    package = "/org/apache/maven/shared";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "doxia-sink-api";
-    package = "/org/apache/maven/doxia";
+    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";
+    artifactId = "doxia-sink-api";
-    package = "/org/apache/maven/doxia";
+    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";
+    artifactId = "doxia-sink-api";
-    package = "/org/apache/maven/doxia";
+    groupId = "org.apache.maven.doxia";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "enforcer-api";
-    package = "/org/apache/maven/enforcer";
+    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";
+    artifactId = "enforcer-rules";
-    package = "/org/apache/maven/enforcer";
+    groupId = "org.apache.maven.enforcer";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/maven/filtering.nix

@@ -3,8 +3,8 @@
 rec {
   mavenFiltering_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "maven-filtering";
+    artifactId = "maven-filtering";
-    package = "/org/apache/maven/shared";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-model";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-model";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-model";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-model";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-model";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-monitor";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-monitor";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-monitor";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-monitor";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-plugin-annotations";
-    package = "/org/apache/maven/plugin-tools";
+    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";
+    artifactId = "maven-plugin-annotations";
-    package = "/org/apache/maven/plugin-tools";
+    groupId = "org.apache.maven.plugin-tools";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-plugin-api";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-api";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-api";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-api";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-api";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-plugin-testing-harness";
-    package = "/org/apache/maven/shared";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-profile";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-profile";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-profile";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-profile";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-project";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-project";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-project";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-project";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-project";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    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";
+    artifactId = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    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";
+    artifactId = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    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";
+    artifactId = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    groupId = "org.apache.maven.reporting";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-settings";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-settings";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-settings";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-settings";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-shared-incremental";
-    package = "/org/apache/maven/shared";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-shared-utils";
-    package = "/org/apache/maven/shared";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "surefire-api";
-    package = "/org/apache/maven/surefire";
+    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";
+    artifactId = "surefire-api";
-    package = "/org/apache/maven/surefire";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "surefire-booter";
-    package = "/org/apache/maven/surefire";
+    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";
+    artifactId = "surefire-booter";
-    package = "/org/apache/maven/surefire";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "maven-surefire-common";
-    package = "/org/apache/maven/surefire";
+    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";
+    artifactId = "maven-surefire-common";
-    package = "/org/apache/maven/surefire";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "surefire-junit4";
-    package = "/org/apache/maven/surefire";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/maven/toolchain.nix

@@ -3,8 +3,8 @@
 rec {
   mavenToolchain_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "maven-toolchain";
+    artifactId = "maven-toolchain";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-toolchain";
-    package = "/org/apache/maven";
+    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";
+    artifactId = "maven-toolchain";
-    package = "/org/apache/maven";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "animal-sniffer-maven-plugin";
-    package = "/org/codehaus/mojo";
+    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";
+    artifactId = "maven-clean-plugin";
-    package = "/org/apache/maven/plugins";
+    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";
+    artifactId = "maven-compiler-plugin";
-    package = "/org/apache/maven/plugins";
+    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";
+    artifactId = "maven-enforcer-plugin";
-    package = "/org/apache/maven/plugins";
+    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";
+    artifactId = "maven-install-plugin";
-    package = "/org/apache/maven/plugins";
+    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";
+    artifactId = "maven-jar-plugin";
-    package = "/org/apache/maven/plugins";
+    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";
+    artifactId = "replacer";
-    package = "/com/google/code/maven-replacer-plugin";
+    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";
+    artifactId = "maven-resources-plugin";
-    package = "/org/apache/maven/plugins";
+    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";
+    artifactId = "maven-surefire-plugin";
-    package = "/org/apache/maven/plugins";
+    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";
+    artifactId = "maven-surefire-plugin";
-    package = "/org/apache/maven/plugins";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "animal-sniffer";
-    package = "/org/codehaus/mojo";
+    groupId = "org.codehaus.mojo";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "java-boot-classpath-detector";
-    package = "/org/codehaus/mojo";
+    groupId = "org.codehaus.mojo";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "asm-all";
-    package = "/org/ow2/asm";
+    groupId = "org.ow2.asm";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-archiver";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-archiver";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-build-api";
-    package = "/org/sonatype/plexus";
+    groupId = "org.sonatype.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-classworlds";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-classworlds";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-compiler-api";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-compiler-javac";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-compiler-manager";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-component-annotations";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-container-default";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-container-default";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-container-default";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/plexus/digest.nix

@@ -3,8 +3,8 @@
 rec {
   plexusDigest_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "plexus-digest";
+    artifactId = "plexus-digest";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-i18n";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-interactivity-api";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

pkgs/development/java-modules/plexus/interpolation.nix

@@ -3,8 +3,8 @@
 rec {
   plexusInterpolation_1_11 = map (obj: fetchMaven {
     version = "1.11";
-    baseName = "plexus-interpolation";
+    artifactId = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-io";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    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";
+    artifactId = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "sisu-guice";
-    package = "/org/sonatype/sisu";
+    groupId = "org.sonatype.sisu";
     suffix = "-no_aop";
     sha512 = obj.sha512;
     type = obj.type;

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";
+    artifactId = "sisu-inject-bean";
-    package = "/org/sonatype/sisu";
+    groupId = "org.sonatype.sisu";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "sisu-inject-plexus";
-    package = "/org/sonatype/sisu";
+    groupId = "org.sonatype.sisu";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "xercesImpl";
-    package = "/xerces";
+    groupId = "xerces";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

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";
+    artifactId = "xml-apis";
-    package = "/xml-apis";
+    groupId = "xml-apis";
     sha512 = obj.sha512;
     type = obj.type;
   }) [