more maven work

java/modello/modello-plugin-xml_alpha_3.nix

@@ -0,0 +1,35 @@
+{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-4, mavenDep, modello-plugins-pom, modello-pom_alpha_3,
+modello-test_alpha_3}: stdenv.mkDerivation rec {
+    pname = "modello-plugin-xml";
+    version = "1.0-alpha-3";
+    outJar = "modello-plugin-xml-1.0-alpha-3.jar";
+    outPom = "pom.xml";
+    org = "modello";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "modello";
+        rev = "116911e2dbe9c651403304d38a1362cba605f123";
+        hash = "sha256-FwzjV428qNUwMH1iPUbNzNfZ03pgbaenKHQxMx97X4Q=";
+    };
+
+    nativeBuildInputs = [jdk6 maven_2-boostrap-4
+    (mavenDep modello-plugins-pom {})
+    (mavenDep modello-pom_alpha_3 {})
+    (mavenDep modello-test_alpha_3 {})];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        cd modello-plugins/modello-plugin-xml
+        m2 package
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp ./target/modello-plugin-xml-1.0-alpha-3.jar $out/modello-plugin-xml-1.0-alpha-3.jar
+        cp ./pom.xml $out/pom.xml
+    '';
+}

java/modello/modello-plugin-xpp3_alpha_3.nix

@@ -0,0 +1,40 @@
+{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-4, mavenDep, modello-plugins-pom, modello-pom_alpha_3, modello-plugin-xml_alpha_3,
+modello-core}: stdenv.mkDerivation rec {
+    pname = "modello-plugin-xpp3";
+    version = "1.0-alpha-3";
+    outJar = "modello-plugin-xpp3-1.0-alpha-3.jar";
+    org = "modello";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "modello";
+        rev = "116911e2dbe9c651403304d38a1362cba605f123";
+        hash = "sha256-FwzjV428qNUwMH1iPUbNzNfZ03pgbaenKHQxMx97X4Q=";
+    };
+
+    #patches = [./modello-core.patch];
+
+    nativeBuildInputs = [jdk6 maven_2-boostrap-4
+    (mavenDep modello-plugins-pom {})
+    (mavenDep modello-pom_alpha_3 {})
+    (mavenDep modello-plugin-xml_alpha_3 {})
+    /*(mavenDep modello-pom {})
+    (mavenDep plexus-utils_alpha_1 {})
+    (mavenDep modello-xml-plugin {})
+    (mavenDep modello-core {})
+    (mavenDep plexus-container-default_alpha_1 {})*/];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        cd modello-plugins/modello-plugin-xpp3
+        m2 package
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp ./target/modello-plugin-xpp3-1.0-alpha-3.jar $out/modello-plugin-xpp3-1.0-alpha-3.jar
+    '';
+}

java/modello/modello-plugins-pom.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchFromGitHub}: stdenv.mkDerivation rec {
+    pname = "modello-plugins";
+    version = "1.0-alpha-3";
+    outPom = "pom.xml";
+    org = "org.codehaus.modello";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "modello";
+        rev = "116911e2dbe9c651403304d38a1362cba605f123";
+        hash = "sha256-FwzjV428qNUwMH1iPUbNzNfZ03pgbaenKHQxMx97X4Q=";
+    };
+
+    installPhase = ''
+        mkdir $out
+        cp ./modello-plugins/pom.xml $out/pom.xml
+    '';
+}

java/modello/modello-pom_alpha_3.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchFromGitHub}: stdenv.mkDerivation rec {
+    pname = "modello";
+    version = "1.0-alpha-3";
+    outPom = "pom.xml";
+    org = "org.codehaus.modello";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "modello";
+        rev = "116911e2dbe9c651403304d38a1362cba605f123";
+        hash = "sha256-FwzjV428qNUwMH1iPUbNzNfZ03pgbaenKHQxMx97X4Q=";
+    };
+
+    installPhase = ''
+        mkdir $out
+        cp ./pom.xml $out/pom.xml
+    '';
+}

java/modello/modello-test_alpha_3.nix

@@ -0,0 +1,34 @@
+{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-4, mavenDep, modello-pom_alpha_3}: stdenv.mkDerivation rec {
+    pname = "modello-test";
+    version = "1.0-alpha-3";
+    outJar = "modello-test-1.0-alpha-3.jar";
+    outPom = "pom.xml";
+    org = "org.codehaus.modello";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "modello";
+        rev = "228eaa2f025d6fad19fe001f98f0b1870515cdc8";
+        hash = "sha256-e6dixEbD/DuL699G/o0g5QQ5TQpEuqJNTejfRgFvg7I=";
+    };
+
+    patches = [./modello-test_alpha_3.patch];
+
+    nativeBuildInputs = [jdk6 maven_2-boostrap-4
+    (mavenDep modello-pom_alpha_3 {})];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        cd modello-test
+        m2 package
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp ./target/modello-test-1.0-alpha-3.jar $out/modello-test-1.0-alpha-3.jar
+        cp ./pom.xml $out/pom.xml
+    '';
+}

java/modello/modello-test_alpha_3.patch

@@ -0,0 +1,22 @@
+diff --git a/modello-test/pom.xml b/modello-test/pom.xml
+index e1310b4..fd6c3fb 100644
+--- a/modello-test/pom.xml
++++ b/modello-test/pom.xml
+@@ -30,7 +30,7 @@
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-settings</artifactId>
+-      <version>2.0-alpha-2</version>
++      <version>2.0-SNAPSHOT</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.maven.wagon</groupId>
+@@ -40,7 +40,7 @@
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-artifact</artifactId>
+-      <version>2.0-alpha-2</version>
++      <version>2.0-SNAPSHOT</version>
+     </dependency>
+   </dependencies>
+ </project>

java/plexus/plexus-archiver.nix

@@ -0,0 +1,32 @@
+{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-3, mavenDep, plexus-components-pom}: stdenv.mkDerivation rec {
+    pname = "plexus-archiver";
+    version = "1.0-alpha-1-SNAPSHOT";
+    outJar = "plexus-archiver-1.0-alpha-1-SNAPSHOT.jar";
+    outPom = "pom.xml";
+    org = "plexus";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "plexus-pom";
+        rev = "8e56595aa5c89ba6fc76bac2bd8426333e2495bb";
+        hash = "sha256-C84gYXqfE+7aofPIALChnbOSB39ZRrg0ZoHgQ5B2ATg=";
+    };
+
+    nativeBuildInputs = [jdk6 maven_2-boostrap-3
+    (mavenDep plexus-components-pom {})];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        cd plexus-components/plexus-archiver
+        m2 jar:jar
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp ./target/plexus-archiver-1.0-alpha-1-SNAPSHOT.jar $out/plexus-archiver-1.0-alpha-1-SNAPSHOT.jar
+        cp ./pom.xml $out/pom.xml
+    '';
+}

java/plexus/plexus-compiler-api_1_2.nix

@@ -0,0 +1,33 @@
+{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-3, mavenDep, plexus-components-pom, plexus-compiler-pom}: stdenv.mkDerivation rec {
+    pname = "plexus-compiler-api";
+    version = "1.2-SNAPSHOT";
+    outJar = "plexus-compiler-api-1.2-SNAPSHOT.jar";
+    outPom = "pom.xml";
+    org = "plexus";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "plexus-pom";
+        rev = "8e56595aa5c89ba6fc76bac2bd8426333e2495bb";
+        hash = "sha256-C84gYXqfE+7aofPIALChnbOSB39ZRrg0ZoHgQ5B2ATg=";
+    };
+
+    nativeBuildInputs = [jdk6 maven_2-boostrap-3
+    (mavenDep plexus-components-pom {})
+    (mavenDep plexus-compiler-pom {})];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        cd plexus-components/plexus-compiler/plexus-compiler-api
+        m2 jar:jar
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp ./target/plexus-compiler-api-1.2-SNAPSHOT.jar $out/plexus-compiler-api-1.2-SNAPSHOT.jar
+        cp ./pom.xml $out/pom.xml
+    '';
+}

java/plexus/plexus-compiler-javac_1_0.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, jdk6, ant_1_7, mavenDep, plexus-compiler-api, plexus_0_16-bootstrap}: stdenv.mkDerivation rec {
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, mavenDep, plexus-compiler-api_1_0, plexus_0_16-bootstrap}: stdenv.mkDerivation rec {
     pname = "plexus-compiler-javac";
     version = "1.0";
     outJar = "plexus-compiler-javac.jar";
@@ -14,7 +14,7 @@
     patches = [./plexus-compiler-javac.patch];
 
     nativeBuildInputs = [jdk6 ant_1_7
-    (mavenDep plexus-compiler-api {})
+    (mavenDep plexus-compiler-api_1_0 {})
     (mavenDep plexus_0_16-bootstrap {})];
 
     env = {

java/plexus/plexus-compiler-javac_1_2.nix

@@ -0,0 +1,38 @@
+{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-3, mavenDep, plexus-components-pom, plexus-compiler-pom,
+plexus-compilers-pom, plexus-compiler-api_1_2, plexus-compiler-test_1_2, commons-lang_2}: stdenv.mkDerivation rec {
+    pname = "plexus-compiler-javac";
+    version = "1.2-SNAPSHOT";
+    outJar = "plexus-compiler-javac-1.2-SNAPSHOT.jar";
+    outPom = "pom.xml";
+    org = "plexus";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "plexus-pom";
+        rev = "8e56595aa5c89ba6fc76bac2bd8426333e2495bb";
+        hash = "sha256-C84gYXqfE+7aofPIALChnbOSB39ZRrg0ZoHgQ5B2ATg=";
+    };
+
+    nativeBuildInputs = [jdk6 maven_2-boostrap-3
+    (mavenDep plexus-components-pom {})
+    (mavenDep plexus-compiler-pom {})
+    (mavenDep plexus-compilers-pom {})
+    (mavenDep plexus-compiler-api_1_2 {})
+    (mavenDep plexus-compiler-test_1_2 {})
+    (mavenDep commons-lang_2 {})];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        cd plexus-components/plexus-compiler/plexus-compilers/plexus-compiler-javac
+        m2 jar:jar
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp ./target/plexus-compiler-javac-1.2-SNAPSHOT.jar $out/plexus-compiler-javac-1.2-SNAPSHOT.jar
+        cp ./pom.xml $out/pom.xml
+    '';
+}

java/plexus/plexus-compiler-pom.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchFromGitHub}: stdenv.mkDerivation rec {
+    pname = "plexus-compiler";
+    version = "1.2";
+    outPom = "pom.xml";
+    org = "plexus";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "plexus-pom";
+        rev = "8e56595aa5c89ba6fc76bac2bd8426333e2495bb";
+        hash = "sha256-C84gYXqfE+7aofPIALChnbOSB39ZRrg0ZoHgQ5B2ATg=";
+    };
+
+    installPhase = ''
+        mkdir $out
+        cp ./plexus-components/plexus-compiler/pom.xml $out/pom.xml
+    '';
+}

java/plexus/plexus-compiler-test.patch

@@ -0,0 +1,13 @@
+diff --git a/plexus-components/plexus-compiler/plexus-compiler-test/pom.xml b/plexus-components/plexus-compiler/plexus-compiler-test/pom.xml
+index 056b910..82c771c 100644
+--- a/plexus-components/plexus-compiler/plexus-compiler-test/pom.xml
++++ b/plexus-components/plexus-compiler/plexus-compiler-test/pom.xml
+@@ -13,7 +13,7 @@
+     <dependency>
+       <groupId>plexus</groupId>
+       <artifactId>plexus-container-default</artifactId>
+-      <version>1.0-alpha-1-SNAPSHOT</version>
++      <version>1.0-alpha-1</version>
+     </dependency>
+     <dependency>
+       <groupId>plexus</groupId>

java/plexus/plexus-compiler-test_1_2.nix

@@ -0,0 +1,38 @@
+{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-3, mavenDep, plexus-components-pom, plexus-compiler-pom,
+plexus-compiler-api_1_2, commons-lang_2}: stdenv.mkDerivation rec {
+    pname = "plexus-compiler-test";
+    version = "1.2-SNAPSHOT";
+    outJar = "plexus-compiler-test-1.2-SNAPSHOT.jar";
+    outPom = "pom.xml";
+    org = "plexus";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "plexus-pom";
+        rev = "8e56595aa5c89ba6fc76bac2bd8426333e2495bb";
+        hash = "sha256-C84gYXqfE+7aofPIALChnbOSB39ZRrg0ZoHgQ5B2ATg=";
+    };
+
+    patches = [./plexus-compiler-test.patch];
+
+    nativeBuildInputs = [jdk6 maven_2-boostrap-3
+    (mavenDep plexus-components-pom {})
+    (mavenDep plexus-compiler-pom {})
+    (mavenDep plexus-compiler-api_1_2 {})
+    (mavenDep commons-lang_2 {})];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        cd plexus-components/plexus-compiler/plexus-compiler-test
+        m2 jar:jar
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp ./target/plexus-compiler-test-1.2-SNAPSHOT.jar $out/plexus-compiler-test-1.2-SNAPSHOT.jar
+        cp ./pom.xml $out/pom.xml
+    '';
+}

java/plexus/plexus-compilers-pom.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchFromGitHub}: stdenv.mkDerivation rec {
+    pname = "plexus-compilers";
+    version = "1.2";
+    outPom = "pom.xml";
+    org = "plexus";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "plexus-pom";
+        rev = "8e56595aa5c89ba6fc76bac2bd8426333e2495bb";
+        hash = "sha256-C84gYXqfE+7aofPIALChnbOSB39ZRrg0ZoHgQ5B2ATg=";
+    };
+
+    installPhase = ''
+        mkdir $out
+        cp ./plexus-components/plexus-compiler/plexus-compilers/pom.xml $out/pom.xml
+    '';
+}

java/plexus/plexus-components-pom.nix

@@ -0,0 +1,20 @@
+{stdenv, fetchFromGitHub}: stdenv.mkDerivation rec {
+    pname = "plexus-components";
+    version = "1.0";
+    outPom = "pom.xml";
+    org = "plexus";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "plexus-pom";
+        rev = "8e56595aa5c89ba6fc76bac2bd8426333e2495bb";
+        hash = "sha256-C84gYXqfE+7aofPIALChnbOSB39ZRrg0ZoHgQ5B2ATg=";
+    };
+
+    patches = [./plexus-components.patch];
+
+    installPhase = ''
+        mkdir $out
+        cp ./plexus-components/pom.xml $out/pom.xml
+    '';
+}

java/plexus/plexus-components.patch

@@ -0,0 +1,19 @@
+diff --git a/plexus-components/pom.xml b/plexus-components/pom.xml
+index 5837359..4bb8b67 100644
+--- a/plexus-components/pom.xml
++++ b/plexus-components/pom.xml
+@@ -13,12 +13,12 @@
+     <dependency>
+       <groupId>plexus</groupId>
+       <artifactId>plexus-container-default</artifactId>
+-      <version>1.0-alpha-1-SNAPSHOT</version>
++      <version>1.0-alpha-1</version>
+     </dependency>
+     <dependency>
+       <groupId>plexus</groupId>
+       <artifactId>plexus-utils</artifactId>
+-      <version>1.0-alpha-1-SNAPSHOT</version>
++      <version>1.0-alpha-1</version>
+     </dependency>    
+   </dependencies>
+ </project>

java/plexus/plexus-container-artifact_alpha_2.nix

@@ -1,7 +1,9 @@
-{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-3, mavenDep, plexus-container-default_alpha_2, wagon-provider-api}: stdenv.mkDerivation rec {
+{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-3, mavenDep, plexus-containers-pom_alpha_2,
+plexus-container-default_alpha_2}: stdenv.mkDerivation rec {
     pname = "plexus-container-artifact";
     version = "1.0-alpha-2-SNAPSHOT";
     outJar = "plexus-container-artifact-1.0-alpha-2-SNAPSHOT.jar";
+    outPom = "pom.xml";
     org = "plexus";
 
     src = fetchFromGitHub {
@@ -14,6 +16,7 @@
     patches = [./plexus-container-artifact.patch];
 
     nativeBuildInputs = [jdk6 maven_2-boostrap-3
+    (mavenDep plexus-containers-pom_alpha_2 {})
     (mavenDep plexus-container-default_alpha_2 {})];
 
     env = {
@@ -21,14 +24,13 @@
     };
 
     buildPhase = ''
-        cd plexus-containers
-        m2 pom:install
-        cd plexus-container-artifact
+        cd plexus-containers/plexus-container-artifact
         m2 jar:jar
     '';
 
     installPhase = ''
         mkdir $out
         cp ./target/plexus-container-artifact-1.0-alpha-2-SNAPSHOT.jar $out/plexus-container-artifact-1.0-alpha-2-SNAPSHOT.jar
+        cp ./pom.xml $out/pom.xml
     '';
 }

java/plexus/plexus-container-default.nix

@@ -1,31 +0,0 @@
-{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-2, plexus-pom}: stdenv.mkDerivation rec {
-    pname = "plexus-container-default";
-    version = "1.0-alpha-8";
-    outJar = "dwawda";
-
-    src = fetchFromGitHub {
-        owner = "codehaus-plexus";
-        repo = "plexus-containers";
-        rev = "284b9853395fe24b0b3cb4fb080f1bc9d37b7119";
-        hash = "sha256-UVNPtxMZ2n8S0ER17wJKInz4lQZjP2u18fxsSvZBwUY=";
-    };
-
-    nativeBuildInputs = [jdk6 maven_2-boostrap-2];
-
-    env = {
-        JAVA_HOME="${jdk6}";
-    };
-
-    configurePhase = ''
-        ln -s ${plexus-pom}/pom.xml /build/.maven/repository/org.codehaus.plexus/poms/plexus-1.0.4.pom
-    '';
-
-    buildPhase = ''
-        m2
-    '';
-
-    installPhase = ''
-        mkdir $out
-        cp -r ./dist/* $out/
-    '';
-}

java/plexus/plexus-container-default_alpha_1.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-2, mavenDep, plexus-containers-pom, plexus-pom_1_0,
+{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-2, mavenDep, plexus-containers-pom_alpha_1, plexus-pom_1_0,
 plexus-utils_alpha_1}: stdenv.mkDerivation rec {
     pname = "plexus-container-default";
     version = "1.0-alpha-1";
@@ -16,7 +16,7 @@ plexus-utils_alpha_1}: stdenv.mkDerivation rec {
     patches = [./plexus-container-default.patch];
 
     nativeBuildInputs = [jdk6 maven_2-boostrap-2
-    (mavenDep plexus-containers-pom {})
+    (mavenDep plexus-containers-pom_alpha_1 {})
     (mavenDep plexus-pom_1_0 {})
     (mavenDep plexus-utils_alpha_1 {})];
 

java/plexus/plexus-container-default_alpha_2.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-3}: stdenv.mkDerivation rec {
+{stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-3, mavenDep, plexus-containers-pom_alpha_2}: stdenv.mkDerivation rec {
     pname = "plexus-container-default";
     version = "1.0-alpha-2-SNAPSHOT";
     outJar = "plexus-container-default-1.0-alpha-2-SNAPSHOT.jar";
@@ -14,16 +14,15 @@
 
     patches = [./plexus-container-default.patch];
 
-    nativeBuildInputs = [jdk6 maven_2-boostrap-3];
+    nativeBuildInputs = [jdk6 maven_2-boostrap-3
+    (mavenDep plexus-containers-pom_alpha_2 {})];
 
     env = {
         JAVA_HOME="${jdk6}";
     };
 
     buildPhase = ''
-        cd plexus-containers
-        m2 pom:install
-        cd plexus-container-default
+        cd plexus-containers/plexus-container-default
         m2 jar:jar
     '';
 

java/plexus/plexus-container-default_alpha_8.nix

@@ -0,0 +1,32 @@
+{stdenv, fetchFromGitHub, jdk6, maven_2_alpha_3, plexus-pom}: stdenv.mkDerivation rec {
+    pname = "plexus-container-default";
+    version = "1.0-alpha-8";
+    outJar = "dwawda";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "plexus-pom";
+        rev = "f29e398e3f3c7012c78d25c7db7fcc94048b580d";
+        hash = "sha256-JTZ516eTqw6QEkGuguKwJu5ftfbktqjl+d5zBVLhPXk=";
+    };
+
+    nativeBuildInputs = [jdk6 maven_2_alpha_3];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    configurePhase = ''
+        #ln -s $ {plexus-pom}/pom.xml /build/.maven/repository/org.codehaus.plexus/poms/plexus-1.0.4.pom
+    '';
+
+    buildPhase = ''
+        cd plexus-containers/plexus-container-default
+        m2
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}

java/plexus/plexus-containers-pom_alpha_2.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchFromGitHub}: stdenv.mkDerivation rec {
+    pname = "plexus-containers";
+    version = "1.0-alpha-2-SNAPSHOT";
+    outPom = "pom.xml";
+    org = "plexus";
+
+    src = fetchFromGitHub {
+        owner = "codehaus-plexus";
+        repo = "plexus-pom";
+        rev = "8e56595aa5c89ba6fc76bac2bd8426333e2495bb";
+        hash = "sha256-C84gYXqfE+7aofPIALChnbOSB39ZRrg0ZoHgQ5B2ATg=";
+    };
+
+    installPhase = ''
+        mkdir $out
+        cp ./plexus-containers/pom.xml $out/pom.xml
+    '';
+}

java/plexus/plexus-pom.nix

@@ -1,6 +1,7 @@
 {stdenv, fetchFromGitHub, jdk6, maven_2-boostrap-4}: stdenv.mkDerivation rec {
     pname = "plexus-pom";
     version = "1.0.4";
+    outPom
 
     src = fetchFromGitHub {
         owner = "codehaus-plexus";

maven/bootstrap-3-fake-poms/commons-lang/poms/commons-lang-2.0.pom

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>commons-lang</groupId>
+  <artifactId>commons-lang</artifactId>
+  <version>2.0</version>
+</project>

maven/bootstrap-4-fake-poms/commons-lang/poms/commons-lang-2.0.pom

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>commons-lang</groupId>
+  <artifactId>commons-lang</artifactId>
+  <version>2.0</version>
+</project>

maven/bootstrap-4-fake-poms/junit/poms/junit-3.8.1.pom

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>junit</groupId>
+  <artifactId>junit</artifactId>
+  <version>3.8.1</version>
+</project>

maven/bootstrap-4-fake-poms/surefire/poms/surefire-1.2-SNAPSHOT.pom

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>surefire</groupId>
+  <artifactId>surefire</artifactId>
+  <version>1.2-SNAPSHOT</version>
+</project>

maven/bootstrap-4-fake-poms/surefire/poms/surefire-booter-1.2-SNAPSHOT.pom

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>surefire</groupId>
+  <artifactId>surefire-booter</artifactId>
+  <version>1.2-SNAPSHOT</version>
+</project>

maven/maven-bootstrap-1.nix

@@ -1,5 +1,5 @@
 {stdenv, fetchFromGitHub, jdk6, mavenDep, modello, xpp3, xstream_0_5, surefire_1_1, junit_3_8_1, qdox, plexus_0_16-bootstrap,
-wagon-api_0_9, classworlds, commons-cli_beta_2, plexus-i18n, ognl, plexus-compiler-api, plexus-compiler-javac,
+wagon-api_0_9, classworlds, commons-cli_beta_2, plexus-i18n, ognl, plexus-compiler-api_1_0, plexus-compiler-javac_1_0,
 surefire-booter_1_1}: stdenv.mkDerivation rec {
     pname = "maven";
     version = "2.0.0-SNAPSHOT";
@@ -28,8 +28,8 @@ surefire-booter_1_1}: stdenv.mkDerivation rec {
     (mavenDep commons-cli_beta_2 {})
     (mavenDep plexus-i18n {})
     (mavenDep ognl {})
-    (mavenDep plexus-compiler-api {})
-    (mavenDep plexus-compiler-javac {})
+    (mavenDep plexus-compiler-api_1_0 {})
+    (mavenDep plexus-compiler-javac_1_0 {})
     (mavenDep surefire-booter_1_1 {})];
 
     env = {

maven/maven-bootstrap-2.nix

@@ -1,5 +1,5 @@
 {stdenv, fetchFromGitHub, jdk6, mavenDep, modello, xpp3, xstream_0_5, surefire_1_1, junit_3_8_1, qdox, plexus_0_16,
-wagon-api_0_9, classworlds, commons-cli_beta_2, plexus-i18n, ognl, plexus-compiler-api, plexus-compiler-javac,
+wagon-api_0_9, classworlds, commons-cli_beta_2, plexus-i18n, ognl, plexus-compiler-api_1_0, plexus-compiler-javac_1_0,
 surefire-booter_1_1}: stdenv.mkDerivation rec {
     pname = "maven";
     version = "2.0.0-SNAPSHOT";
@@ -30,8 +30,8 @@ surefire-booter_1_1}: stdenv.mkDerivation rec {
     (mavenDep commons-cli_beta_2 {})
     (mavenDep plexus-i18n {})
     (mavenDep ognl {})
-    (mavenDep plexus-compiler-api {})
-    (mavenDep plexus-compiler-javac {})
+    (mavenDep plexus-compiler-api_1_0 {})
+    (mavenDep plexus-compiler-javac_1_0 {})
     (mavenDep surefire-booter_1_1 {})];
 
     env = {

maven/maven.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, jdk6, mavenDep, plexus-container-default}: stdenv.mkDerivation rec {
+{stdenv, fetchFromGitHub, jdk6, mavenDep, plexus-container-default_alpha_8}: stdenv.mkDerivation rec {
     pname = "maven";
     version = "2.0.0";
 
@@ -14,7 +14,7 @@
     settings = ./settings.xml;
 
     nativeBuildInputs = [jdk6
-    (mavenDep plexus-container-default {})];
+    (mavenDep plexus-container-default_alpha_8 {})];
 
     env = {
         JAVA_HOME="${jdk6}";

maven/maven_1.nix

@@ -1,38 +0,0 @@
-{stdenv, fetchsvn, jdk6, mavenDep, ant_1_7, dom4j, jaxen}: stdenv.mkDerivation rec {
-    pname = "maven";
-    version = "1.1";
-
-    src = fetchsvn {
-        url = "https://svn.apache.org/repos/asf/maven/maven-1/trunks";
-        rev = "1928317";
-        hash = "sha256-5nrPj6llsagYWZiuzwPjsCuyzioMew6AzHXACBzFvtI=";
-    };
-
-    #patches = [./maven_2.patch];
-
-    settings = ./settings.xml;
-
-    nativeBuildInputs = [jdk6 ant_1_7
-    (mavenDep dom4j {})];
-
-    env = {
-        JAVA_HOME="${jdk6}";
-        MAVEN_HOME="/build/mvn";
-        #MAVEN_OPTS="-Dmaven.online=false";
-    };
-
-    configurePhase = ''
-        mkdir -p /build/.maven/repository/maven/jars
-        ln -s /build/.maven/repository/dom4j/jars/dom4j-1.6.1.jar /build/.maven/repository/maven/jars/dom4j-1.7-20060614.jar
-    '';
-
-    buildPhase = ''
-        cd core
-        ant -f build-bootstrap.xml
-    '';
-
-    installPhase = ''
-        mkdir $out
-        cp -r ./dist/* $out/
-    '';
-}

maven/maven_2-bootstrap-3.nix

@@ -1,8 +1,8 @@
 {stdenv, fetchFromGitHub, jdk6, mavenDep, junit_3_8_1, modello-core, modello-xdoc-plugin, modello-xml-plugin,
 modello-xpp3-plugin, plexus-utils_alpha_1, surefire-booter_1_2, surefire_1_2, qdox, classworlds,
 plexus-container-default_alpha_1, wagon-provider-api, wagon-file, commons-cli_beta_2, plexus-i18n,
-plexus-container-artifact_alpha_1, plexus-compiler-api, plexus-compiler-javac, plexus_0_17, wagon-api_alpha_1,
-wagon-pom_alpha_1, plexus-pom_1_0, wagon-providers-pom, plexus-containers-pom, modello-pom, wagon-provider-test,
+plexus-container-artifact_alpha_1, plexus-compiler-api_1_0, plexus-compiler-javac_1_0, plexus_0_17, wagon-api_alpha_1,
+wagon-pom_alpha_1, plexus-pom_1_0, wagon-providers-pom, plexus-containers-pom_alpha_1, modello-pom, wagon-provider-test,
 xpp3, xstream_1_0, asm, plexus_0_14, wagon-pom_alpha_2}: stdenv.mkDerivation rec {
     pname = "maven";
     version = "2.0.0-SNAPSHOT";
@@ -35,14 +35,14 @@ xpp3, xstream_1_0, asm, plexus_0_14, wagon-pom_alpha_2}: stdenv.mkDerivation rec
     (mavenDep commons-cli_beta_2 {})
     (mavenDep plexus-i18n {})
     (mavenDep plexus-container-artifact_alpha_1 {})
-    (mavenDep plexus-compiler-api {})
-    (mavenDep plexus-compiler-javac {})
+    (mavenDep plexus-compiler-api_1_0 {})
+    (mavenDep plexus-compiler-javac_1_0 {})
     (mavenDep plexus_0_17 {})
     (mavenDep wagon-api_alpha_1 {})
     (mavenDep wagon-pom_alpha_1 {})
     (mavenDep plexus-pom_1_0 {})
     (mavenDep wagon-providers-pom {})
-    (mavenDep plexus-containers-pom {})
+    (mavenDep plexus-containers-pom_alpha_1 {})
     (mavenDep modello-pom {})
     (mavenDep wagon-provider-test {})
     (mavenDep xpp3 {})

maven/maven_2-bootstrap-4.nix

@@ -1,7 +1,9 @@
 {stdenv, fetchFromGitHub, jdk6, mavenDep, junit_3_8_1, modello-core, modello-xdoc-plugin, modello-xml-plugin,
 modello-xpp3-plugin, plexus-utils_alpha_2, surefire-booter_1_2, surefire_1_2, qdox, classworlds,
 plexus-container-default_alpha_2, wagon-provider-api, wagon-file, commons-cli_beta_2, plexus-i18n,
-plexus-container-artifact_alpha_2, breakpointHook}: stdenv.mkDerivation rec {
+plexus-container-artifact_alpha_2, plexus-archiver, modello, plexus-compiler-api_1_2, plexus-compiler-javac_1_2,
+plexus-container-default_alpha_1, plexus-components-pom, plexus-pom_1_0, plexus-utils_alpha_1,
+plexus-containers-pom_alpha_2, plexus-compiler-pom, plexus-compilers-pom, plexus-compiler-test_1_2, commons-lang_2}: stdenv.mkDerivation rec {
     pname = "maven";
     version = "2.0.0-SNAPSHOT";
 
@@ -12,11 +14,11 @@ plexus-container-artifact_alpha_2, breakpointHook}: stdenv.mkDerivation rec {
         hash = "sha256-pIOVSISjSJees/P8HCnapfDJgilHL9fNpZkGjCHMSx0=";
     };
 
+    fake-poms = ./bootstrap-4-fake-poms;
+
     patches = [./maven_2-bootstrap-4.patch];
 
-    settings = ./settings.xml;
-
-    nativeBuildInputs = [jdk6 breakpointHook
+    nativeBuildInputs = [jdk6
     (mavenDep junit_3_8_1 {})
     (mavenDep modello-core {})
     (mavenDep modello-xdoc-plugin {})
@@ -32,18 +34,26 @@ plexus-container-artifact_alpha_2, breakpointHook}: stdenv.mkDerivation rec {
     (mavenDep wagon-file {})
     (mavenDep commons-cli_beta_2 {})
     (mavenDep plexus-i18n {})
-    (mavenDep plexus-container-artifact_alpha_2 {})];
+    (mavenDep plexus-container-artifact_alpha_2 {})
+    (mavenDep plexus-archiver {})
+    (mavenDep modello {})
+    (mavenDep plexus-compiler-api_1_2 {})
+    (mavenDep plexus-compiler-javac_1_2 {})
+    (mavenDep plexus-container-default_alpha_1 {})
+    (mavenDep plexus-components-pom {})
+    (mavenDep plexus-pom_1_0 {})
+    (mavenDep plexus-utils_alpha_1 {})
+    (mavenDep plexus-containers-pom_alpha_2 {})
+    (mavenDep plexus-compiler-pom {})
+    (mavenDep plexus-compilers-pom {})
+    (mavenDep plexus-compiler-test_1_2 {})
+    (mavenDep commons-lang_2 {})];
 
     env = {
         JAVA_HOME="${jdk6}";
         M2_HOME="/build/m2";
     };
 
-    configurePhase = ''
-        #mkdir /build/.m2
-        #ln -s ${settings} /build/.m2/settings.xml
-    '';
-
     buildPhase = ''
         chmod +x m2-bootstrap-all.sh
         ./m2-bootstrap-all.sh -Dmaven.repo.local=/build/.maven/repository -Dmaven.online=false
@@ -51,6 +61,17 @@ plexus-container-artifact_alpha_2, breakpointHook}: stdenv.mkDerivation rec {
 
     installPhase = ''
         mkdir $out
-        cp -r ./dist/* $out/
+        cp -r /build/m2/* $out/
+
+        mkdir $out/repository
+        cp -r /build/.maven/repository/* $out/repository/
+        cp -r ${fake-poms}/* $out/repository/
+
+        mkdir $out/nix-support
+        echo "mkdir -p /build/.maven/repository" >> $out/nix-support/setup-hook
+        echo "cp -r $out/repository/* /build/.maven/repository/" >> $out/nix-support/setup-hook
+        echo "chmod -R 777 /build/.maven/repository/" >> $out/nix-support/setup-hook
+        echo "mkdir /build/.m2" >> $out/nix-support/setup-hook
+        echo "ln -s /build/.maven/repository /build/.m2/repository" >> $out/nix-support/setup-hook
     '';
 }

maven/maven_2-bootstrap-4.patch

@@ -1,3 +1,210 @@
+diff --git a/m2-bootstrap-all.sh b/m2-bootstrap-all.sh
+index b771312..e219bab 100644
+--- a/m2-bootstrap-all.sh
++++ b/m2-bootstrap-all.sh
+@@ -30,13 +30,3 @@ ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+   ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+ )
+ ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+-
+-(
+-  cd ./maven-core-it
+-  echo
+-  echo "Running maven-core integration tests ..."
+-  echo 
+-  ./maven-core-it.sh $ARGS
+-  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+-)
+-ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
+index eb5fb5d..da807de 100644
+--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
++++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
+@@ -23,6 +23,9 @@ public interface ArtifactResolver
+     Artifact resolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
+         throws ArtifactResolutionException;
+ 
++    Artifact resolve( Artifact artifact, Set remoteRepositories, ArtifactRepository localRepository )
++        throws ArtifactResolutionException;
++
+     ArtifactResolutionResult resolveTransitively( Artifact artifact, List remoteRepositories,
+         ArtifactRepository localRepository, ArtifactMetadataSource source ) throws ArtifactResolutionException;
+ 
+@@ -36,7 +39,11 @@ public interface ArtifactResolver
+         ArtifactRepository localRepository, ArtifactMetadataSource source, ArtifactFilter filter )
+         throws ArtifactResolutionException;
+ 
++    ArtifactResolutionResult resolveTransitively( Set artifacts, Set remoteRepositories,
++        ArtifactRepository localRepository, ArtifactMetadataSource source, ArtifactFilter filter )
++        throws ArtifactResolutionException;
++
+     void addArtifactRequestTransformation(
+         org.apache.maven.artifact.resolver.transform.ArtifactRequestTransformation requestTransformation );
+ 
+-}
+\ No newline at end of file
++}
+diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+index c7c7bf2..138c6c4 100644
+--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
++++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+@@ -11,6 +11,7 @@ import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+ import org.apache.maven.artifact.resolver.transform.ArtifactRequestTransformation;
+ import org.apache.maven.wagon.TransferFailedException;
+ 
++import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.HashMap;
+ import java.util.HashSet;
+@@ -44,6 +45,10 @@ public class DefaultArtifactResolver
+     // Implementation
+     // ----------------------------------------------------------------------
+ 
++   public Artifact resolve(Artifact artifact, Set remoteRepositories, ArtifactRepository localRepository) throws ArtifactResolutionException {
++        return resolve(artifact, new ArrayList(remoteRepositories), localRepository);
++    }
++
+     public Artifact resolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
+         throws ArtifactResolutionException
+     {
+@@ -132,6 +137,13 @@ public class DefaultArtifactResolver
+     // Transitive modes
+     // ----------------------------------------------------------------------
+ 
++    public ArtifactResolutionResult resolveTransitively( Set artifacts, Set remoteRepositories,
++        ArtifactRepository localRepository, ArtifactMetadataSource source, ArtifactFilter filter )
++        throws ArtifactResolutionException
++    {
++        return resolveTransitively(artifacts, new ArrayList(remoteRepositories), localRepository, source, filter);
++    }
++
+     public ArtifactResolutionResult resolveTransitively( Set artifacts, List remoteRepositories,
+         ArtifactRepository localRepository, ArtifactMetadataSource source, ArtifactFilter filter )
+         throws ArtifactResolutionException
+@@ -287,4 +299,4 @@ public class DefaultArtifactResolver
+     {
+ 
+     }
+-}
+\ No newline at end of file
++}
+diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
+index 779d879..9ac5077 100644
+--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
++++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
+@@ -27,4 +27,6 @@ public interface ArtifactFilter
+     //TODO(JVZ): change the signature of this to filter(Artifact) where the meaning of filter is
+     // to exclude. I did this backward and it's confusing.
+     boolean include( Artifact artifact );
++
++    boolean include( String artifactId );
+ }
+diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
+index f146b18..43c7097 100644
+--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
++++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
+@@ -50,4 +50,14 @@ public class ExclusionSetFilter
+ 
+         return true;
+     }
++
++    public boolean include( String artifactId )
++    {
++        if ( excludes.contains( artifactId ) )
++        {
++            return false;
++        }
++
++        return true;
++    }
+ }
+diff --git a/maven-core/pom.xml b/maven-core/pom.xml
+index 4161ee1..33a5bb3 100644
+--- a/maven-core/pom.xml
++++ b/maven-core/pom.xml
+@@ -75,41 +75,6 @@
+       <type>jar</type>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>maven</groupId>
+-      <artifactId>wagon-http-lightweight</artifactId>
+-      <version>1.0-alpha-2-SNAPSHOT</version>
+-      <type>jar</type>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>plexus</groupId>
+-      <artifactId>plexus-marmalade-factory</artifactId>
+-      <version>1.0-alpha-2-SNAPSHOT</version>
+-      <type>jar</type>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>maven</groupId>
+-      <artifactId>maven-script-marmalade</artifactId>
+-      <version>2.0-SNAPSHOT</version>
+-      <type>jar</type>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>marmalade</groupId>
+-      <artifactId>marmalade-core</artifactId>
+-      <version>1.0-alpha2-SNAPSHOT</version>
+-      <type>jar</type>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>xpp3</groupId>
+-      <artifactId>xpp3</artifactId>
+-      <version>1.1.3.3</version>
+-      <type>jar</type>
+-      <scope>compile</scope>
+-    </dependency>
+   </dependencies>
+   <reports>
+     <plugins>
+@@ -129,4 +94,4 @@
+       <url>scp://www.apache.org//www/maven.apache.org/m2</url>
+     </site>
+   </distributionManagement>
+-</model>
+\ No newline at end of file
++</model>
+diff --git a/maven-core/src/bin/m2 b/maven-core/src/bin/m2
+index eca5aa1..1005f12 100755
+--- a/maven-core/src/bin/m2
++++ b/maven-core/src/bin/m2
+@@ -5,6 +5,14 @@
+ # All rights reserved.
+ # -----------------------------------------------------------------------------
+ 
++if [ -z "$M2_HOME" ]; then
++  #find the path of the bin directory
++  BIN_DIR=`dirname $0`
++
++  #use dirname once again to trim the /bin from the m2_home path
++  M2_HOME=`dirname $BIN_DIR`
++fi
++
+ #@#
+ CLASSWORLDS_JAR=${M2_HOME}/core/boot/classworlds-*.jar
+ CLASSWORLDS_CONF=${M2_HOME}/bin/m2.conf
+@@ -63,14 +71,6 @@ if $cygwin; then
+   [ -n "$M2_HOME" ] && M2_HOME=`cygpath --path --unix "$M2_HOME"`
+ fi
+ 
+-if [ -z "$M2_HOME" ]; then
+-  #find the path of the bin directory
+-  BIN_DIR=`dirname $0`
+-
+-  #use dirname once again to trim the /bin from the m2_home path
+-  M2_HOME=`dirname $BIN_DIR`
+-fi
+-
+ # For Cygwin, switch paths to Windows format before running java
+ if $cygwin; then
+   [ -n "$CLASSWORLDS_JAR" ] && CLASSWORLDS_JAR=`cygpath --path --windows "$CLASSWORLDS_JAR"`
 diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 index 896701c..a58ca05 100644
 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
@@ -30,7 +237,7 @@ index 3a4c4b4..9045132 100644
      <component>
        <role>org.apache.maven.plugin.PluginManager</role>
 diff --git a/maven-mboot2/src/main/java/MBoot.java b/maven-mboot2/src/main/java/MBoot.java
-index 4839007..2eb49ca 100644
+index 4839007..8274fb8 100644
 --- a/maven-mboot2/src/main/java/MBoot.java
 +++ b/maven-mboot2/src/main/java/MBoot.java
 @@ -49,7 +49,7 @@ public class MBoot
@@ -51,7 +258,7 @@ index 4839007..2eb49ca 100644
                                          //"plexus/jars/plexus-container-api-1.0-alpha-1-SNAPSHOT.jar",
                                          "plexus/jars/plexus-container-default-1.0-alpha-2-SNAPSHOT.jar",
                                          //"plexus/jars/plexus-utils-1.0-alpha-1-SNAPSHOT.jar",
-@@ -74,7 +74,7 @@ public class MBoot
+@@ -74,11 +74,11 @@ public class MBoot
                                          "modello/jars/modello-xpp3-plugin-1.0-SNAPSHOT.jar"};
  
      String[] builds = new String[]{"maven-model", "maven-user-model", "maven-monitor", "maven-plugin",
@@ -60,6 +267,11 @@ index 4839007..2eb49ca 100644
                                     "maven-archiver", "maven-plugin-tools/maven-plugin-tools-api",
                                     "maven-plugin-tools/maven-plugin-tools-java",
                                     "maven-plugin-tools/maven-plugin-tools-pluggy",
+-                                   "maven-plugin-tools/maven-plugin-tools-marmalade", "maven-core-it-support", 
++                                   "maven-core-it-support",
+                                    "maven-core-it-verifier"};
+ 
+     String[] pluginBuilds = new String[]{"maven-plugins/maven-clean-plugin", "maven-plugins/maven-compiler-plugin",
 @@ -1646,4 +1646,4 @@ public class MBoot
              return this.directory;
          }

maven/maven_2_alpha_3.nix

@@ -0,0 +1,35 @@
+{stdenv, fetchFromGitHub, jdk6, mavenDep, modello-plugin-xpp3_alpha_3}: stdenv.mkDerivation rec {
+    pname = "maven";
+    version = "2.0-alpha-3";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "fcbc5e7d6fe83ca586d308d977c5b2dc7ae1796a";
+        hash = "sha256-cPp141Pz1mYqIIS5dvh/3Z7FGeER2UMYy1ewhkUJxmc=";
+    };
+
+    #patches = [./maven_2.patch];
+
+    nativeBuildInputs = [jdk6
+    (mavenDep modello-plugin-xpp3_alpha_3 {})];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        M2_HOME="/build/m2";
+        #MAVEN_OPTS="-Dmaven.online=false";
+    };
+
+    configurePhase = ''
+        #mkdir /build/.m2
+    '';
+
+    buildPhase = ''
+        ./m2-bootstrap-all.sh
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}

overlay.nix

@@ -167,7 +167,7 @@ bommels = pkgs.lib.makeScope pkgs.newScope (self: rec {
 
   junit_3_8_1 = self.callPackage ./java/junit_3_8_1.nix { inherit jdk6 ant_1_7; };
 
-  commons-lang_2 = self.callPackage ./java/commons-lang.nix { inherit jdk6 ant_1_7; };
+  commons-lang_2 = self.callPackage ./java/commons-lang_2.nix { inherit jdk6 ant_1_7; };
   commons-lang_1 = self.callPackage ./java/commons-lang_1.nix { inherit jdk6 ant_1_7; };
   commons-lang_1_1 = self.callPackage ./java/commons-lang_1_1.nix { inherit jdk6 ant_1_7; };
   commons-logging_1_0 = self.callPackage ./java/commons-logging_1_0.nix { inherit jdk6 ant_1_7; };
@@ -268,13 +268,14 @@ bommels = pkgs.lib.makeScope pkgs.newScope (self: rec {
   plexus-i18n = self.callPackage ./java/plexus/plexus-i18n.nix { inherit jdk6 ant_1_7 maven_1 plexus_0_16-bootstrap; };
   javacc = self.callPackage ./java/javacc.nix { inherit jdk6 ant_1_7; };
   ognl = self.callPackage ./java/ognl.nix { inherit jdk6 ant_1_7 javacc; };
-  plexus-compiler-api = self.callPackage ./java/plexus/plexus-compiler-api.nix { inherit jdk6 ant_1_7 plexus_0_16-bootstrap junit_3_8_1; };
-  plexus-compiler-javac = self.callPackage ./java/plexus/plexus-compiler-javac.nix { inherit jdk6 ant_1_7 plexus-compiler-api
+  plexus-compiler-api_1_0 = self.callPackage ./java/plexus/plexus-compiler-api_1_0.nix { inherit jdk6 ant_1_7 plexus_0_16-bootstrap
+    junit_3_8_1; };
+  plexus-compiler-javac_1_0 = self.callPackage ./java/plexus/plexus-compiler-javac_1_0.nix { inherit jdk6 ant_1_7 plexus-compiler-api_1_0
     plexus_0_16-bootstrap; };
   surefire-booter_1_1 = self.callPackage ./java/surefire-booter_1_1.nix { inherit jdk6 ant_1_7 maven_1 surefire_1_1 plexus_0_14; };
 
   maven_2-bootstrap-1 = self.callPackage ./maven/maven-bootstrap-1.nix { inherit jdk6 modello xpp3 xstream_0_5 surefire_1_1 junit_3_8_1 qdox
-    plexus_0_16-bootstrap wagon-api_0_9 classworlds commons-cli_beta_2 plexus-i18n ognl plexus-compiler-api plexus-compiler-javac
+    plexus_0_16-bootstrap wagon-api_0_9 classworlds commons-cli_beta_2 plexus-i18n ognl plexus-compiler-api_1_0 plexus-compiler-javac_1_0
     surefire-booter_1_1; };
 
   maven-artifact = self.callPackage ./java/wrapper/maven-artifact.nix { inherit maven_2-bootstrap-1; };
@@ -282,13 +283,14 @@ bommels = pkgs.lib.makeScope pkgs.newScope (self: rec {
     maven-artifact; };
 
   maven_2-boostrap-2 = self.callPackage ./maven/maven-bootstrap-2.nix { inherit jdk6 modello xpp3 xstream_0_5 surefire_1_1 junit_3_8_1 qdox
-    plexus_0_16 wagon-api_0_9 classworlds commons-cli_beta_2 plexus-i18n ognl plexus-compiler-api plexus-compiler-javac surefire-booter_1_1; };
+    plexus_0_16 wagon-api_0_9 classworlds commons-cli_beta_2 plexus-i18n ognl plexus-compiler-api_1_0 plexus-compiler-javac_1_0
+    surefire-booter_1_1; };
 
   plexus-pom_1_0 = self.callPackage ./java/plexus/plexus-pom_1_0.nix { };
-  plexus-containers-pom = self.callPackage ./java/plexus/plexus-containers-pom.nix { };
+  plexus-containers-pom_alpha_1 = self.callPackage ./java/plexus/plexus-containers-pom_alpha_1.nix { };
   plexus-utils_alpha_1 = self.callPackage ./java/plexus/plexus-utils_alpha_1.nix { inherit jdk6 maven_2-boostrap-2 plexus-pom_1_0; };
   plexus-container-default_alpha_1 = self.callPackage ./java/plexus/plexus-container-default_alpha_1.nix { inherit jdk6 maven_2-boostrap-2
-    plexus-containers-pom plexus-pom_1_0 plexus-utils_alpha_1; };
+    plexus-containers-pom_alpha_1 plexus-pom_1_0 plexus-utils_alpha_1; };
 
   modello-pom = self.callPackage ./java/modello/modello-pom.nix { };
   modello-core = self.callPackage ./java/modello/modello-core.nix { inherit jdk6 maven_2-boostrap-2 modello-pom plexus-utils_alpha_1
@@ -320,21 +322,46 @@ bommels = pkgs.lib.makeScope pkgs.newScope (self: rec {
   maven_2-boostrap-3 = self.callPackage ./maven/maven_2-bootstrap-3.nix { inherit jdk6 junit_3_8_1 modello-core modello-xdoc-plugin
     modello-xml-plugin modello-xpp3-plugin plexus-utils_alpha_1 surefire-booter_1_2 surefire_1_2 qdox classworlds
     plexus-container-default_alpha_1 wagon-provider-api wagon-file commons-cli_beta_2 plexus-i18n plexus-container-artifact_alpha_1
-    plexus-compiler-api plexus-compiler-javac plexus_0_17 wagon-api_alpha_1 wagon-pom_alpha_1 plexus-pom_1_0 wagon-providers-pom
-    plexus-containers-pom modello-pom wagon-provider-test xpp3 xstream_1_0 asm plexus_0_14 wagon-pom_alpha_2; };
+    plexus-compiler-api_1_0 plexus-compiler-javac_1_0 plexus_0_17 wagon-api_alpha_1 wagon-pom_alpha_1 plexus-pom_1_0 wagon-providers-pom
+    plexus-containers-pom_alpha_1 modello-pom wagon-provider-test xpp3 xstream_1_0 asm plexus_0_14 wagon-pom_alpha_2; };
 
-  plexus-container-default_alpha_2 = self.callPackage ./java/plexus/plexus-container-default_alpha_2.nix { inherit jdk6 maven_2-boostrap-3; };
+  plexus-containers-pom_alpha_2 = self.callPackage ./java/plexus/plexus-containers-pom_alpha_2.nix { };
+  plexus-container-default_alpha_2 = self.callPackage ./java/plexus/plexus-container-default_alpha_2.nix { inherit jdk6 maven_2-boostrap-3
+    plexus-containers-pom_alpha_2; };
   plexus-container-artifact_alpha_2 = self.callPackage ./java/plexus/plexus-container-artifact_alpha_2.nix { inherit jdk6 maven_2-boostrap-3
-    plexus-container-default_alpha_2 wagon-provider-api; };
+    plexus-containers-pom_alpha_2 plexus-container-default_alpha_2; };
+  plexus-components-pom = self.callPackage ./java/plexus/plexus-components-pom.nix { };
+  plexus-archiver = self.callPackage ./java/plexus/plexus-archiver.nix { inherit jdk6 maven_2-boostrap-3 plexus-components-pom; };
+  plexus-compiler-pom = self.callPackage ./java/plexus/plexus-compiler-pom.nix { };
+  plexus-compiler-api_1_2 = self.callPackage ./java/plexus/plexus-compiler-api_1_2.nix { inherit jdk6 maven_2-boostrap-3
+    plexus-components-pom plexus-compiler-pom; };
+  plexus-compiler-test_1_2 = self.callPackage ./java/plexus/plexus-compiler-test_1_2.nix { inherit jdk6 maven_2-boostrap-3
+    plexus-components-pom plexus-compiler-pom plexus-compiler-api_1_2 commons-lang_2; };
+  plexus-compilers-pom = self.callPackage ./java/plexus/plexus-compilers-pom.nix { };
+  plexus-compiler-javac_1_2 = self.callPackage ./java/plexus/plexus-compiler-javac_1_2.nix { inherit jdk6 maven_2-boostrap-3
+    plexus-components-pom plexus-compiler-pom plexus-compilers-pom plexus-compiler-api_1_2 plexus-compiler-test_1_2; };
 
   maven_2-boostrap-4 = self.callPackage ./maven/maven_2-bootstrap-4.nix { inherit jdk6 junit_3_8_1 modello-core modello-xdoc-plugin
     modello-xml-plugin modello-xpp3-plugin plexus-utils_alpha_2 surefire-booter_1_2 surefire_1_2 qdox plexus-container-default_alpha_2
-    wagon-provider-api wagon-file commons-cli_beta_2 plexus-i18n plexus-container-artifact_alpha_2; };
+    wagon-provider-api wagon-file commons-cli_beta_2 plexus-i18n plexus-container-artifact_alpha_2 plexus-archiver modello
+    plexus-compiler-api_1_2 plexus-compiler-javac_1_2 plexus-container-default_alpha_1 plexus-components-pom plexus-pom_1_0
+    plexus-utils_alpha_1 plexus-containers-pom_alpha_2 plexus-compiler-pom plexus-compilers-pom plexus-compiler-test_1_2 commons-lang_2; };
+
+  modello-pom_alpha_3 = self.callPackage ./java/modello/modello-pom_alpha_3.nix { };
+  modello-test_alpha_3 = self.callPackage ./java/modello/modello-test_alpha_3.nix { inherit jdk6 maven_2-boostrap-4
+    modello-pom_alpha_3; };
+  modello-plugins-pom = self.callPackage ./java/modello/modello-plugins-pom.nix { };
+  modello-plugin-xml_alpha_3 = self.callPackage ./java/modello/modello-plugin-xml_alpha_3.nix { inherit jdk6 maven_2-boostrap-4
+    modello-plugins-pom modello-pom_alpha_3 modello-test_alpha_3; };
+  modello-plugin-xpp3_alpha_3 = self.callPackage ./java/modello/modello-plugin-xpp3_alpha_3.nix { inherit jdk6 maven_2-boostrap-4
+    modello-plugins-pom modello-pom_alpha_3 modello-plugin-xml_alpha_3; };
+
+  maven_2_alpha_3 = self.callPackage ./maven/maven_2_alpha_3.nix { inherit jdk6 modello-plugin-xpp3_alpha_3; };
 
   plexus-pom = self.callPackage ./java/plexus/plexus-pom.nix { inherit jdk6 maven_2-boostrap-4; };
-  plexus-container-default = self.callPackage ./java/plexus/plexus-container-default.nix { inherit jdk6 plexus-pom; };
+  plexus-container-default_alpha_8 = self.callPackage ./java/plexus/plexus-container-default_alpha_8.nix { inherit jdk6 maven_2_alpha_3; };
 
-  maven = self.callPackage ./maven/maven.nix { inherit jdk6 plexus-container-default; };
+  maven = self.callPackage ./maven/maven.nix { inherit jdk6 plexus-container-default_alpha_8; };
 
   ant_1_6 = self.callPackage ./ant/ant_1_6.nix { inherit jdk6 ant_1_7; };
   commons-cli = self.callPackage ./java/commons-cli.nix { inherit jdk6 ant_1_7 maven commons-lang_1; };