clean up old packages

2 files changed, 34 insertions, 68 deletions

diff --git a/conf/dependencies.mk b/conf/dependencies.mk
index f1bed82..9d8afd7 100644
--- a/conf/dependencies.mk
+++ b/conf/dependencies.mk
@@ -1,28 +1,3 @@
-# What is needed to use the Modello command line
-dep-meta-modello-cli = \
-	build/packages/guava \
-	build/packages/modello-core \
-	build/packages/plexus-build-api \
-	build/packages/plexus-classworlds \
-	build/packages/plexus-container-default \
-	build/packages/plexus-utils \
-	build/packages/xbean-bootstrap
-build/packages/modello-cli: $(dep-meta-modello-cli)
-# What is needed to use the Plexus Metadata Generator command line
-dep-meta-plexus-metadata-generator-cli = \
-	build/packages/asm3 \
-	build/packages/commons-cli \
-	build/packages/guava \
-	build/packages/jdom1 \
-	build/packages/maven-plugin-api-bootstrap \
-	build/packages/plexus-classworlds \
-	build/packages/plexus-cli \
-	build/packages/plexus-component-metadata-bootstrap \
-	build/packages/plexus-container-default \
-	build/packages/plexus-utils \
-	build/packages/qdox \
-	build/packages/xbean-bootstrap
-build/packages/plexus-metadata-generator-cli: $(dep-meta-plexus-metadata-generator-cli)
 # Where is xerces2?
 dep-meta-xerces2 = \
 	/usr/share/java/serializer.jar \
@@ -87,19 +62,6 @@ build/packages/maven-plugin-api-bootstrap: \
 	build/packages/plexus-container-default \
 	build/packages/plexus-utils
 
-build/packages/mina: \
-	/usr/share/java/rxtx/RXTXcomm.jar \
-	/usr/share/java/tomcat8/tomcat-jni.jar \
-	build/packages/commons-lang2 \
-	build/packages/jzlib \
-	build/packages/ognl \
-	build/packages/slf4j-api
-build/packages/mina-sshd: \
-	/usr/share/java/tomcat8/tomcat-jni.jar \
-	build/packages/jzlib \
-	build/packages/mina \
-	build/packages/slf4j-api
-
 # Apache (from SVN)
 build/packages/maven-plugin-annotations-bootstrap: \
 	build/packages/maven-artifact-bootstrap
@@ -124,6 +86,14 @@ build/packages/modello-plugins: \
 	build/packages/plexus-container-default \
 	build/packages/plexus-build-api \
 	build/packages/plexus-utils
+build/packages/modello-cli: \
+	build/packages/guava \
+	build/packages/modello-core \
+	build/packages/plexus-build-api \
+	build/packages/plexus-classworlds \
+	build/packages/plexus-container-default \
+	build/packages/plexus-utils \
+	build/packages/xbean-bootstrap
 
 # Plexus
 build/packages/plexus-build-api: \
@@ -140,7 +110,7 @@ build/packages/plexus-interactivity: \
 	build/packages/plexus-container-default \
 	build/packages/plexus-utils
 build/packages/plexus-sec-dispatcher: \
-	$(dep-meta-modello-cli) \
+	build/packages/modello-cli \
 	build/packages/modello-plugins \
 	build/packages/plexus-cipher \
 	build/packages/plexus-container-default
@@ -161,6 +131,19 @@ build/packages/plexus-container-default: \
 	build/packages/plexus-classworlds \
 	build/packages/plexus-utils \
 	build/packages/xbean-bootstrap
+build/packages/plexus-metadata-generator-cli: \
+	build/packages/asm3 \
+	build/packages/commons-cli \
+	build/packages/guava \
+	build/packages/jdom1 \
+	build/packages/maven-plugin-api-bootstrap \
+	build/packages/plexus-classworlds \
+	build/packages/plexus-cli \
+	build/packages/plexus-component-metadata-bootstrap \
+	build/packages/plexus-container-default \
+	build/packages/plexus-utils \
+	build/packages/qdox \
+	build/packages/xbean-bootstrap
 
 # OSGi
 build/packages/osgi50-enterprise: \
@@ -170,11 +153,11 @@ build/packages/osgi50-enterprise: \
 
 # ASM
 build/packages/ow-util-ant-tasks: build/packages/asm2
-build/packages/asm1: build/packages/ow-util-ant-tasks
+#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/bnd
-build/packages/asm5: build/packages/ow-util-ant-tasks build/packages/bnd
+#build/packages/asm5: build/packages/ow-util-ant-tasks build/packages/bnd
 
 # Quality Open Software
 build/packages/logback-core: \
@@ -182,9 +165,6 @@ build/packages/logback-core: \
 	$(dep-std-servlet25) \
 	build/packages/janino \
 	build/packages/jansi
-build/packages/cal10n: \
-	build/packages/maven-artifact-bootstrap \
-	build/packages/maven-plugin-api-bootstrap
 build/packages/slf4j-simple: \
 	build/packages/slf4j-api
 
@@ -246,9 +226,6 @@ build/packages/guice-bootstrap: \
 	build/packages/aopalliance \
 	build/packages/asm3 \
 	build/packages/cglib
-build/packages/ognl: \
-	/usr/share/java/javacc.jar \
-	build/packages/javassist
 build/packages/qdox: \
 	build/packages/jflex
 build/packages/wagon: \
diff --git a/conf/sources.mk b/conf/sources.mk
index 1529c60..0cc4b76 100644
--- a/conf/sources.mk
+++ b/conf/sources.mk
@@ -10,8 +10,7 @@ commons-cli                                 =  tar|$(_apache_mirror)/commons/cli
 commons-codec                               =  tar|$(_apache_mirror)/commons/codec/source/commons-codec-1.9-src.tar.gz
 commons-io                                  =  tar|$(_apache_mirror)/commons/io/source/commons-io-2.4-src.tar.gz
 commons-lang2                               =  tar|$(_apache_mirror)/commons/lang/source/commons-lang-2.6-src.tar.gz
-commons-logging                             =  tar|$(_apache_mirror)/commons/logging/source/commons-logging-1.2-src.tar.gz
-commons-logging-bootstrap                   =  $(commons-logging)
+commons-logging-bootstrap                   =  tar|$(_apache_mirror)/commons/logging/source/commons-logging-1.2-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
@@ -21,12 +20,7 @@ maven                                       =  tar|$(_apache_mirror)/maven/maven
 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
 
-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
@@ -51,36 +45,35 @@ plexus-container-default                    =  tar|https://github.com/sonatype/p
 
 # OSGi code (starting at 4.2)
 osgi42-core                                 =  tar|http://www.osgi.org/download/r4v42/osgi.core.jar|OSGI-OPT
-osgi42-cmpn                                 =  tar|http://www.osgi.org/download/r4v42/osgi.cmpn.jar|OSGI-OPT
-osgi42-enterprise                           =  tar|http://www.osgi.org/download/r4v42/osgi.enterprise.jar|OSGI-OPT
+#osgi42-cmpn                                 =  tar|http://www.osgi.org/download/r4v42/osgi.cmpn.jar|OSGI-OPT
+#osgi42-enterprise                           =  tar|http://www.osgi.org/download/r4v42/osgi.enterprise.jar|OSGI-OPT
 _tarbombs += $(osgi42-core) $(osgi42-cmpn) $(osgi42-enterprise)
 
-osgi43-core                                 =  tar|http://www.osgi.org/download/r4v43/osgi.core-4.3.1.jar|OSGI-OPT
-osgi43-cmpn                                 =  tar|http://www.osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar|OSGI-OPT
-osgi43-residential                          =  tar|http://www.osgi.org/download/r4v43/osgi.residential-4.3.0.jar|OSGI-OPT
+#osgi43-core                                 =  tar|http://www.osgi.org/download/r4v43/osgi.core-4.3.1.jar|OSGI-OPT
+#osgi43-cmpn                                 =  tar|http://www.osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar|OSGI-OPT
+#osgi43-residential                          =  tar|http://www.osgi.org/download/r4v43/osgi.residential-4.3.0.jar|OSGI-OPT
 _tarbombs += $(osgi43-core) $(osgi43-cmpn) $(osgi43-residential)
 
 osgi50-core                                 =  tar|http://www.osgi.org/download/r5/osgi.core-5.0.0.jar|OSGI-OPT
-osgi50-cmpn                                 =  tar|http://www.osgi.org/download/r5/osgi.cmpn-5.0.0.jar|OSGI-OPT
+#osgi50-cmpn                                 =  tar|http://www.osgi.org/download/r5/osgi.cmpn-5.0.0.jar|OSGI-OPT
 osgi50-enterprise                           =  tar|http://www.osgi.org/download/r5/osgi.enterprise-5.0.0.jar|OSGI-OPT
 _tarbombs += $(osgi50-core) $(osgi50-cmpn) $(osgi50-enterprise)
 
-osgi60-core                                 =  tar|http://www.osgi.org/download/r6/osgi.core-6.0.0.jar|OSGI-OPT
+#osgi60-core                                 =  tar|http://www.osgi.org/download/r6/osgi.core-6.0.0.jar|OSGI-OPT
 _tarbombs += $(osgi60-core)
 
 # ObjectWeb
-asm1                                        =  tar|$(_objectweb_mirror)/asm/asm-1.5.3.tar.gz
+#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
+#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)
 
 # Quality Open Software
 logback-core                                =  tar|http://logback.qos.ch/dist/logback-1.1.2.tar.gz|logback-core # HTTPS is mis-configured
-cal10n                                      =  tar|https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz
 slf4j-api                                   =  tar|http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz|slf4j-api # HTTPS is mis-configured
 slf4j-simple                                =  tar|http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz|slf4j-simple # HTTPS is mis-configured
 
@@ -102,16 +95,12 @@ bnd                                         =  tar|https://github.com/bndtools/b
 cglib                                       =  tar|https://github.com/cglib/cglib/archive/RELEASE_3_1.tar.gz
 guice-bootstrap                             =  tar|https://google-guice.googlecode.com/files/guice-3.0-src.zip
 #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
 wagon                                       =  tar|$(_apache_mirror)/maven/wagon/wagon-2.6-source-release.zip
 
 # Misc VCS
 atinject-javax.inject                       =  svn|https://atinject.googlecode.com/svn|trunk
-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
 jarjar                                      =  svn|https://jarjar.googlecode.com/svn|trunk/jarjar
 jsoup                                       =  git|git://github.com/jhy/jsoup.git|jsoup-1.7.3