summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-06-03 16:23:57 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-06-03 16:23:57 -0400
commit1fe4c5597261e30e26d691b3554769507db9a865 (patch)
tree73c4b881f0a055f510c321b76ab1e2a033629a9a /conf
parentc5b5c909fc6095882bbb1fb8f2d16e38c921c0a5 (diff)
Hey, look: Modello works
Diffstat (limited to 'conf')
-rw-r--r--conf/dependencies.mk8
-rw-r--r--conf/sources.mk2
2 files changed, 6 insertions, 4 deletions
diff --git a/conf/dependencies.mk b/conf/dependencies.mk
index 273ed69..94b1370 100644
--- a/conf/dependencies.mk
+++ b/conf/dependencies.mk
@@ -1,6 +1,3 @@
-build/packages/maven-bootstrap: \
- build/packages/modello-core
-
build/packages/modello-core: \
build/packages/plexus-build-api \
build/packages/plexus-container-default \
@@ -16,6 +13,10 @@ modello-cli = \
build/packages/plexus-utils \
build/packages/xbean
+build/packages/maven: \
+ $(modello-cli) \
+ build/packages/modello-plugins
+
build/packages/modello-plugins: \
build/packages/modello-core \
build/packages/plexus-container-default \
@@ -51,6 +52,7 @@ build/packages/plexus-build-api: \
build/packages/plexus-cipher: \
build/packages/atinject-javax.inject
+# FIXME: Does not include generated code? But signatures match?
build/packages/plexus-container-default: \
build/packages/guava \
build/packages/plexus-classworlds \
diff --git a/conf/sources.mk b/conf/sources.mk
index 5c79fe7..23b290d 100644
--- a/conf/sources.mk
+++ b/conf/sources.mk
@@ -26,5 +26,5 @@ guava = git|https://code.google.com/p/gua
# Any other implementation of JSR-305 would probably be fine too.
jsr305 = svn|http://jsr-305.googlecode.com/svn|trunk/ri
-# An implementation of JSR-330. Perhaps use the one included in Google Guice if we include that anyway?
+# An implementation of JSR-330. Google Guice also implements JSR-330.
atinject-javax.inject = svn|http://atinject.googlecode.com/svn|trunk