Add rules for more packages (guava builds!)

5 files changed, 53 insertions, 1 deletions

diff --git a/conf/dependencies.mk b/conf/dependencies.mk
index 9149007..2164512 100644
--- a/conf/dependencies.mk
+++ b/conf/dependencies.mk
@@ -7,3 +7,17 @@ build/packages/maven-plugin-tools: \
 build/packages/xbean-reflect: \
 	/usr/share/java/commons-logging/commons-logging.jar \
 	/usr/share/java/asm-all-2.jar
+
+build/packages/maven-plugin-api-bootstrap: \
+	build/packages/plexus-utils \
+	build/packages/plexus-container-default \
+	build/packages/plexus-classworlds
+
+build/packages/plexus-container-default: \
+	build/packages/plexus-classworlds \
+	build/packages/plexus-utils \
+	build/packages/xbean-reflect \
+	/usr/share/java/junit.jar
+
+build/packages/guava: \
+	build/packages/jsr305
diff --git a/conf/sources.all.mk b/conf/sources.all.mk
index 65baa9d..c0e4bdb 100644
--- a/conf/sources.all.mk
+++ b/conf/sources.all.mk
@@ -12,7 +12,7 @@ maven-extras-maven-remote-resources-plugin  =  svn|$(_apache_svn)|maven/plugins/
 maven-extras-maven-resources-plugin         =  svn|$(_apache_svn)|maven/plugins/tags/maven-resources-plugin-2.6
 maven-extras-maven-site-plugin              =  svn|$(_apache_svn)|maven/plugins/tags/maven-site-plugin-3.3
 maven-extras-maven-verifier-plugin          =  svn|$(_apache_svn)|maven/plugins/tags/maven-verifier-plugin-1.0
-maven-extras-plugin-tools                   =  svn|$(_apache_svn)|maven/plugin-tools/tags/maven-plugin-tools-3.2
+maven-extras-plugin-tools                   =  svn|$(_apache_svn)|maven/plugin-tools/tags/maven-plugin-tools-3.3
 maven-extras-pom-asf                        =  svn|$(_apache_svn)|maven/pom/tags/apache-13
 maven-extras-pom-maven                      =  svn|$(_apache_svn)|maven/pom/tags/maven-parent-23
 plexus-archiver                             =  git|git://github.com/sonatype/plexus-archiver.git|plexus-archiver-2.4.3
diff --git a/conf/sources.mk b/conf/sources.mk
index b4ed3f7..625a67d 100644
--- a/conf/sources.mk
+++ b/conf/sources.mk
@@ -1,10 +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-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-tools                          =  svn|$(_apache_svn)|maven/plugin-tools/tags/maven-plugin-tools-3.3
+
 plexus-utils                                =  git|git://github.com/sonatype/plexus-utils.git|plexus-utils-3.0.17
 # guava
 # sisu-guice (and -no_aop)
 plexus-component-annotations                =  git|git://github.com/sonatype/plexus-containers.git|plexus-containers-1.5.5/plexus-component-annotations
+plexus-container-default                    =  git|git://github.com/sonatype/plexus-containers.git|plexus-containers-1.5.5/plexus-container-default
 # junit
 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
@@ -23,3 +29,10 @@ plexus-interpolation                        =  git|git://github.com/sonatype/ple
 # commons-jxpath
 # plexus-sec-dispatcher
 plexus-cipher                               =  git|git://github.com/sonatype/plexus-cipher.git|plexus-cipher-1.7
+modello                                     =  git|git://github.com/sonatype/modello.git|modello-1.8.1
+
+# yes, I know xbean 3.4 is old
+xbean-reflect                               =  svn|$(_apache_svn)|geronimo/xbean/tags/xbean-3.4/xbean-reflect
+
+guava                                       =  git|https://code.google.com/p/guava-libraries/|v17.0/guava
+jsr305                                      =  svn|http://jsr-305.googlecode.com/svn|trunk/ri
diff --git a/makefiles/guava.mk b/makefiles/guava.mk
new file mode 100644
index 0000000..2f176e6
--- /dev/null
+++ b/makefiles/guava.mk
@@ -0,0 +1,2 @@
+srcdir = src
+include $(dir $(lastword $(MAKEFILE_LIST)))/mvn-simple.mk
diff --git a/makefiles/jsr305.mk b/makefiles/jsr305.mk
new file mode 100644
index 0000000..f087023
--- /dev/null
+++ b/makefiles/jsr305.mk
@@ -0,0 +1,23 @@
+DESTDIR ?=
+JAR_DIR ?= /usr/share/java
+
+ANT = ant
+RM = rm -f
+MKDIRS = mkdir -p
+INSTALL = install
+FIND = find
+
+all: PHONY build
+install: PHONY $(DESTDIR)$(JAR_DIR)/jsr305
+clean: PHONY
+	$(RM) -r build
+
+build: src $(shell $(FIND) src)
+	$(ANT) jars || { $(RM) -r build; exit 1; }
+
+$(DESTDIR)$(JAR_DIR)/jsr305: build $(wildcard build/*.jar)
+	$(RM) -r $@
+	$(MKDIRS) $@
+	$(INSTALL) -t $@ build/*.jar
+
+.PHONY: PHONY