diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-07-20 23:02:06 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-07-20 23:02:06 -0400 |
| commit | 6d8b70cba995046cb9956ac8c4a733f9480190f8 (patch) | |
| tree | f1e13d3f71ed923bd984f593e1be32d2326a4416 /conf | |
| parent | 0f558004575ac0666c59c59c49fc8d15ace184d3 (diff) | |
dependencies: pull the junit location into dep-junit
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/dependencies.mk | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/conf/dependencies.mk b/conf/dependencies.mk index 8e84807..f7d607f 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -20,14 +20,17 @@ dep-plexus-metadata-generator-cli = \ build/packages/plexus-utils \ build/packages/qdox \ build/packages/xbean-bootstrap -# Where is xerces2 +# Where is xerces2? dep-xerces2 = \ /usr/share/java/serializer.jar \ /usr/share/java/xercesImpl.jar \ /usr/share/java/xml-apis.jar -# Implementations of standard interfaces -dep-jsr305 = build/packages/jsr305 -dep-jsr330 = build/packages/atinject-javax.inject +# Where is junit? +dep-junit = /usr/share/java/junit.jar + +# Implementations of standards +dep-jsr305 = build/packages/jsr305 # "Annotations for Software Defect Detection" +dep-jsr330 = build/packages/atinject-javax.inject # "Dependency Injection for Java" ################################################################################ @@ -125,11 +128,11 @@ build/packages/plexus-component-metadata-bootstrap: \ build/packages/plexus-utils \ build/packages/qdox build/packages/plexus-container-default: \ + $(dep-junit) \ build/packages/guava \ build/packages/plexus-classworlds \ build/packages/plexus-utils \ - build/packages/xbean-bootstrap \ - /usr/share/java/junit.jar + build/packages/xbean-bootstrap # Misc @@ -160,6 +163,7 @@ build/packages/ognl: \ build/packages/qdox: \ build/packages/jflex build/packages/wagon: \ + $(dep-junit) \ build/packages/commons-io \ build/packages/commons-lang2 \ build/packages/commons-net \ @@ -167,8 +171,7 @@ build/packages/wagon: \ build/packages/httpcomponents-client-bootstrap \ build/packages/jsoup \ build/packages/plexus-interactivity \ - build/packages/plexus-utils \ - /usr/share/java/junit.jar + build/packages/plexus-utils build/packages/hawtjni-bootstrap: \ build/packages/commons-cli \ build/packages/xbean-bootstrap @@ -192,7 +195,7 @@ build/packages/jdom1-bootstrap: \ # JFlex build/packages/jflex: \ - build/packages/jflex-bootstrap \ - /usr/share/java/junit.jar + $(dep-junit) \ + build/packages/jflex-bootstrap build/packages/jflex-bootstrap: \ - /usr/share/java/junit.jar + $(dep-junit) |