diff --git a/ant/ant_1_5_3.nix b/ant/ant_1_5_3.nix index 2e1817a..88c6b63 100644 --- a/ant/ant_1_5_3.nix +++ b/ant/ant_1_5_3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchzip, jdk6, ant_1_7}: stdenv.mkDerivation rec { +{stdenv, fetchzip, jdk6, ant_1_7, junit_3_8_1}: stdenv.mkDerivation rec { pname = "ant"; version = "1.5.3-1"; outJar = "lib/ant.jar"; @@ -13,6 +13,7 @@ nativeBuildInputs = [jdk6 ant_1_7]; env = { JAVA_HOME="${jdk6}"; + CLASSPATH="${junit_3_8_1}/junit.jar"; }; buildPhase = '' diff --git a/ant/ivy.nix b/ant/ivy.nix index 832e1fe..ff4d5da 100644 --- a/ant/ivy.nix +++ b/ant/ivy.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub, jdk6, ant_1_7, ivyDep, ivyDepHook, ant_1_6, commons-cli, commons-httpclient_3, oro, commons-vfs, -jsch_0_1_25, junit_3_8_2, commons-lang, xerces, xerces-api}: stdenv.mkDerivation rec { +jsch_0_1_25, junit_3_8_2, commons-lang, xerces_2_6_2, xerces-api}: stdenv.mkDerivation rec { pname = "ivy"; version = "2.0.0-beta2"; @@ -22,7 +22,7 @@ jsch_0_1_25, junit_3_8_2, commons-lang, xerces, xerces-api}: stdenv.mkDerivation (ivyDep jsch_0_1_25 {}) (ivyDep junit_3_8_2 {}) (ivyDep commons-lang {}) - (ivyDep xerces {}) + (ivyDep xerces_2_6_2 {}) (ivyDep xerces-api {})]; env = { diff --git a/java/.patch b/java/.patch new file mode 100644 index 0000000..7cce6b1 --- /dev/null +++ b/java/.patch @@ -0,0 +1,318 @@ +diff --git a/build.xml b/build.xml +index 7feeb26..fa65fc7 100644 +--- a/build.xml ++++ b/build.xml +@@ -1,205 +1,109 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ================================= WARNING ================================ ++ Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed. ++ ========================================================================== ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + diff --git a/java/commons-beanutils_1_6_1.nix b/java/commons-beanutils_1_6_1.nix new file mode 100644 index 0000000..1156696 --- /dev/null +++ b/java/commons-beanutils_1_6_1.nix @@ -0,0 +1,28 @@ +{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-logging_1_0, commons-collections_2_0}: stdenv.mkDerivation rec { + pname = "commons-beanutils"; + version = "1.6.1"; + outJar = "commons-beanutils.jar"; + + src = fetchFromGitHub { + owner = "apache"; + repo = pname; + rev = "BEANUTILS_1_6_1"; + hash = "sha256-AaUVo9mlvEt+UA95eL+F7p1YOKxAUYhYTCT8XXb5hNM="; + }; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + CLASSPATH="${commons-logging_1_0}/commons-logging.jar:${commons-collections_2_0}/commons-collections.jar"; + }; + + buildPhase = '' + ant dist + ''; + + installPhase = '' + mkdir $out + cp -r ./dist/* $out/ + ''; +} diff --git a/java/commons-cli-bootstrap.nix b/java/commons-cli-bootstrap.nix index c77ea97..fd3e192 100644 --- a/java/commons-cli-bootstrap.nix +++ b/java/commons-cli-bootstrap.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-lang}: stdenv.mkDerivation rec { +{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-lang_1}: stdenv.mkDerivation rec { pname = "commons-cli"; version = "1.0"; outJar = "commons-cli-1.0-beta-2-dev.jar"; @@ -14,7 +14,7 @@ env = { JAVA_HOME="${jdk6}"; - CLASSPATH="${commons-lang}/commons-lang-2.0.jar"; + CLASSPATH="${commons-lang_1}/commons-lang-1.0.jar"; }; buildPhase = '' diff --git a/java/commons-cli.nix b/java/commons-cli.nix index 44de00b..a0a03a1 100644 --- a/java/commons-cli.nix +++ b/java/commons-cli.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, jdk6, ant_1_7, maven, commons-lang}: stdenv.mkDerivation rec { +{stdenv, fetchFromGitHub, jdk6, ant_1_7, maven, commons-lang_1}: stdenv.mkDerivation rec { pname = "commons-cli"; version = "1.0"; outJar = "commons-cli-1.0-beta-2-dev.jar"; @@ -14,7 +14,7 @@ env = { JAVA_HOME="${jdk6}"; - CLASSPATH="${commons-lang}/commons-lang-2.0.jar"; + CLASSPATH="${commons-lang_1}/commons-lang-1.0.jar"; }; buildPhase = '' diff --git a/java/commons-cli.patch b/java/commons-cli.patch new file mode 100644 index 0000000..4612317 --- /dev/null +++ b/java/commons-cli.patch @@ -0,0 +1,207 @@ +diff --git a/build.xml b/build.xml +index 3c48ef3..5b772fb 100644 +--- a/build.xml ++++ b/build.xml +@@ -1,180 +1,30 @@ +- ++ + +- ++ + +- ++ ++ ++ + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ + +- ++ + +- ++ ++ ++ ++ ++ + +- +- +- +- +- +- +- +- +- + +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + diff --git a/java/commons-cli_beta_2.nix b/java/commons-cli_beta_2.nix new file mode 100644 index 0000000..75ac129 --- /dev/null +++ b/java/commons-cli_beta_2.nix @@ -0,0 +1,30 @@ +{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-lang_1}: stdenv.mkDerivation rec { + pname = "commons-cli"; + version = "1.0-beta-2"; + outJar = "commons-cli-1.0-beta-2-dev.jar"; + + src = fetchFromGitHub { + owner = "apache"; + repo = pname; + rev = "4353a45233ab7aeb4d99aed02cd40d3257dfc745"; + hash = "sha256-N0470jrYCSPZXPGh0lxzTdxGRMmeKd8aZWye/vwLnmM="; + }; + + patches = [./commons-cli.patch]; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + CLASSPATH="${commons-lang_1}/commons-lang-1.0.jar"; + }; + + buildPhase = '' + ant + ''; + + installPhase = '' + mkdir $out + cp -r ./dist/* $out/ + ''; +} diff --git a/java/commons-io.nix b/java/commons-io.nix new file mode 100644 index 0000000..291d795 --- /dev/null +++ b/java/commons-io.nix @@ -0,0 +1,29 @@ +{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-lang_1_1}: stdenv.mkDerivation rec { + pname = "commons-io"; + version = "20030203.000550"; + outJar = "commons-io.jar"; + + src = fetchFromGitHub { + owner = "apache"; + repo = pname; + rev = "5cde3d9ced307f01ded5a4090db3737b1d55e8e5"; + hash = "sha256-Q3XvZP+UijBrTtmqAGftstnxvb39fewN2WJ+IqSMMcc="; + }; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + CLASSPATH="${commons-lang_1_1}/commons-lang-1.1.jar"; + }; + + buildPhase = '' + touch /build/LICENSE + ant dist + ''; + + installPhase = '' + mkdir $out + cp -r ./dist/* $out/ + ''; +} diff --git a/java/commons-lang.patch b/java/commons-lang.patch new file mode 100644 index 0000000..0cc930b --- /dev/null +++ b/java/commons-lang.patch @@ -0,0 +1,24 @@ +diff --git a/build.xml b/build.xml +index 7427788..c93f0d4 100644 +--- a/build.xml ++++ b/build.xml +@@ -63,7 +63,8 @@ + destdir="${build.home}/classes" + debug="${compile.debug}" + deprecation="${compile.deprecation}" +- optimize="${compile.optimize}"> ++ optimize="${compile.optimize}" ++ target="1.4"> + + + +@@ -78,7 +79,8 @@ + destdir="${build.home}/tests" + debug="${compile.debug}" + deprecation="off" +- optimize="${compile.optimize}"> ++ optimize="${compile.optimize}" ++ target="1.4"> + + + diff --git a/java/commons-lang_1.nix b/java/commons-lang_1.nix new file mode 100644 index 0000000..acb8504 --- /dev/null +++ b/java/commons-lang_1.nix @@ -0,0 +1,30 @@ +{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec { + pname = "commons-lang"; + version = "1.0"; + outJar = "commons-lang-1.0.jar"; + + src = fetchFromGitHub { + owner = "apache"; + repo = pname; + rev = "LANG_1_0"; + hash = "sha256-qE7t4xHM/4zUXIv/hWp6yPw+9SmcG7gbzYH2YxrkJIY="; + }; + + patches = [./commons-lang.patch]; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + }; + + buildPhase = '' + ln -s /build/source/LICENSE.txt /build/LICENSE + ant dist + ''; + + installPhase = '' + mkdir $out + cp -r ./dist/* $out/ + ''; +} diff --git a/java/commons-lang_1_1.nix b/java/commons-lang_1_1.nix new file mode 100644 index 0000000..0c92417 --- /dev/null +++ b/java/commons-lang_1_1.nix @@ -0,0 +1,31 @@ +{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec { + pname = "commons-lang"; + version = "1.1"; + outJar = "commons-lang-1.1.jar"; + + src = fetchFromGitHub { + owner = "apache"; + repo = pname; + rev = "c6dcdde0070d30e57d7dfcc77e5300479cd35318"; + hash = "sha256-HPwI8i8aukS6H+zDLoGAHO7i4zaxhOTKjgccV4NrHVE="; + }; + + patches = [./commons-lang.patch]; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + }; + + buildPhase = '' + ln -s /build/source/LICENSE.txt /build/LICENSE + ant dist + ''; + + installPhase = '' + mkdir $out + cp -r ./dist/* $out/ + mv $out/commons-lang-1.1-dev.jar $out/commons-lang-1.1.jar + ''; +} diff --git a/java/download/forehead.nix b/java/download/forehead.nix new file mode 100644 index 0000000..009ff88 --- /dev/null +++ b/java/download/forehead.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: stdenv.mkDerivation rec { + pname = "forehead"; + version = "1.0-beta-5"; + outJar = "forehead-1.0-beta-5.jar"; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + src = fetchurl { + url = "https://repo1.maven.org/maven2/forehead/forehead/1.0-beta-5/forehead-1.0-beta-5.jar"; + hash = "sha256-eluh5pJLIRuhbTt6mutSQoANinrtxdQDiN318K7qk88="; + }; + + installPhase = '' + mkdir $out + cp -r ${src} $out/forehead-1.0-beta-5.jar + ''; +} diff --git a/java/download/plexus.nix b/java/download/plexus.nix new file mode 100644 index 0000000..fe496ea --- /dev/null +++ b/java/download/plexus.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: stdenv.mkDerivation rec { + pname = "plexus"; + version = "0.6"; + outJar = "plexus-0.6.jar"; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + src = fetchurl { + url = "https://repo1.maven.org/maven2/plexus/plexus/0.6/plexus-0.6.jar"; + hash = "sha256-cvnpWpRfRglWiFeiq+/6RbHCI5i81noBb1iofMkAWLw="; + }; + + installPhase = '' + mkdir $out + cp -r ${src} $out/plexus-0.6.jar + ''; +} diff --git a/java/download/werkz.nix b/java/download/werkz.nix new file mode 100644 index 0000000..be6b2c7 --- /dev/null +++ b/java/download/werkz.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: stdenv.mkDerivation rec { + pname = "werkz"; + version = "20040426.222000"; + outJar = "werkz-20040426.222000.jar"; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + src = fetchurl { + url = "https://repo1.maven.org/maven2/werkz/werkz/20040426.222000/werkz-20040426.222000.jar"; + hash = "sha256-rBP5W3oQP5eWpNgQ2nHqNblELJsAGC77MK3jv06Fmaw="; + }; + + installPhase = '' + mkdir $out + cp -r ${src} $out/werkz-20040426.222000.jar + ''; +} diff --git a/java/jaxen.nix b/java/jaxen.nix index cd1e043..0155c46 100644 --- a/java/jaxen.nix +++ b/java/jaxen.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, jdk6, ant_1_7, saxpath, dom4j}: stdenv.mkDerivation rec { +{stdenv, fetchFromGitHub, jdk6, ant_1_7, saxpath, dom4j, jdom}: stdenv.mkDerivation rec { pname = "jaxen"; version = "1.0-FCS"; outJar = "jaxen-full.jar"; @@ -16,7 +16,7 @@ env = { JAVA_HOME="${jdk6}"; - CLASSPATH="${saxpath}/saxpath.jar:${dom4j}/dom4j.jar"; + CLASSPATH="${saxpath}/saxpath.jar:${dom4j}/dom4j.jar:${jdom}/jdom.jar"; }; buildPhase = '' diff --git a/java/jaxen.patch b/java/jaxen.patch index 0a7bf80..95f40d4 100644 --- a/java/jaxen.patch +++ b/java/jaxen.patch @@ -91,3 +91,39 @@ index 42fc619..832b248 100644 //////////////////////////////////////////////////////////////////// +diff --git a/src/java/main/org/jaxen/jdom/DocumentNavigator.java b/src/java/main/org/jaxen/jdom/DocumentNavigator.java +index 8955fcd..c414c3a 100644 +--- a/src/java/main/org/jaxen/jdom/DocumentNavigator.java ++++ b/src/java/main/org/jaxen/jdom/DocumentNavigator.java +@@ -231,7 +231,7 @@ public class DocumentNavigator extends DefaultNavigator + nsMap.put( ns.getPrefix(), new XPathNamespace(elem, ns) ); + } + +- current = current.getParent(); ++ current = (Element) current.getParent(); + } + + nsMap.put( "xml", new XPathNamespace(elem, Namespace.XML_NAMESPACE) ); +@@ -458,7 +458,7 @@ public class DocumentNavigator extends DefaultNavigator + } + else if ( context instanceof Text ) + { +- element = ((Text)context).getParent(); ++ element = (Element) ((Text)context).getParent(); + } + else if ( context instanceof Attribute ) + { +@@ -470,11 +470,11 @@ public class DocumentNavigator extends DefaultNavigator + } + else if ( context instanceof Comment ) + { +- element = ((Comment)context).getParent(); ++ element = (Element) ((Comment)context).getParent(); + } + else if ( context instanceof ProcessingInstruction ) + { +- element = ((ProcessingInstruction)context).getParent(); ++ element = (Element) ((ProcessingInstruction)context).getParent(); + } + + if ( element != null ) diff --git a/java/jdom.nix b/java/jdom.nix new file mode 100644 index 0000000..4a6241a --- /dev/null +++ b/java/jdom.nix @@ -0,0 +1,28 @@ +{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec { + pname = "jdom"; + version = "b10"; + outJar = "jdom.jar"; + + src = fetchFromGitHub { + owner = "hunterhacker"; + repo = pname; + rev = "1259dc2d5131297f4cd806e307e4998d714dd80e"; + hash = "sha256-US2iw6cMEvXzKiRlZ9rBKvjYZd0AfCcEfZnQAQoltyA="; + }; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + }; + + buildPhase = '' + cd core + ant + ''; + + installPhase = '' + mkdir $out + cp ./build/jdom.jar $out/jdom.jar + ''; +} diff --git a/java/jelly/commons-jelly-tags-interaction.nix b/java/jelly/commons-jelly-tags-interaction.nix new file mode 100644 index 0000000..312909c --- /dev/null +++ b/java/jelly/commons-jelly-tags-interaction.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, fetchFromGitHub, jdk6, ant_1_7, commons-jelly, junit_3_8_1}: stdenv.mkDerivation rec { + pname = "commons-jelly-tags-interaction"; + version = "1.0"; + outJar = "commons-jelly-tags-interaction-1.0-SNAPSHOT.jar"; + org = "commons-jelly"; + + src = fetchFromGitHub { + owner = "apache"; + repo = pname; + rev = "717379e1b4db3edcc1404bd33242d6342530ad88"; + hash = "sha256-FACLrmbwn7Z0eYc7vb54O35Lu9j/a+7dB0+Jv6/xDUk="; + }; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + CLASSPATH="${commons-jelly}/commons-jelly-1.0-beta-4-SNAPSHOT.jar:${junit_3_8_1}/junit.jar"; + }; + + buildPhase = '' + cd jelly-tags/interaction + ant dist + ''; + + installPhase = '' + mkdir $out + cp -r ./dist/* $out/ + ''; +} diff --git a/java/jelly/commons-jelly-tags-maven.nix b/java/jelly/commons-jelly-tags-maven.nix new file mode 100644 index 0000000..325cde2 --- /dev/null +++ b/java/jelly/commons-jelly-tags-maven.nix @@ -0,0 +1,36 @@ +{stdenv, fetchsvn, jdk6, ant_1_7, mavenDep, commons-jelly, commons-logging_1_0_3, werkz, fake-maven, commons-jelly-tags-ant, +commons-grant}: stdenv.mkDerivation rec { + pname = "maven-jelly-tags"; + version = "1.0.1"; + outJar = "maven-jelly-tags-1.0.1.jar"; + org = "maven"; + + src = fetchsvn { + url = "https://svn.apache.org/repos/asf/maven/maven-1/jelly-tags/tags/MAVEN_JELLY_TAGS_1_0_1"; + rev = "1928317"; + hash = "sha256-GeCVa/BzFqL5DrNVagWIZtn+fLs5+SpiDl7B6IuKj7w="; + }; + + patches = [./commons-jelly-tags-maven.patch]; + + nativeBuildInputs = [jdk6 ant_1_7 + (mavenDep commons-jelly {}) + (mavenDep commons-logging_1_0_3 {}) + (mavenDep werkz {}) + (mavenDep fake-maven {}) + (mavenDep commons-jelly-tags-ant {}) + (mavenDep commons-grant {})]; + + env = { + JAVA_HOME="${jdk6}"; + }; + + buildPhase = '' + ant dist + ''; + + installPhase = '' + mkdir $out + cp -r ./dist/* $out/ + ''; +} diff --git a/java/jelly/commons-jelly-tags-maven.patch b/java/jelly/commons-jelly-tags-maven.patch new file mode 100644 index 0000000..88220df --- /dev/null +++ b/java/jelly/commons-jelly-tags-maven.patch @@ -0,0 +1,302 @@ +diff --git a/build.xml b/build.xml +new file mode 100644 +index 0000000..6e06165 +--- /dev/null ++++ b/build.xml +@@ -0,0 +1,112 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ================================= WARNING ================================ ++ Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed. ++ ========================================================================== ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/src/java/main/org/apache/maven/jelly/tags/maven/GraphDependencyResolver.java b/src/java/main/org/apache/maven/jelly/tags/maven/GraphDependencyResolver.java +deleted file mode 100644 +index 41ef723..0000000 +--- a/src/java/main/org/apache/maven/jelly/tags/maven/GraphDependencyResolver.java ++++ /dev/null +@@ -1,178 +0,0 @@ +-package org.apache.maven.jelly.tags.maven; +- +-/* ==================================================================== +- * Copyright 2001-2004 The Apache Software Foundation. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- * ==================================================================== +- */ +- +-import org.apache.commons.graph.domain.dependency.DependencyGraph; +-import org.apache.maven.project.Dependency; +-import org.apache.maven.project.Project; +- +-import java.util.ArrayList; +-import java.util.HashMap; +-import java.util.Iterator; +-import java.util.List; +- +-/** +- * Takes a list of maven projects and determines the overall +- * dependency ordering among the project. +- * +- * @author Jason van Zyl +- * @version $Id: GraphDependencyResolver.java 112246 2004-11-06 14:18:06Z $ +- */ +-public class GraphDependencyResolver implements DependencyResolverInterface +-{ +- /** +- * The dependency graph. +- */ +- private DependencyGraph dependencyGraph; +- +- /** +- * List of maven projects to analyse. +- */ +- private List projects; +- +- /** +- * Flag to indicate whether the graph has been built. +- */ +- private boolean graphBuilt; +- +- /** +- * Default constructor. +- */ +- public GraphDependencyResolver() +- { +- dependencyGraph = new DependencyGraph(); +- projects = new ArrayList(); +- graphBuilt = false; +- } +- +- /** +- * @see org.apache.maven.jelly.tags.maven.DependencyResolverInterface#clear() +- */ +- public void clear() +- { +- graphBuilt = false; +- projects.clear(); +- } +- +- /** +- * @see org.apache.maven.jelly.tags.maven.DependencyResolverInterface#setProjects(List) +- */ +- public void setProjects( List projects ) +- { +- this.projects = projects; +- } +- +- /** +- * @see org.apache.maven.jelly.tags.maven.DependencyResolverInterface#getSortedDependencies(Project) +- */ +- public List getSortedDependencies( Project project ) +- { +- return getSortedDependencies( project, false ); +- } +- +- /** +- * @see org.apache.maven.jelly.tags.maven.DependencyResolverInterface#getSortedDependencies(Project, boolean) +- */ +- public List getSortedDependencies( Project project, boolean sourceBuild ) +- { +- buildGraph(); +- List sortedDependencies = dependencyGraph.getSortedDependencies( project ); +- +- if ( sourceBuild ) +- { +- return sortedDependencies; +- } +- +- return getBinaryDependencies( sortedDependencies ); +- } +- +- /** +- * @see org.apache.maven.jelly.tags.maven.DependencyResolverInterface#getSortedDependencies(boolean) +- */ +- public List getSortedDependencies( boolean sourceBuild ) +- { +- buildGraph(); +- +- List sortedDependencies = dependencyGraph.getSortedDependencies(); +- +- if ( sourceBuild ) +- { +- return sortedDependencies; +- } +- +- return getBinaryDependencies( sortedDependencies ); +- } +- +- /** +- * Get dependency graph for a build based on binary inputs. +- * +- * @param sortedDependencies List of projects that have been dependency sorted. +- * @return The list of projects. +- */ +- private List getBinaryDependencies( List sortedDependencies ) +- { +- HashMap idMap = new HashMap(); +- for ( Iterator i = projects.iterator(); i.hasNext(); ) +- { +- Project p = (Project) i.next(); +- idMap.put( p.getId(), p ); +- } +- +- List binaryDeps = new ArrayList(); +- for ( Iterator i = sortedDependencies.iterator(); i.hasNext(); ) +- { +- Project p = (Project) i.next(); +- +- Project dep = (Project) idMap.get( p.getId() ); +- if ( dep != null ) +- { +- binaryDeps.add( dep ); +- } +- } +- +- return binaryDeps; +- } +- +- /** +- * Build the dependency graph. +- */ +- private void buildGraph() +- { +- if ( graphBuilt ) +- { +- return; +- } +- +- for ( Iterator i = projects.iterator(); i.hasNext(); ) +- { +- Project p = (Project) i.next(); +- +- ArrayList dependencies = new ArrayList(); +- for ( Iterator j = p.getDependencies().iterator(); j.hasNext(); ) +- { +- Dependency d = (Dependency) j.next(); +- Project dependentProject = new Project(); +- dependentProject.setId( d.getId() ); +- dependencies.add( dependentProject ); +- } +- +- dependencyGraph.addDependencies( p, dependencies ); +- } +- graphBuilt = true; +- } +-} diff --git a/java/jelly/commons-jelly-tags-velocity.nix b/java/jelly/commons-jelly-tags-velocity.nix new file mode 100644 index 0000000..59a444c --- /dev/null +++ b/java/jelly/commons-jelly-tags-velocity.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, fetchFromGitHub, jdk6, ant_1_7, commons-jelly, velocity_1_3, junit_3_8_1, commons-collections_2_1}: stdenv.mkDerivation rec { + pname = "commons-jelly-tags-velocity"; + version = "1.0"; + outJar = "commons-jelly-tags-velocity-1.0-SNAPSHOT.jar"; + org = "commons-jelly"; + + src = fetchFromGitHub { + owner = "apache"; + repo = pname; + rev = "717379e1b4db3edcc1404bd33242d6342530ad88"; + hash = "sha256-FACLrmbwn7Z0eYc7vb54O35Lu9j/a+7dB0+Jv6/xDUk="; + }; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + CLASSPATH="${commons-jelly}/commons-jelly-1.0-beta-4-SNAPSHOT.jar:${velocity_1_3}/velocity-1.3.jar:${junit_3_8_1}/junit.jar:${commons-collections_2_1}/commons-collections.jar"; + }; + + buildPhase = '' + cd jelly-tags/velocity + ant dist + ''; + + installPhase = '' + mkdir $out + cp -r ./dist/* $out/ + ''; +} diff --git a/java/log4j.patch b/java/log4j.patch new file mode 100644 index 0000000..d8f7e7f --- /dev/null +++ b/java/log4j.patch @@ -0,0 +1,83 @@ +diff --git a/build.xml b/build.xml +index 7ddc86b..3c537e9 100644 +--- a/build.xml ++++ b/build.xml +@@ -80,9 +80,6 @@ + + + +- +- +- + + + +@@ -119,7 +116,7 @@ + + + +- ++ + + + +@@ -185,7 +182,8 @@ + ${stem}/jmx/*.java, + ${stem}/or/jms/*.java" + deprecation="${deprecation}" +- debug="on"> ++ debug="on" ++ target="1.4"> + + + +@@ -206,7 +204,8 @@ + classpath="${classpath}" + excludes="misc/*" + deprecation="${deprecation}" +- debug="on"/> ++ debug="on" ++ target="1.4"/> + +@@ -225,7 +224,8 @@ + excludes="${stem}/xml/examples/doc-files/**.java, + ${stem}/xml/Transform.java" + deprecation="${deprecation}" +- classpath="${classpath}"> ++ classpath="${classpath}" ++ target="1.4"> + + + ++ includes="${stem}/net/SMTPAppender.java" ++ target="1.4"> + + + +@@ -246,7 +247,8 @@ + ++ includes="${stem}/net/JMS*.java" ++ target="1.4"> + + + +@@ -256,7 +258,8 @@ + srcdir="${java.source.dir}" + destdir="${javac.dest}" + includes="${stem}/jmx/*.java" +- excludes="${stem}/jmx/T.java"> ++ excludes="${stem}/jmx/T.java" ++ target="1.4"> + + + diff --git a/java/log4j_1_2_8.nix b/java/log4j_1_2_8.nix new file mode 100644 index 0000000..a4656de --- /dev/null +++ b/java/log4j_1_2_8.nix @@ -0,0 +1,29 @@ +{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec { + pname = "log4j"; + version = "1.2.8"; + outJar = "lib/log4j-1.2.8.jar"; + + src = fetchFromGitHub { + owner = "apache"; + repo = pname; + rev = "e87c632e10235c397fcc485cca3b94b8d9fed593"; + hash = "sha256-CoLhJTF0Wj2EZ2gfB9RXwj/XVfrNpHElplJzRPUzCbg="; + }; + + patches = [./log4j.patch]; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + }; + + buildPhase = '' + ant dist + ''; + + installPhase = '' + mkdir $out + cp -r ./dist/* $out/ + ''; +} diff --git a/java/velocity.patch b/java/velocity.patch new file mode 100644 index 0000000..d8224f6 --- /dev/null +++ b/java/velocity.patch @@ -0,0 +1,44 @@ +diff --git a/build/build.xml b/build/build.xml +index 4afee06..9ca99f6 100644 +--- a/build/build.xml ++++ b/build/build.xml +@@ -186,7 +186,8 @@ + destdir="${build.dest}" + debug="${debug}" + deprecation="${deprecation}" +- optimize="${optimize}"> ++ optimize="${optimize}" ++ target="1.4"> + + + +@@ -205,7 +206,8 @@ + destdir="${build.dest}" + debug="${debug}" + deprecation="${deprecation}" +- optimize="${optimize}"> ++ optimize="${optimize}" ++ target="1.4"> + + + +@@ -424,7 +426,8 @@ + :${example.dir}/event_example" + debug="${debug}" + deprecation="${deprecation}" +- optimize="${optimize}"> ++ optimize="${optimize}" ++ target="1.4"> + + + +@@ -867,7 +870,8 @@ + destdir="${demo.dest}" + debug="${debug}" + deprecation="${deprecation}" +- optimize="${optimize}"> ++ optimize="${optimize}" ++ target="1.4"> + + + diff --git a/java/velocity_1_3.nix b/java/velocity_1_3.nix new file mode 100644 index 0000000..40bfc96 --- /dev/null +++ b/java/velocity_1_3.nix @@ -0,0 +1,31 @@ +{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec { + pname = "velocity"; + version = "1.3"; + outJar = "velocity-1.3.jar"; + + src = fetchFromGitHub { + owner = "apache"; + repo = "velocity-engine"; + rev = "d2ceb7fa0a0fa397a1a513af7b7cc0f53b0d1f80"; + hash = "sha256-eSZA1j1rRXbly8VWSTD6VNVRmgPR0mma+lYUn1HFQIM="; + }; + + patches = [./velocity.patch]; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + }; + + buildPhase = '' + cd build + ant + cd .. + ''; + + installPhase = '' + mkdir $out + cp ./bin/velocity-1.3.jar $out/velocity-1.3.jar + ''; +} diff --git a/java/velocity_1_4.nix b/java/velocity_1_4.nix new file mode 100644 index 0000000..0ff9dfa --- /dev/null +++ b/java/velocity_1_4.nix @@ -0,0 +1,31 @@ +{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec { + pname = "velocity"; + version = "1.4-dev"; + outJar = "velocity-1.4-dev.jar"; + + src = fetchFromGitHub { + owner = "apache"; + repo = "velocity-engine"; + rev = "b5be9d2f7675d83a4be069f0d6c19f09eabd08bb"; + hash = "sha256-WjJXLw8qcZA69GJAsYqTzwo8CuaWRs7LamBCTuZdKU0="; + }; + + patches = [./velocity.patch]; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + }; + + buildPhase = '' + cd build + ant + cd .. + ''; + + installPhase = '' + mkdir $out + cp ./bin/velocity-1.4-dev.jar $out/velocity-1.4-dev.jar + ''; +} diff --git a/java/which.nix b/java/which.nix new file mode 100644 index 0000000..da38f6d --- /dev/null +++ b/java/which.nix @@ -0,0 +1,29 @@ +{stdenv, fetchgit, jdk6, ant_1_7}: stdenv.mkDerivation rec { + pname = "which"; + version = "1.0"; + outJar = "which.jar"; + + src = fetchgit { + url = "https://git.befatorinc.de/Bommels05/commons-xml.git"; + rev = "1d6cda7c464b289c9672d0698f82e1671e0211df"; + hash = "sha256-B7rov3ddAv4EGqKLsu3GepgM2XqOaAVOCNjTcICD+F0="; + }; + + patches = [./which.patch]; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + }; + + buildPhase = '' + #ln -s /build/source/LICENSE.txt /build/LICENSE + ant -f java/which.xml + ''; + + installPhase = '' + mkdir $out + cp -r ./java/build/which.jar $out/which.jar + ''; +} diff --git a/java/which.patch b/java/which.patch new file mode 100644 index 0000000..2ecf9de --- /dev/null +++ b/java/which.patch @@ -0,0 +1,14 @@ +diff --git a/java/which.xml b/java/which.xml +index dd2d6b0..f8e7c16 100644 +--- a/java/which.xml ++++ b/java/which.xml +@@ -69,7 +69,8 @@ Build file for org.apache.env.Which service. No dependencies. + + ++ includes="${env.subdir}/*.java" ++ target="1.4"/> + + + + + +@@ -275,7 +277,9 @@ Copyright: + classpath="${build.dir}/classes:${tools.dir}/${jar.apis}" + debug="${debug}" + includeAntRuntime="false" +- includeJavaRuntime="true"/> ++ includeJavaRuntime="true" ++ target="1.4" ++ source="1.4"/> + + + +@@ -292,7 +296,9 @@ Copyright: + classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar" + debug="${debug}" + includeAntRuntime="false" +- includeJavaRuntime="true"/> ++ includeJavaRuntime="true" ++ target="1.4" ++ source="1.4"/> + + + +@@ -791,7 +797,9 @@ Copyright: + deprecation="${deprecation}" + optimize="${optimize}" + includeAntRuntime="false" +- includeJavaRuntime="true"/> ++ includeJavaRuntime="true" ++ target="1.4" ++ source="1.4"/> + + + +@@ -907,7 +915,9 @@ Copyright: + deprecation="${deprecation}" + optimize="${optimize}" + includeAntRuntime="false" +- includeJavaRuntime="true"/> ++ includeJavaRuntime="true" ++ target="1.4" ++ source="1.4"/> + + + +@@ -1122,7 +1132,9 @@ Copyright: + optimize="${optimize}" + includeAntRuntime="false" + includeJavaRuntime="true" +- classpath="${tools.dir}/${jar.apis}"/> ++ classpath="${tools.dir}/${jar.apis}" ++ target="1.4" ++ source="1.4"/> + + + +@@ -1149,7 +1161,9 @@ Copyright: + classpath="${build.dir}/classes:${build.dir}/dom3-${jar.parser}:${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.apis}" + debug="${debug}" + includeAntRuntime="false" +- includeJavaRuntime="true"/> ++ includeJavaRuntime="true" ++ target="1.4" ++ source="1.4"/> + + + +@@ -1177,7 +1191,9 @@ Copyright: + classpath="${build.dir}/classes:./tools/junit.jar" + debug="${debug}" + includeAntRuntime="false" +- includeJavaRuntime="true"/> ++ includeJavaRuntime="true" ++ target="1.4" ++ source="1.4"/> + + + diff --git a/java/xerces_2_4_0.nix b/java/xerces_2_4_0.nix new file mode 100644 index 0000000..0af5b67 --- /dev/null +++ b/java/xerces_2_4_0.nix @@ -0,0 +1,29 @@ +{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec { + pname = "xerces"; + version = "2.4.0"; + outJar = "xercesImpl.jar"; + + src = fetchFromGitHub { + owner = "apache"; + repo = "xerces-j"; + rev = "9744d47d2a3d70ae5514de7b14fe1e391de29d63"; + hash = "sha256-KPKDRFt6jo4wT+RX76vhoL/Hxwwn4XUHao9XdvdAq+o="; + }; + + patches = [./xerces.patch]; + + nativeBuildInputs = [jdk6 ant_1_7]; + + env = { + JAVA_HOME="${jdk6}"; + }; + + buildPhase = '' + ./build.sh jar + ''; + + installPhase = '' + mkdir $out + cp -r ./build/xercesImpl.jar $out/xercesImpl.jar + ''; +} diff --git a/java/xerces.nix b/java/xerces_2_6_2.nix similarity index 100% rename from java/xerces.nix rename to java/xerces_2_6_2.nix diff --git a/maven/fake.nix b/maven/fake.nix new file mode 100644 index 0000000..2d94877 --- /dev/null +++ b/maven/fake.nix @@ -0,0 +1,24 @@ +{stdenv, fetchFromGitHub, jdk6, ant_1_7, mavenDep, commons-grant, commons-jelly}: stdenv.mkDerivation rec { + pname = "fake-maven"; + version = "1.0"; + outJar = "fake-maven.jar"; + + src = ./fake; + + nativeBuildInputs = [jdk6 ant_1_7 + (mavenDep commons-grant {}) + (mavenDep commons-jelly {})]; + + env = { + JAVA_HOME="${jdk6}"; + }; + + buildPhase = '' + ant dist + ''; + + installPhase = '' + mkdir $out + cp -r ./dist/* $out/ + ''; +} diff --git a/maven/fake/build.xml b/maven/fake/build.xml new file mode 100644 index 0000000..3072344 --- /dev/null +++ b/maven/fake/build.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maven/fake/src/java/main/org/apache/maven/MavenConstants.java b/maven/fake/src/java/main/org/apache/maven/MavenConstants.java new file mode 100644 index 0000000..0739e14 --- /dev/null +++ b/maven/fake/src/java/main/org/apache/maven/MavenConstants.java @@ -0,0 +1,174 @@ +package org.apache.maven; + +/* ==================================================================== + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + */ + +/** + * MavenSession constants. + * + * @author Jason van Zyl + * @version $Id: MavenConstants.java 122358 2004-07-06 12:45:48Z brett $ + */ +public class MavenConstants +{ + /** + * This is an internal version for MavenSession self updating + * procedures. A MavenSession installation can query a MavenSession + * installation distributor to see if it is up-to-date + * and self-update if required. + */ + public static final int MAVEN_VERSION = 3; + + /** + * This is the version of the POM that this version of + * MavenSession operates with. If a descrepancy is found between + * the version of the POM being used and the version of + * the POM that this version of MavenSession can deal with then + * the POM will be transformed into compliance. + */ + public static final int POM_VERSION = 3; + + /** Online tag. */ + public static final String ONLINE = "maven.mode.online"; + + /** Jar Override tag. */ + public static final String JAR_OVERRIDE = "maven.jar.override"; + + /** Jar Override property tag. */ + public static final String JAR_OVERRIDE_PROPERTY = "maven.jar."; + + /** Local Repository tag. */ + public static final String REPO_LOCAL = "maven.repo.local"; + + /** Local Repository tag. */ + public static final String REPO_REMOTE = "maven.repo.remote"; + + /** Local Repository enabled tag. */ + public static final String REPO_REMOTE_ENABLED = "maven.repo.remote.enabled"; + + /** Proxy host tag. */ + public static final String PROXY_HOST = "maven.proxy.host"; + + /** Proxy port tag. */ + public static final String PROXY_PORT = "maven.proxy.port"; + + /** Proxy user name tag. */ + public static final String PROXY_USERNAME = "maven.proxy.username"; + + /** Proxy password tag. */ + public static final String PROXY_PASSWORD = "maven.proxy.password"; + /** Proxy loginHost tag. */ + public static final String PROXY_LOGINHOST = "maven.proxy.ntlm.host"; + /** Proxy loginDomain tag. */ + public static final String PROXY_LOGINDOMAIN = "maven.proxy.ntlm.domain"; + + /** Download meter type variable. */ + public static final String DOWNLOAD_METER = "maven.download.meter"; + + /** Snapshot JAR signifier tag. */ + public static final String SNAPSHOT_SIGNIFIER = "SNAPSHOT"; + + /** Driver properties */ + public static final String DRIVER_PROPERTIES = "/driver.properties"; + + /** Project build file name. (maven.xml) */ + public static final String BUILD_FILE_NAME = "maven.xml"; + + /** Defaults goal name property. */ + public static final String DEFAULT_GOAL = "maven.default.goal"; + + /** Defaults properties */ + public static final String DEFAULTS_PROPERTIES = "/defaults.properties"; + + // Context tags. + + /** MavenSession home context tag **/ + public static final String MAVEN_HOME = "maven.home"; + + /** MavenSession home local context tag **/ + public static final String MAVEN_HOME_LOCAL = "maven.home.local"; + + /** MavenSession plugins context tag **/ + public static final String MAVEN_PLUGINS_DIR = "maven.plugin.dir"; + + /** MavenSession unpacked plugins context tag **/ + public static final String MAVEN_UNPACKED_PLUGINS_DIR = "maven.plugin.unpacked.dir"; + + /** MavenSession local plugins context tag **/ + public static final String MAVEN_USER_PLUGINS_DIR = "maven.plugin.user.dir"; + + /** MavenSession build file url context tag **/ + public static final String MAVEN_BUILD_FILE_URL = "maven.project.buildFile.url"; + + /** MavenSession ant project context tag **/ + public static final String MAVEN_ANT_PROJECT = "maven.ant.project"; + + /** MavenSession POM context tag **/ + public static final String MAVEN_POM = "pom"; + + /** MavenSession goals context tag **/ + public static final String MAVEN_GOALS = "maven.goals"; + + /** MavenSession project verifier context tag **/ + public static final String MAVEN_PROJECT_VERIFIER = "maven.project.verifier"; + + /** Werkz project context tag **/ + public static final String WERKZ_PROJECT = "org.apache.commons.jelly.werkz.Project"; + + /** Reactor projects context tag **/ + public static final String REACTOR_PROJECT = "maven.reactorProjects"; + + /** Plugin Manager tag. */ + public static final String PLUGIN_MANAGER = "maven.plugin.manager"; + + /** Jelly XMLOutput tag. */ + public static final String XML_OUTPUT = "maven.xmlOutput"; + + /** MavenSession debug flag tag. */ + public static final String DEBUG_ON = "maven.debugOn"; + + /** MavenSession debug flag tag. */ + public static final String EMACS_MODE_ON = "maven.emacsModeOn"; + + /** Descriptor directory tag. (project.xml) */ + public static final String DESCRIPTOR_DIRECTORY = "maven.descriptorDirectory"; + + /** Project build file tag. (maven.xml) */ + public static final String BUILD_FILE = "maven.projectBuildFile"; + + /** Project descriptor file tag. (project.xml) */ + public static final String DESCRIPTOR_FILE = "maven.descriptorFile"; + + /** Dependency classpath tag. */ + public static final String DEPENDENCY_CLASSPATH = "maven.dependency.classpath"; + + /** Dependency classpath tag. */ + public static final String SESSION = "maven.session"; + + /** Reactor/Maven subproject Build failure tag. */ + public static final String BUILD_FAILURE = "maven.build.failure"; + + /** Reactor/Maven subproject Build failure project list tag. */ + public static final String FAILED_PROJECTS = "failedProjects"; + + /** Maven compile sourceroots. */ + public static final String COMPILE_SOURCEROOTS = "compile.sourceroots"; + + /** Maven test compile sourceroots. */ + public static final String TEST_COMPILE_SOURCEROOTS = "test.compile.sourceroots"; + +} diff --git a/maven/fake/src/java/main/org/apache/maven/MavenException.java b/maven/fake/src/java/main/org/apache/maven/MavenException.java new file mode 100644 index 0000000..58d8c6e --- /dev/null +++ b/maven/fake/src/java/main/org/apache/maven/MavenException.java @@ -0,0 +1,141 @@ +package org.apache.maven; + +/* ==================================================================== + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + */ + +import java.io.PrintStream; +import java.io.PrintWriter; + +/** + * The base class for all exceptions thrown by MavenSession. Taken liberally from + * Ant's BuildException + * + * @version $Id: MavenException.java 122095 2004-03-01 22:36:39Z evenisse $ + */ +public class MavenException extends Exception +{ + + /** Exception that might have caused this one. */ + private Throwable cause; + + /** + * Creates a new instance of MavenException without detail + * message. + */ + public MavenException() + { + } + + /** + * Constructs an instance of MavenException with the specified + * detail message. + * + * @param msg the detail message. + */ + public MavenException( String msg ) + { + super( msg ); + } + + /** + * Constructs an exception with the given message and exception as + * a root cause. + * + * @param message A description of or information about the exception. + * Should not be null unless a cause is specified. + * @param cause The exception that might have caused this one. + * May be null. + */ + public MavenException( String message, Throwable cause ) + { + super( message ); + this.cause = cause; + } + + /** + * Constructs an exception with the given exception as a root cause. + * + * @param cause The exception that might have caused this one. + * Should not be null. + */ + public MavenException( Throwable cause ) + { + super( cause.toString() ); + this.cause = cause; + } + + /** + * Returns the nested exception, if any. + * + * @return the nested exception, or null if no + * exception is associated with this one + */ + public Throwable getException() + { + return cause; + } + + /** + * Prints the stack trace for this exception and any + * nested exception to System.err. + */ + public void printStackTrace() + { + printStackTrace( System.err ); + } + + /** + * Prints the stack trace of this exception and any nested + * exception to the specified PrintStream. + * + * @param ps The PrintStream to print the stack trace to. + * Must not be null. + */ + public void printStackTrace( PrintStream ps ) + { + synchronized ( ps ) + { + super.printStackTrace( ps ); + if ( cause != null ) + { + ps.println( "--- Nested Exception ---" ); + cause.printStackTrace( ps ); + } + } + } + + /** + * Prints the stack trace of this exception and any nested + * exception to the specified PrintWriter. + * + * @param pw The PrintWriter to print the stack trace to. + * Must not be null. + */ + public void printStackTrace( PrintWriter pw ) + { + synchronized ( pw ) + { + super.printStackTrace( pw ); + if ( cause != null ) + { + pw.println( "--- Nested Exception ---" ); + cause.printStackTrace( pw ); + } + } + } + +} diff --git a/maven/fake/src/java/main/org/apache/maven/MavenSession.java b/maven/fake/src/java/main/org/apache/maven/MavenSession.java new file mode 100644 index 0000000..a14ea71 --- /dev/null +++ b/maven/fake/src/java/main/org/apache/maven/MavenSession.java @@ -0,0 +1,21 @@ +package org.apache.maven; + +import java.util.List; +import org.apache.maven.plugin.PluginManager; +import org.apache.maven.project.Project; +import org.apache.maven.jelly.MavenJellyContext; + +public class MavenSession { + + public PluginManager getPluginManager() { + return null; + } + + public void attainGoals(Project project, List goals) { + } + + public MavenJellyContext getRootContext() { + return null; + } + +} diff --git a/maven/fake/src/java/main/org/apache/maven/MavenUtils.java b/maven/fake/src/java/main/org/apache/maven/MavenUtils.java new file mode 100644 index 0000000..81bbf2d --- /dev/null +++ b/maven/fake/src/java/main/org/apache/maven/MavenUtils.java @@ -0,0 +1,36 @@ +package org.apache.maven; + +import java.util.List; +import java.io.File; +import java.io.IOException; +import org.apache.maven.jelly.MavenJellyContext; +import org.apache.maven.project.Project; +import org.apache.maven.MavenException; + +public class MavenUtils { + + public static List getProjects(File directory, String includes, String excludes, MavenJellyContext context) { + return null; + } + + public static List getGoalListFromCsv(String s) { + return null; + } + + public static String makeRelativePath(File basedir, String path) throws IOException { + return null; + } + + public static String makeAbsolutePath(File basedir, String dir) throws IOException { + return null; + } + + public static Project getProject(File projectDescriptor, MavenJellyContext parentContext, boolean useParentPom) throws MavenException { + return null; + } + + public static Project getProject(File projectDescriptor, MavenJellyContext parentContext) throws MavenException { + return null; + } + +} diff --git a/maven/fake/src/java/main/org/apache/maven/jelly/MavenJellyContext.java b/maven/fake/src/java/main/org/apache/maven/jelly/MavenJellyContext.java new file mode 100644 index 0000000..4275c5a --- /dev/null +++ b/maven/fake/src/java/main/org/apache/maven/jelly/MavenJellyContext.java @@ -0,0 +1,29 @@ +package org.apache.maven.jelly; + +import org.apache.maven.project.Project; +import org.apache.maven.MavenSession; +import org.apache.commons.grant.GrantProject; +import org.apache.commons.jelly.JellyContext; + +public class MavenJellyContext extends JellyContext { + + public void setVariable(String property, Object value) { + } + + public Object getVariable(String name) { + return null; + } + + public Project getProject() { + return null; + } + + public MavenSession getMavenSession() { + return null; + } + + public GrantProject getAntProject() { + return null; + } + +} diff --git a/maven/fake/src/java/main/org/apache/maven/plugin/PluginManager.java b/maven/fake/src/java/main/org/apache/maven/plugin/PluginManager.java new file mode 100644 index 0000000..88a76d9 --- /dev/null +++ b/maven/fake/src/java/main/org/apache/maven/plugin/PluginManager.java @@ -0,0 +1,20 @@ +package org.apache.maven.plugin; + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import org.apache.maven.project.Project; +import org.apache.maven.MavenException; + +public class PluginManager { + + public void uninstallPlugin( String artifactId ) throws IOException { + } + + public void installPlugin(File file, Project parentProject, boolean cache) throws MavenException { + } + + public void processDependencies(Project project) throws MalformedURLException, Exception { + } + +} diff --git a/maven/fake/src/java/main/org/apache/maven/plugin/UnknownPluginException.java b/maven/fake/src/java/main/org/apache/maven/plugin/UnknownPluginException.java new file mode 100644 index 0000000..f1cc995 --- /dev/null +++ b/maven/fake/src/java/main/org/apache/maven/plugin/UnknownPluginException.java @@ -0,0 +1,5 @@ +package org.apache.maven.plugin; + +public class UnknownPluginException extends Exception { + +} diff --git a/maven/fake/src/java/main/org/apache/maven/project/Dependency.java b/maven/fake/src/java/main/org/apache/maven/project/Dependency.java new file mode 100644 index 0000000..8fdb396 --- /dev/null +++ b/maven/fake/src/java/main/org/apache/maven/project/Dependency.java @@ -0,0 +1,9 @@ +package org.apache.maven.project; + +public class Dependency { + + public String getId() { + return null; + } + +} diff --git a/maven/fake/src/java/main/org/apache/maven/project/Project.java b/maven/fake/src/java/main/org/apache/maven/project/Project.java new file mode 100644 index 0000000..2e45f3b --- /dev/null +++ b/maven/fake/src/java/main/org/apache/maven/project/Project.java @@ -0,0 +1,34 @@ +package org.apache.maven.project; + +import java.util.List; +import org.apache.maven.jelly.MavenJellyContext; + +public class Project { + + public String getId() { + return null; + } + + public void setId(String id) { + } + + public String getArtifactId() { + return null; + } + + public List getDependencies() { + return null; + } + + public String getName() { + return null; + } + + public void verifyDependencies() { + } + + public MavenJellyContext getPluginContext(String plugin) throws Exception { + return null; + } + +} diff --git a/maven/fake/src/java/main/org/apache/maven/project/Resource.java b/maven/fake/src/java/main/org/apache/maven/project/Resource.java new file mode 100644 index 0000000..99349aa --- /dev/null +++ b/maven/fake/src/java/main/org/apache/maven/project/Resource.java @@ -0,0 +1,27 @@ +package org.apache.maven.project; + +import java.util.List; + +public class Resource { + + public List getIncludes() { + return null; + } + + public List getExcludes() { + return null; + } + + public boolean getFiltering() { + return false; + } + + public String getTargetPath() { + return null; + } + + public String getDirectory() { + return null; + } + +} diff --git a/maven/maven-bootstrap.nix b/maven/maven-bootstrap.nix index ca38623..6201865 100644 --- a/maven/maven-bootstrap.nix +++ b/maven/maven-bootstrap.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, jdk6, mavenDep, junit_3_8_1, maven_1}: stdenv.mkDerivation rec { +{stdenv, fetchFromGitHub, jdk6, mavenDep, junit_3_8_1, maven_1, commons-jelly-tags-maven}: stdenv.mkDerivation rec { pname = "maven"; version = "2.0.0-SNAPSHOT"; @@ -14,7 +14,8 @@ settings = ./maven.properties; nativeBuildInputs = [jdk6 maven_1 - (mavenDep junit_3_8_1 {})]; + (mavenDep junit_3_8_1 {}) + (mavenDep commons-jelly-tags-maven {})]; env = { JAVA_HOME="${jdk6}"; diff --git a/maven/maven.patch b/maven/maven.patch new file mode 100644 index 0000000..66b24ca --- /dev/null +++ b/maven/maven.patch @@ -0,0 +1,95 @@ +diff --git a/build-bootstrap.xml b/build-bootstrap.xml +index 5fb7b20..e7d88d8 100644 +--- a/build-bootstrap.xml ++++ b/build-bootstrap.xml +@@ -190,7 +190,8 @@ + + + +- ++ ++ + + + +@@ -198,7 +199,8 @@ + + + +- ++ ++ + + + +diff --git a/project.xml b/project.xml +index 4b8b6ec..87bcd7c 100644 +--- a/project.xml ++++ b/project.xml +@@ -453,7 +453,7 @@ + + + dom4j +- 1.4-dev-8 ++ 1.6.1 + http://www.dom4j.org/ + + ouch +@@ -660,11 +660,6 @@ + 20040613.030723 + http://jakarta.apache.org/commons/jelly/tags/xml/ + +- +- commons-graph +- 0.8.1 +- http://jakarta.apache.org/commons/sandbox/graph/ +- + + commons-jexl + 1.0-beta-1 +@@ -737,9 +732,15 @@ + --> + + +- xml-apis +- 1.0.b2 +- http://xml.apache.org/xerces2-j/ ++ jaxen ++ 1.0-FCS ++ ++ true ++ ++ ++ ++ saxpath ++ 1.0-FCS + + true + +diff --git a/src/bin/forehead.conf b/src/bin/forehead.conf +index 83b3ec9..b7ad4b8 100644 +--- a/src/bin/forehead.conf ++++ b/src/bin/forehead.conf +@@ -24,7 +24,8 @@ + ${tools.jar} + ${maven.home}/lib/commons-grant-1.0-beta-4.jar + ${maven.home}/lib/ant-1.5.3-1.jar +- ${maven.home}/lib/endorsed/xml-apis-1.0.b2.jar ++ ${maven.home}/lib/endorsed/jaxen-1.0-FCS.jar ++ ${maven.home}/lib/endorsed/saxpath-1.0-FCS.jar + ${maven.home}/lib/ant-optional-1.5.3-1.jar + ${maven.home}/lib/endorsed/xerces-2.4.0.jar + ${maven.home}/lib/commons-logging-1.0.3.jar +diff --git a/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java b/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java +index f7debe9..0b05b4e 100644 +--- a/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java ++++ b/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java +@@ -85,7 +85,7 @@ public class ProjectInheritanceTest + assertEquals( "dom4j:dom4j", + ( (Dependency) p.getDependencies().get( 1 ) ).getId() ); + +- assertEquals( "1.4-dev-8", ++ assertEquals( "1.6.1", + ( (Dependency) p.getDependencies().get( 1 ) ).getVersion() ); + + baseDir = new File(p.getContext().findVariable("basedir").toString()).getCanonicalPath(); diff --git a/maven/maven_1_0_2.nix b/maven/maven_1_0_2.nix index 39cdf62..ab2f95b 100644 --- a/maven/maven_1_0_2.nix +++ b/maven/maven_1_0_2.nix @@ -1,6 +1,8 @@ -{stdenv, fetchsvn, jdk6, mavenDep, ant_1_7, commons-lang, commons-logging_1_0_3, commons-httpclient_2, -dom4j, ant_1_5_3, ant-optional_1_5_3, commons-betwixt, commons-digester_1_4_1, commons-jelly, commons-jelly-tags-ant, -commons-jelly-tags-define, commons-jelly-tags-util, commons-jelly-tags-xml}: stdenv.mkDerivation rec { +{stdenv, fetchsvn, fetchgit, jdk6, ant_1_7, mavenDep, commons-lang, commons-logging_1_0_3, commons-httpclient_2, dom4j, ant_1_5_3, +ant-optional_1_5_3, commons-betwixt, commons-digester_1_4_1, commons-jelly, commons-jelly-tags-ant, commons-jelly-tags-define, +commons-jelly-tags-util, commons-jelly-tags-xml, commons-jexl, werkz, commons-beanutils_1_6_1, commons-cli_beta_2, commons-collections_2_1, +commons-grant, commons-io, forehead, log4j_1_2_8, which, jaxen, saxpath, xerces_2_4_0, plexus, commons-jelly-tags-maven, +commons-jelly-tags-interaction, jdom, junit_3_8_1, commons-jelly-tags-velocity, velocity_1_4}: stdenv.mkDerivation rec { pname = "maven"; version = "1.0.2"; @@ -10,14 +12,18 @@ commons-jelly-tags-define, commons-jelly-tags-util, commons-jelly-tags-xml}: std hash = "sha256-fueknKeqmPn0ouJrEU6PNA97JvJMuB4P013c5eyjUK8="; }; - #patches = [./maven_2.patch]; + src2 = fetchgit { + url = "https://git.befatorinc.de/Bommels05/maven-plugins.git"; + rev = "a7e46d68144194fcb2e7eea6e9f909c2316f22f2"; + hash = "sha256-f4t2d7+Hh0TSsCRh0FVtHsvQ9xAMUHrTZBYIexdRv+Y="; + }; - settings = ./settings.xml; + patches = [./maven.patch]; nativeBuildInputs = [jdk6 ant_1_7 (mavenDep commons-lang {}) - (mavenDep commons-httpclient_2 {}) (mavenDep commons-logging_1_0_3 {}) + (mavenDep commons-httpclient_2 {}) (mavenDep dom4j {}) (mavenDep ant_1_5_3 {}) (mavenDep ant-optional_1_5_3 {}) @@ -27,17 +33,65 @@ commons-jelly-tags-define, commons-jelly-tags-util, commons-jelly-tags-xml}: std (mavenDep commons-jelly-tags-ant {}) (mavenDep commons-jelly-tags-define {}) (mavenDep commons-jelly-tags-util {}) - (mavenDep commons-jelly-tags-xml {})]; + (mavenDep commons-jelly-tags-xml {}) + (mavenDep commons-jexl {}) + (mavenDep werkz {}) + (mavenDep commons-beanutils_1_6_1 {}) + (mavenDep commons-cli_beta_2 {}) + (mavenDep commons-collections_2_1 {}) + (mavenDep commons-grant {}) + (mavenDep commons-io {}) + (mavenDep forehead {}) + (mavenDep log4j_1_2_8 {}) + (mavenDep which {}) + (mavenDep jaxen {}) + (mavenDep saxpath {}) + (mavenDep xerces_2_4_0 {}) + (mavenDep plexus {}) + (mavenDep commons-jelly-tags-maven {}) + (mavenDep commons-jelly-tags-interaction {}) + (mavenDep jdom {}) + (mavenDep junit_3_8_1 {}) + (mavenDep commons-jelly-tags-velocity {}) + (mavenDep velocity_1_4 {})]; 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/dom4j/jars/dom4j-1.4-dev-8.jar + ln -s /build/.maven/repository/commons-jelly/jars/commons-jelly-tags-xml-20040613.030723.jar /build/.maven/repository/commons-jelly/jars/commons-jelly-tags-xml-1.0.jar + ln -s /build/.maven/repository/jaxen/jars/jaxen-1.0-FCS.jar /build/.maven/repository/jaxen/jars/jaxen-1.0-FCS-full.jar + + mkdir /build/maven-plugins + cp -r ${src2}/plugin-parent /build/maven-plugins/plugin-parent + cp -r ${src2}/plugin /build/maven-plugins/plugin + cp -r ${src2}/clean /build/maven-plugins/clean + cp -r ${src2}/jar /build/maven-plugins/jar + cp -r ${src2}/test /build/maven-plugins/test + cp -r ${src2}/java /build/maven-plugins/java + cp -r ${src2}/license /build/maven-plugins/license + cp -r ${src2}/ant /build/maven-plugins/ant + + chmod +w /build/maven-plugins/* + sed -i '//{ +N;/ xml-apis<\/groupId>/{ +N;/ xml-apis<\/artifactId>/{ +N;/ 1.0.b2<\/version>/{ +N;/ http:\/\/xml.apache.org\/xerces2-j\/<\/url>/{ +N;/<\/dependency>/d +}}}}}' /build/maven-plugins/plugin/project.xml + sed -i '//{ +N;/ xml-apis<\/groupId>/{ +N;/ xml-apis<\/artifactId>/{ +N;/ 1.0.b2<\/version>/{ +N;/ http:\/\/xml.apache.org\/xerces2-j\/<\/url>/{ +N;/ /{ +N;/ root<\/classloader>/{ +N;/ <\/properties>/{ +N;/<\/dependency>/d +}}}}}}}}' /build/maven-plugins/test/project.xml ''; buildPhase = '' @@ -46,6 +100,6 @@ commons-jelly-tags-define, commons-jelly-tags-util, commons-jelly-tags-xml}: std installPhase = '' mkdir $out - cp -r ./dist/* $out/ + cp -r /build/mvn/* $out/ ''; } diff --git a/overlay.nix b/overlay.nix index c3f66d1..4c9d49b 100644 --- a/overlay.nix +++ b/overlay.nix @@ -154,15 +154,33 @@ bommels = pkgs.lib.makeScope pkgs.newScope (self: rec { junit_4 = self.callPackage ./java/junit_4.nix { inherit ant_1_6_5 jdk6; }; ant_1_7 = self.callPackage ./ant/ant_1_7.nix { inherit jdk6 junit_4; }; + #Kein Source + werkz = self.callPackage ./java/download/werkz.nix { }; + forehead = self.callPackage ./java/download/forehead.nix { }; + plexus = self.callPackage ./java/download/plexus.nix { }; + + ivyDepHook = self.callPackage ./ant/ivyDepHook.nix { }; + ivyDep = dep: args: (import ./ant/ivyDep.nix { inherit ivyDepHook; stdenv = pkgs.stdenv; }) dep args; + mavenDepHook = self.callPackage ./maven/mavenDepHook.nix { }; + mavenDep = dep: args: (import ./maven/mavenDep.nix { inherit mavenDepHook; stdenv = pkgs.stdenv; }) dep args; + junit_3_8_1 = self.callPackage ./java/junit_3_8_1.nix { inherit jdk6 ant_1_7; }; commons-lang = self.callPackage ./java/commons-lang.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; }; commons-collections_2_0 = self.callPackage ./java/commons-collections_2_0.nix { inherit jdk6 ant_1_7; }; commons-collections_2_1 = self.callPackage ./java/commons-collections_2_1.nix { inherit jdk6 ant_1_7; }; + oro = self.callPackage ./java/oro.nix { inherit jdk6 ant_1_7; }; + commons-net = self.callPackage ./java/commons-net.nix { inherit jdk6 ant_1_7 oro; }; + + saxpath = self.callPackage ./java/saxpath.nix { inherit jdk6 ant_1_7; }; + dom4j = self.callPackage ./java/dom4j.nix { inherit jdk6 ant_1_7; }; + jdom = self.callPackage ./java/jdom.nix { inherit jdk6 ant_1_7; }; + jaxen = self.callPackage ./java/jaxen.nix { inherit jdk6 ant_1_7 saxpath dom4j jdom; }; #maven_2 = self.callPackage ./maven/maven_2.nix { inherit jdk6; }; - dom4j = self.callPackage ./java/dom4j.nix { inherit jdk6 ant_1_7; }; commons-logging_1_0_3 = self.callPackage ./java/commons-logging_1_0_3.nix { inherit jdk6 ant_1_7; }; commons-httpclient_2 = self.callPackage ./java/commons-httpclient_2.nix { inherit jdk6 ant_1_7 commons-logging_1_0_3; }; ant_1_5_3 = self.callPackage ./ant/ant_1_5_3.nix { inherit jdk6 ant_1_7; }; @@ -184,14 +202,15 @@ bommels = pkgs.lib.makeScope pkgs.newScope (self: rec { commons-collections_2_1 commons-beanutils_1_6; }; junit_3_7 = self.callPackage ./java/junit_3_7.nix { inherit jdk6 ant_1_7; }; - commons-cli-bootstrap = self.callPackage ./java/commons-cli-bootstrap.nix { inherit jdk6 ant_1_7 commons-lang; }; + commons-cli-bootstrap = self.callPackage ./java/commons-cli-bootstrap.nix { inherit jdk6 ant_1_7 commons-lang_1; }; commons-jexl = self.callPackage ./java/commons-jexl.nix { inherit jdk6 ant_1_7 commons-logging_1_0 junit_3_8_1; }; commons-discovery = self.callPackage ./java/commons-discovery.nix { inherit jdk6 ant_1_7 commons-logging_1_0_3; }; - saxpath = self.callPackage ./java/saxpath.nix { inherit jdk6 ant_1_7; }; - jaxen = self.callPackage ./java/jaxen.nix { inherit jdk6 ant_1_7 saxpath dom4j; }; + commons-grant = self.callPackage ./java/commons-grant.nix { inherit jdk6 ant_1_7; }; + velocity_1_3 = self.callPackage ./java/velocity_1_3.nix { inherit jdk6 ant_1_7; }; + velocity_1_4 = self.callPackage ./java/velocity_1_4.nix { inherit jdk6 ant_1_7; }; + commons-jelly = self.callPackage ./java/jelly/commons-jelly.nix { inherit jdk6 ant_1_7 commons-logging_1_0_3 commons-cli-bootstrap dom4j commons-collections_2_1 commons-beanutils_1_6 commons-jexl commons-discovery jaxen saxpath junit_3_7; }; - commons-grant = self.callPackage ./java/commons-grant.nix { inherit jdk6 ant_1_7; }; commons-jelly-tags-junit = self.callPackage ./java/jelly/commons-jelly-tags-junit.nix { inherit jdk6 ant_1_7 commons-jelly commons-logging_1_0_3 junit_3_8_1 jaxen saxpath dom4j commons-collections_2_1 commons-beanutils_1_6 commons-jexl ; }; commons-jelly-tags-util = self.callPackage ./java/jelly/commons-jelly-tags-util.nix { inherit jdk6 ant_1_7 commons-jelly @@ -209,37 +228,48 @@ bommels = pkgs.lib.makeScope pkgs.newScope (self: rec { commons-jelly-tags-define = self.callPackage ./java/jelly/commons-jelly-tags-define.nix { inherit jdk6 ant_1_7 commons-jelly commons-logging_1_0_3 commons-beanutils_1_6 junit_3_8_1 dom4j commons-jelly-tags-junit commons-collections_2_1 commons-jexl commons-jelly-tags-log commons-jelly-tags-xml jaxen saxpath commons-jelly-tags-dynabean; }; + commons-jelly-tags-interaction = self.callPackage ./java/jelly/commons-jelly-tags-interaction.nix { inherit jdk6 ant_1_7 commons-jelly + junit_3_8_1; }; + commons-jelly-tags-velocity = self.callPackage ./java/jelly/commons-jelly-tags-velocity.nix { inherit jdk6 ant_1_7 commons-jelly + velocity_1_3 junit_3_8_1 commons-collections_2_1; }; - maven_1 = self.callPackage ./maven/maven_1_0_2.nix { inherit jdk6 ant_1_7 commons-lang commons-logging_1_0_3 - commons-httpclient_2 dom4j ant_1_5_3 ant-optional_1_5_3 commons-betwixt commons-digester_1_4_1 commons-jelly commons-jelly-tags-ant - commons-jelly-tags-define commons-jelly-tags-util commons-jelly-tags-xml; }; + commons-beanutils_1_6_1 = self.callPackage ./java/commons-beanutils_1_6_1.nix { inherit jdk6 ant_1_7 commons-logging_1_0 + commons-collections_2_0; }; + commons-cli_beta_2 = self.callPackage ./java/commons-cli_beta_2.nix { inherit jdk6 ant_1_7 commons-lang_1; }; + commons-io = self.callPackage ./java/commons-io.nix { inherit jdk6 ant_1_7 commons-lang_1_1; }; + log4j_1_2_8 = self.callPackage ./java/log4j_1_2_8.nix { inherit jdk6 ant_1_7; }; + which = self.callPackage ./java/which.nix { inherit jdk6 ant_1_7; }; + xerces_2_4_0 = self.callPackage ./java/xerces_2_4_0.nix { inherit jdk6 ant_1_7; }; + + fake-maven = self.callPackage ./maven/fake.nix { inherit jdk6 ant_1_7 commons-grant commons-jelly; }; + commons-jelly-tags-maven = self.callPackage ./java/jelly/commons-jelly-tags-maven.nix { inherit jdk6 ant_1_7 commons-jelly + commons-logging_1_0_3 werkz fake-maven commons-jelly-tags-ant commons-grant; }; + + maven_1 = self.callPackage ./maven/maven_1_0_2.nix { inherit jdk6 ant_1_7 commons-lang commons-logging_1_0_3 commons-httpclient_2 dom4j + ant_1_5_3 ant-optional_1_5_3 commons-betwixt commons-digester_1_4_1 commons-jelly commons-jelly-tags-ant commons-jelly-tags-define + commons-jelly-tags-util commons-jelly-tags-xml commons-jexl werkz commons-beanutils_1_6_1 commons-cli_beta_2 commons-collections_2_1 + commons-grant commons-io forehead log4j_1_2_8 which jaxen saxpath xerces_2_4_0 plexus commons-jelly-tags-maven + commons-jelly-tags-interaction jdom junit_3_8_1 commons-jelly-tags-velocity velocity_1_4; }; maven_2 = self.callPackage ./maven/maven-bootstrap.nix { inherit jdk6 junit_3_8_1 maven_1; }; maven = self.callPackage ./maven/maven.nix { inherit jdk6 maven_2; }; - ivyDepHook = self.callPackage ./ant/ivyDepHook.nix { }; - ivyDep = dep: args: (import ./ant/ivyDep.nix { inherit ivyDepHook; stdenv = pkgs.stdenv; }) dep args; - mavenDepHook = self.callPackage ./maven/mavenDepHook.nix { }; - mavenDep = dep: args: (import ./maven/mavenDep.nix { inherit mavenDepHook; stdenv = pkgs.stdenv; }) dep args; - 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; }; + commons-cli = self.callPackage ./java/commons-cli.nix { inherit jdk6 ant_1_7 maven commons-lang_1; }; commons-logging_1_1 = self.callPackage ./java/commons-logging_1_1.nix { inherit jdk6 ant_1_7 junit_3_8_1; }; commons-codec = self.callPackage ./java/commons-codec.nix { inherit jdk6 ant_1_7; }; commons-httpclient_3 = self.callPackage ./java/commons-httpclient_3.nix { inherit jdk6 ant_1_7 commons-logging_1_1 commons-codec; }; - oro = self.callPackage ./java/oro.nix { inherit jdk6 ant_1_7; }; commons-logging_1_0_4 = self.callPackage ./java/commons-logging_1_0_4.nix { inherit jdk6 ant_1_7; }; commons-httpclient_2_0_2 = self.callPackage ./java/commons-httpclient_2_0_2.nix { inherit jdk6 ant_1_7 commons-logging_1_0_4; }; commons-collections_3_1 = self.callPackage ./java/commons-collections_3_1.nix { inherit jdk6 ant_1_7; }; - commons-net = self.callPackage ./java/commons-net.nix { inherit jdk6 ant_1_7 oro; }; jsch_0_1_23 = self.callPackage ./java/jsch_0_1_23.nix { inherit jdk6 ant_1_7; }; commons-vfs = self.callPackage ./java/commons-vfs.nix { inherit jdk6 ant_1_7 commons-logging_1_0_4 commons-httpclient_2_0_2 commons-collections_3_1 commons-net jsch_0_1_23; }; jsch_0_1_25 = self.callPackage ./java/jsch_0_1_25.nix { inherit jdk6 ant_1_7; }; junit_3_8_2 = self.callPackage ./java/junit_3_8_2.nix { inherit jdk6 ant_1_7; }; - xerces = self.callPackage ./java/xerces.nix { inherit jdk6 ant_1_7; }; + xerces_2_6_2 = self.callPackage ./java/xerces_2_6_2.nix { inherit jdk6 ant_1_7; }; xerces-api = self.callPackage ./java/xerces-api.nix { inherit jdk6 ant_1_7; }; ivy = self.callPackage ./ant/ivy.nix { inherit jdk6 ant_1_7 ant_1_6 commons-cli commons-httpclient_3 oro commons-vfs jsch_0_1_25 - junit_3_8_2 commons-lang xerces xerces-api; }; + junit_3_8_2 commons-lang xerces_2_6_2 xerces-api; }; groovy = self.callPackage ./java/groovy.nix { inherit jdk6 ant_1_7; };