clean up

5 files changed, 32 insertions, 49 deletions

diff --git a/Makefile b/Makefile
index dc9501f..fcb08c0 100644
--- a/Makefile
+++ b/Makefile
@@ -84,6 +84,7 @@ $(foreach package,$(packages),$(if $(filter-out svn|%,$($(package))),$(eval \
 
 place: PHONY $(addprefix,build/workdir/,$(packages))
 
+$(addprefix build/workdir/,$(packages)): \
 build/workdir/%:
 	rm -rf '$@'
 	mkdir -p '$(@D)'
diff --git a/conf/dependencies.mk b/conf/dependencies.mk
index 94b1370..547e31f 100644
--- a/conf/dependencies.mk
+++ b/conf/dependencies.mk
@@ -1,67 +1,63 @@
-build/packages/modello-core: \
-	build/packages/plexus-build-api \
-	build/packages/plexus-container-default \
-	build/packages/plexus-utils
-
-# What is required to use the modello command line
-modello-cli = \
+# What is needed to use the Modello command line
+dep-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
+	build/packages/xbean-reflect-bootstrap
+# Implementations of standard interfaces
+dep-jsr305 = build/packages/jsr305
+dep-jsr330 = build/packages/atinject-javax.inject
 
 build/packages/maven: \
-	$(modello-cli) \
+	$(dep-modello-cli) \
 	build/packages/modello-plugins
-
-build/packages/modello-plugins: \
-	build/packages/modello-core \
-	build/packages/plexus-container-default \
-	build/packages/plexus-build-api \
-	build/packages/plexus-utils
-
 build/packages/maven-artifact-bootstrap: \
 	build/packages/plexus-utils
-
 build/packages/maven-plugin-api-bootstrap: \
 	build/packages/maven-artifact-bootstrap \
 	build/packages/plexus-classworlds \
 	build/packages/plexus-container-default \
 	build/packages/plexus-utils
 
+build/packages/modello-core: \
+	build/packages/plexus-build-api \
+	build/packages/plexus-container-default \
+	build/packages/plexus-utils
+build/packages/modello-plugins: \
+	build/packages/modello-core \
+	build/packages/plexus-container-default \
+	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: \
+build/packages/xbean-reflect-bootstrap: \
 	/usr/share/java/asm-all-2.jar \
 	/usr/share/java/commons-logging/commons-logging.jar
 
 build/packages/plexus-build-api: \
 	build/packages/plexus-container-default \
 	build/packages/plexus-utils
-
 build/packages/plexus-cipher: \
-	build/packages/atinject-javax.inject
-
+	$(dep-jsr330)
 # 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 \
+	build/packages/xbean-reflect-bootstrap \
 	/usr/share/java/junit.jar
 
 build/packages/guava: \
-	build/packages/jsr305
+	$(dep-jsr305)
 
 build/packages/atinject-javax.inject-tck: \
 	/usr/share/java/junit.jar
diff --git a/conf/sources.mk b/conf/sources.mk
index 23b290d..94b741e 100644
--- a/conf/sources.mk
+++ b/conf/sources.mk
@@ -1,17 +1,16 @@
 _apache_svn                                 =  https://svn.apache.org/repos/asf
 _apache_mirror                              =  http://archive.apache.org/dist
 
-maven                                       =  tar|$(_apache_mirror)/maven/maven-3/3.2.1/source/apache-maven-3.2.1-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
 
-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
-
 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                                       =  svn|$(_apache_svn)|geronimo/xbean/tags/xbean-3.4 # Yes, I know xbean 3.4 is old
+xbean-reflect-bootstrap                     =  svn|$(_apache_svn)|geronimo/xbean/tags/xbean-3.4/xbean-reflect # Yes, I know xbean 3.4 is old
 
 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
diff --git a/rules/xbean/no-log4j.patch b/rules/xbean-reflect-bootstrap/no-log4j.patch
index 3c1ed3f..7b9285c 100644
--- a/rules/xbean/no-log4j.patch
+++ b/rules/xbean-reflect-bootstrap/no-log4j.patch
@@ -1,7 +1,7 @@
-Index: xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java
+Index: xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java
 ===================================================================
---- xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java	(revision 1598206)
-+++ xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java	(working copy)
+--- xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java	(revision 1598206)
++++ xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java	(working copy)
 @@ -1,32 +0,0 @@
 -/**
 - * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,10 +35,10 @@ Index: xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jCo
 -        return Logger.getLogger(text);
 -    }
 -}
-Index: xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
+Index: xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
 ===================================================================
---- xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java	(revision 1598206)
-+++ xbean/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java	(working copy)
+--- xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java	(revision 1598206)
++++ xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java	(working copy)
 @@ -120,11 +120,6 @@
          registerConverter(new WeakHashMapEditor());
  
diff --git a/rules/xbean/subdir-deps.mk b/rules/xbean/subdir-deps.mk
deleted file mode 100644
index ac61290..0000000
--- a/rules/xbean/subdir-deps.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# FIXME: other dependencies
-subdirs := $(filter-out xbean-spring xbean-telnet xbean-classloader maven-xbean-plugin,$(subdirs))
-
-target/$(artifact)-$(version): \
-	target/META-INF/LICENSE \
-	target/META-INF/NOTICE
-
-target/META-INF/NOTICE: $(firstword $(wildcard NOTICE.txt ../NOTICE.txt))
-	$(MKDIRS) $(@D)
-	grep -v '^//' < $< > $@
-
-target/META-INF/LICENSE: $(firstword $(wildcard LICENSE.txt ../LICENSE.txt))
-	$(INSTALL) -Dm644 $< $@