so much stuff

3 files changed, 148 insertions, 72 deletions

diff --git a/conf/dependencies.mk b/conf/dependencies.mk
index 9ad5a74..5d90e80 100644
--- a/conf/dependencies.mk
+++ b/conf/dependencies.mk
@@ -6,7 +6,7 @@ dep-modello-cli = \
 	build/packages/plexus-classworlds \
 	build/packages/plexus-container-default \
 	build/packages/plexus-utils \
-	build/packages/xbean-reflect-bootstrap
+	build/packages/xbean-bootstrap
 # What is needed to use the Plexus Metadata Generator command line
 dep-plexus-metadata-generator-cli = \
 	build/packages/commons-cli \
@@ -19,7 +19,7 @@ dep-plexus-metadata-generator-cli = \
 	build/packages/plexus-container-default \
 	build/packages/plexus-utils \
 	build/packages/qdox \
-	build/packages/xbean-reflect-bootstrap
+	build/packages/xbean-bootstrap
 # Where is xerces2
 dep-xerces2 = \
 	/usr/share/java/serializer.jar \
@@ -29,13 +29,27 @@ dep-xerces2 = \
 dep-jsr305 = build/packages/jsr305
 dep-jsr330 = build/packages/atinject-javax.inject
 
+################################################################################
+
+# Apache
+
+build/packages/httpcomponents-core: \
+	build/packages/commons-cli
+build/packages/httpcomponents-client-bootstrap: \
+	build/packages/commons-codec \
+	build/packages/httpcomponents-core \
+	/usr/share/java/commons-logging/commons-logging.jar
+
 build/packages/maven: \
 	$(dep-modello-cli) \
 	$(dep-plexus-metadata-generator-cli) \
 	$(dep-jsr330) \
 	build/packages/aether-core-bootstrap \
+	build/packages/guice-core \
 	build/packages/modello-plugins \
-	build/packages/plexus-component-annotations
+	build/packages/plexus-component-annotations \
+	build/packages/plexus-interpolation \
+	build/packages/wagon
 build/packages/maven-artifact-bootstrap: \
 	build/packages/plexus-utils
 build/packages/maven-plugin-api-bootstrap: \
@@ -44,6 +58,35 @@ build/packages/maven-plugin-api-bootstrap: \
 	build/packages/plexus-container-default \
 	build/packages/plexus-utils
 
+build/packages/mina: \
+	build/packages/commons-lang2 \
+	build/packages/jzlib \
+	build/packages/ognl \
+	build/packages/slf4j-api \
+	/usr/share/java/rxtx/RXTXcomm.jar \
+	/usr/share/java/tomcat8/tomcat-jni.jar
+build/packages/mina-sshd: \
+	build/packages/jzlib \
+	build/packages/mina \
+	build/packages/slf4j-api \
+	/usr/share/java/tomcat8/tomcat-jni.jar
+
+build/packages/maven-plugin-annotations-bootstrap: \
+	build/packages/maven-artifact-bootstrap
+build/packages/maven-plugin-tools-api-bootstrap: \
+	build/packages/maven-artifact-bootstrap \
+	build/packages/maven-plugin-api-bootstrap \
+	build/packages/plexus-container-default \
+	build/packages/plexus-utils
+
+build/packages/xbean-bootstrap: \
+	build/packages/asm3 \
+	build/packages/slf4j-api \
+	build/packages/osgi42-core \
+	/usr/share/java/commons-logging/commons-logging.jar
+
+# Modello
+
 build/packages/modello-core: \
 	build/packages/plexus-build-api \
 	build/packages/plexus-container-default \
@@ -54,16 +97,7 @@ build/packages/modello-plugins: \
 	build/packages/plexus-build-api \
 	build/packages/plexus-utils
 
-build/packages/maven-plugin-annotations-bootstrap: \
-	build/packages/maven-artifact-bootstrap
-build/packages/maven-plugin-tools-api-bootstrap: \
-	build/packages/maven-artifact-bootstrap \
-	build/packages/maven-plugin-api-bootstrap \
-	build/packages/plexus-container-default \
-	build/packages/plexus-utils
-build/packages/xbean-reflect-bootstrap: \
-	build/packages/asm2 \
-	/usr/share/java/commons-logging/commons-logging.jar
+# Plexus
 
 build/packages/plexus-build-api: \
 	build/packages/plexus-container-default \
@@ -90,14 +124,15 @@ build/packages/plexus-component-metadata-bootstrap: \
 	build/packages/plexus-container-default \
 	build/packages/plexus-utils \
 	build/packages/qdox
-# FIXME: Does not include generated code?  But signatures match?
 build/packages/plexus-container-default: \
 	build/packages/guava \
 	build/packages/plexus-classworlds \
 	build/packages/plexus-utils \
-	build/packages/xbean-reflect-bootstrap \
+	build/packages/xbean-bootstrap \
 	/usr/share/java/junit.jar
 
+# Misc
+
 build/packages/aether-core-bootstrap: \
 	$(dep-jsr330) \
 	build/packages/httpcomponents-core \
@@ -105,8 +140,20 @@ build/packages/aether-core-bootstrap: \
 build/packages/cal10n: \
 	build/packages/maven-artifact-bootstrap \
 	build/packages/maven-plugin-api-bootstrap
+build/packages/cglib: \
+	build/packages/asm4
 build/packages/guava: \
 	$(dep-jsr305)
+build/packages/guice-core: \
+	$(dep-jsr330) \
+	build/packages/asm3 \
+	build/packages/cglib
+build/packages/groovy: \
+	build/packages/asm5 \
+	build/packages/commons-cli \
+	build/packages/jansi \
+	build/packages/xstream \
+	/usr/share/java/antlr2.jar
 build/packages/ognl: \
 	build/packages/javassist \
 	/usr/share/java/javacc.jar
@@ -122,27 +169,19 @@ build/packages/wagon: \
 	build/packages/plexus-utils \
 	/usr/share/java/commons-io/commons-io.jar \
 	/usr/share/java/junit.jar
+build/packages/hawtjni-bootstrap: \
+	build/packages/commons-cli \
+	build/packages/xbean-bootstrap
 
+# ASM
 build/packages/ow-util-ant-tasks: build/packages/asm2
 build/packages/asm1: build/packages/ow-util-ant-tasks
 build/packages/asm2: build/packages/ow-util-ant-tasks-bootstrap
 build/packages/asm3: build/packages/ow-util-ant-tasks
+build/packages/asm4: build/packages/ow-util-ant-tasks
+build/packages/asm5: build/packages/ow-util-ant-tasks
 
-build/packages/httpcomponents-core: \
-	build/packages/commons-cli
-build/packages/httpcomponents-client-bootstrap: \
-	build/packages/commons-codec \
-	build/packages/httpcomponents-core \
-	/usr/share/java/commons-logging/commons-logging.jar
-
-build/packages/mina: \
-	build/packages/commons-lang2 \
-	build/packages/jzlib \
-	build/packages/ognl \
-	build/packages/slf4j-api \
-	/usr/share/java/rxtx/RXTXcomm.jar \
-	/usr/share/java/tomcat8/tomcat-jni.jar
-
+# JDOM/Jaxen
 build/packages/jdom1: \
 	build/packages/jaxen-bootstrap \
 	$(dep-xerces2)
@@ -151,6 +190,7 @@ build/packages/jaxen-bootstrap: \
 build/packages/jdom1-bootstrap: \
 	$(dep-xerces2)
 
+# JFlex
 build/packages/jflex: \
 	build/packages/jflex-bootstrap \
 	/usr/share/java/junit.jar
diff --git a/conf/sources.all.mk b/conf/sources.all.mk
index e7e5e02..9d4d729 100644
--- a/conf/sources.all.mk
+++ b/conf/sources.all.mk
@@ -27,3 +27,5 @@ plexus-utils                                =  git|git://github.com/sonatype/ple
 # yes, I know xbean 3.4 is old
 xbean-reflect                               =  svn|$(_apache_svn)|geronimo/xbean/tags/xbean-3.4/xbean-reflect
 atinject-javax.inject-tck                   =  svn|http://atinject.googlecode.com/svn|tags/javax.inject-tck-1
+
+commons-lang3                               =  tar|$(_apache_mirror)/commons/lang/source/commons-lang3-3.3.2-src.tar.gz
diff --git a/conf/sources.mk b/conf/sources.mk
index 88150c1..f342452 100644
--- a/conf/sources.mk
+++ b/conf/sources.mk
@@ -1,68 +1,102 @@
 _apache_svn                                 =  https://svn.apache.org/repos/asf
 _apache_mirror                              =  http://archive.apache.org/dist
+_objectweb_mirror                           =  http://download.forge.objectweb.org
 
-#maven                                       =  tar|$(_apache_mirror)/maven/maven-3/3.2.1/source/apache-maven-3.2.1-src.tar.gz
+_tarbombs =
+
+# Apache tarballs
+commons-cli                                 =  tar|$(_apache_mirror)/commons/cli/source/commons-cli-1.2-src.tar.gz
+commons-codec                               =  tar|$(_apache_mirror)/commons/codec/source/commons-codec-1.9-src.tar.gz
+commons-lang2                               =  tar|$(_apache_mirror)/commons/lang/source/commons-lang-2.6-src.tar.gz
+commons-net                                 =  tar|$(_apache_mirror)/commons/net/source/commons-net-3.3-src.tar.gz
+
+httpcomponents-client-bootstrap             =  tar|$(_apache_mirror)/httpcomponents/httpclient/source/httpcomponents-client-4.3.4-src.tar.gz
+httpcomponents-core                         =  tar|$(_apache_mirror)/httpcomponents/httpcore/source/httpcomponents-core-4.3.2-src.tar.gz
+
+maven                                       =  tar|$(_apache_mirror)/maven/maven-3/3.2.1/source/apache-maven-3.2.1-src.tar.gz
 maven-artifact-bootstrap                    =  tar|$(_apache_mirror)/maven/maven-3/3.2.1/source/apache-maven-3.2.1-src.tar.gz|maven-artifact
 maven-plugin-api-bootstrap                  =  tar|$(_apache_mirror)/maven/maven-3/3.2.1/source/apache-maven-3.2.1-src.tar.gz|maven-plugin-api
 
-modello-core                                =  git|git://github.com/sonatype/modello.git|modello-1.8.1/modello-core
-modello-plugins                             =  git|git://github.com/sonatype/modello.git|modello-1.8.1/modello-plugins
+mina                                        =  tar|$(_apache_mirror)/mina/mina/2.0.7/apache-mina-2.0.7-src.tar.bz2|src
+mina-sshd                                   =  tar|$(_apache_mirror)/mina/sshd/0.11.0/apache-sshd-0.11.0-src.tar.gz
+
+# Apache SVN
+maven-plugin-annotations-bootstrap          =  svn|$(_apache_svn)/maven/plugin-tools|tags/maven-plugin-tools-3.3/maven-plugin-annotations
+maven-plugin-tools-api-bootstrap            =  svn|$(_apache_svn)/maven/plugin-tools|tags/maven-plugin-tools-3.3/maven-plugin-tools-api
+xbean-bootstrap                             =  svn|$(_apache_svn)/geronimo/xbean|tags/xbean-3.9
+
+# Modello
+modello-core                                =  tar|https://github.com/sonatype/modello/archive/modello-1.8.1.tar.gz|modello-core
+modello-plugins                             =  tar|https://github.com/sonatype/modello/archive/modello-1.8.1.tar.gz|modello-plugins
 
-maven-plugin-annotations-bootstrap          =  svn|$(_apache_svn)/maven|plugin-tools/tags/maven-plugin-tools-3.3/maven-plugin-annotations
-maven-plugin-tools-api-bootstrap            =  svn|$(_apache_svn)/maven|plugin-tools/tags/maven-plugin-tools-3.3/maven-plugin-tools-api
-xbean-reflect-bootstrap                     =  svn|$(_apache_svn)/geronimo|xbean/tags/xbean-3.4/xbean-reflect # Yes, I know xbean 3.4 is old
+# Plexus
+plexus-build-api                            =  tar|https://github.com/sonatype/sisu-build-api/archive/plexus-build-api-0.0.7.tar.gz
+plexus-cipher                               =  tar|https://github.com/sonatype/plexus-cipher/archive/plexus-cipher-1.7.tar.gz
+plexus-classworlds                          =  tar|https://github.com/sonatype/plexus-classworlds/archive/plexus-classworlds-2.5.1.tar.gz
+plexus-interpolation                        =  tar|https://github.com/sonatype/plexus-interpolation/archive/plexus-interpolation-1.19.tar.gz
+plexus-utils                                =  tar|https://github.com/sonatype/plexus-utils/archive/plexus-utils-3.0.17.tar.gz
+plexus-cli                                  =  tar|https://github.com/sonatype/plexus-components/archive/plexus-components-1.1.20.tar.gz|plexus-cli
+plexus-interactivity                        =  tar|https://github.com/sonatype/plexus-components/archive/plexus-interactivity-1.0-alpha-6.tar.gz
+# Plexus containers
+plexus-component-annotations                =  tar|https://github.com/sonatype/plexus-containers/archive/plexus-containers-1.5.5.tar.gz|plexus-component-annotations
+plexus-component-metadata-bootstrap         =  tar|https://github.com/sonatype/plexus-containers/archive/plexus-containers-1.5.5.tar.gz|plexus-component-metadata
+plexus-container-default                    =  tar|https://github.com/sonatype/plexus-containers/archive/plexus-containers-1.5.5.tar.gz|plexus-container-default
 
-plexus-build-api                            =  git|git://github.com/sonatype/sisu-build-api.git|plexus-build-api-0.0.7
-plexus-cipher                               =  git|git://github.com/sonatype/plexus-cipher.git|plexus-cipher-1.7
-plexus-classworlds                          =  git|git://github.com/sonatype/plexus-classworlds.git|plexus-classworlds-2.5.1
-plexus-interpolation                        =  git|git://github.com/sonatype/plexus-interpolation.git|plexus-interpolation-1.19
-plexus-utils                                =  git|git://github.com/sonatype/plexus-utils.git|plexus-utils-3.0.17
+# Misc tarballs
+bnd                                         =  tar|https://github.com/bndtools/bnd/archive/2.3.0.REL.tar.gz
+cal10n                                      =  tar|https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz
+cglib                                       =  tar|https://github.com/cglib/cglib/archive/RELEASE_3_1.tar.gz
+gradle                                      =  tar|https://services.gradle.org/distributions/gradle-1.12-src.zip
+groovy                                      =  tar|https://dl.bintray.com/groovy/maven/groovy-src-2.3.3.zip
+guice-core                                  =  tar|https://google-guice.googlecode.com/files/guice-3.0-src.zip|core
+#javacc                                      =  tar|https://java.net/projects/javacc/downloads/download/javacc-6.0src.zip
+javassist                                   =  tar|https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga.tar.gz
+jline                                       =  tar|https://downloads.sourceforge.net/project/jline/jline/1.0/jline-1.0.zip|src
+jzlib                                       =  tar|https://github.com/ymnk/jzlib/archive/1.1.3.zip
+ognl                                        =  tar|https://github.com/jkuhnert/ognl/archive/OGNL_3_0_8.tar.gz
+qdox                                        =  tar|https://nexus.codehaus.org/content/repositories/releases/com/thoughtworks/qdox/qdox/2.0-M1/qdox-2.0-M1-project.tar.bz2
+slf4j-api                                   =  tar|http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz|slf4j-api # HTTPS is mis-configured
+wagon                                       =  tar|$(_apache_mirror)/maven/wagon/wagon-2.6-source-release.zip
 
-plexus-cli                                  =  git|git://github.com/sonatype/plexus-components.git|plexus-components-1.1.20/plexus-cli
-plexus-interactivity                        =  git|git://github.com/sonatype/plexus-components.git|plexus-interactivity-1.0-alpha-6
 
-plexus-component-annotations                =  git|git://github.com/sonatype/plexus-containers.git|plexus-containers-1.5.5/plexus-component-annotations
-plexus-component-metadata-bootstrap         =  git|git://github.com/sonatype/plexus-containers.git|plexus-containers-1.5.5/plexus-component-metadata
-plexus-container-default                    =  git|git://github.com/sonatype/plexus-containers.git|plexus-containers-1.5.5/plexus-container-default
+osgi42-core                                 =  tar|http://www.osgi.org/download/r4v42/osgi.core.jar|OSGI-OPT
+osgi43-core                                 =  tar|http://www.osgi.org/download/r4v43/osgi.core-4.3.1.jar|OSGI-OPT
+osgi50-core                                 =  tar|http://www.osgi.org/download/r5/osgi.core-5.0.0.jar|OSGI-OPT
+_tarbombs += $(osgi42-core) $(osgi43-core) $(osgi50-core)
 
+# Misc Git
 aether-core-bootstrap                       =  git|git://git.eclipse.org/gitroot/aether/aether-core.git|aether-1.0.0.v20140518
-cal10n                                      =  git|git://github.com/qos-ch/cal10n.git|v_0.8.1
+bouncycastle-java                           =  git|http://git.bouncycastle.org/repositories/bc-java|r1rv50 # SSL is broken
 guava                                       =  git|https://code.google.com/p/guava-libraries/|v17.0/guava
-javassist                                   =  git|git://github.com/jboss-javassist/javassist.git|rel_3_18_2_ga
-jline                                       =  tar|http://downloads.sourceforge.net/project/jline/jline/1.0/jline-1.0.zip|src
 jsoup                                       =  git|git://github.com/jhy/jsoup.git|jsoup-1.7.3
-jzlib                                       =  tar|https://github.com/ymnk/jzlib/archive/1.1.3.zip
-ognl                                        =  git|git://github.com/jkuhnert/ognl.git|OGNL_3_0_8
-qdox                                        =  tar|http://nexus.codehaus.org/content/repositories/releases/com/thoughtworks/qdox/qdox/2.0-M1/qdox-2.0-M1-project.tar.bz2
-slf4j-api                                   =  tar|http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz|slf4j-api
-wagon                                       =  tar|$(_apache_mirror)/maven/wagon/wagon-2.6-source-release.zip
 
-asm1                                        =  tar|http://download.forge.objectweb.org/asm/asm-1.5.3.tar.gz
-asm2                                        =  tar|http://download.forge.objectweb.org/asm/asm-2.2.3.tar.gz
-asm3                                        =  tar|http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
-ow-util-ant-tasks                           =  tar|http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_1.3.2.zip
-ow-util-ant-tasks-bootstrap                 =  $(ow-util-ant-tasks)
+# FuseSource
+jansi                                       =  tar|https://github.com/fusesource/jansi/archive/jansi-project-1.11.tar.gz
+jansi-native                                =  tar|https://github.com/fusesource/jansi-native/archive/jansi-native-1.5.tar.gz
+hawtjni                                     =  tar|https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.10.tar.gz
+hawtjni-bootstrap                           =  $(hawtjni)
 
-commons-cli                                 =  tar|$(_apache_mirror)/commons/cli/source/commons-cli-1.2-src.tar.gz
-commons-codec                               =  tar|$(_apache_mirror)/commons/codec/source/commons-codec-1.9-src.tar.gz
-commons-lang2                               =  tar|$(_apache_mirror)/commons/lang/source/commons-lang-2.6-src.tar.gz
-commons-net                                 =  tar|$(_apache_mirror)/commons/net/source/commons-net-3.3-src.tar.gz
-
-httpcomponents-core                         =  tar|$(_apache_mirror)/httpcomponents/httpcore/source/httpcomponents-core-4.3.2-src.tar.gz
-httpcomponents-client-bootstrap             =  tar|$(_apache_mirror)/httpcomponents/httpclient/source/httpcomponents-client-4.3.4-src.tar.gz
+# ObjectWeb
+asm1                                        =  tar|$(_objectweb_mirror)/asm/asm-1.5.3.tar.gz
+asm2                                        =  tar|$(_objectweb_mirror)/asm/asm-2.2.3.tar.gz
+asm3                                        =  tar|$(_objectweb_mirror)/asm/asm-3.3.1.tar.gz
+asm4                                        =  tar|$(_objectweb_mirror)/asm/asm-4.2.tar.gz
+asm5                                        =  tar|$(_objectweb_mirror)/asm/asm-5.0.3.tar.gz
+ow-util-ant-tasks                           =  tar|$(_objectweb_mirror)/monolog/ow_util_ant_tasks_1.3.2.zip
+ow-util-ant-tasks-bootstrap                 =  $(ow-util-ant-tasks)
+_tarbombs += $(ow-util-ant-tasks)
 
-mina                                        =  tar|$(_apache_mirror)/mina/mina/2.0.7/apache-mina-2.0.7-src.tar.bz2|src
 # Is missing support for jom4j and xom
-jaxen-bootstrap                             =  tar|http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz
+jaxen-bootstrap                             =  tar|http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz # HTTPS is broken
 
-jdom1                                       =  git|git://github.com/hunterhacker/jdom.git|jdom-1.1.3
+jdom1                                       =  tar|https://github.com/hunterhacker/jdom/archive/jdom-1.1.3.tar.gz
 jdom1-bootstrap                             =  $(jdom1)
 
-jflex                                       =  tar|http://jflex.de/jflex-1.5.1.tar.gz
+jflex                                       =  tar|http://jflex.de/jflex-1.5.1.tar.gz # No TLS
 jflex-bootstrap                             =  $(jflex)
 
 # Any other implementation of JSR-305 would probably be fine too.
-jsr305                                      =  svn|http://jsr-305.googlecode.com/svn|trunk/ri
+jsr305                                      =  svn|https://jsr-305.googlecode.com/svn|trunk/ri
 
 # An implementation of JSR-330.  Google Guice also implements JSR-330.
-atinject-javax.inject                       =  svn|http://atinject.googlecode.com/svn|trunk
+atinject-javax.inject                       =  svn|https://atinject.googlecode.com/svn|trunk