summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2014-07-22 23:50:27 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2014-07-22 23:50:27 -0400
commit755761fbdd192e781c956e5bb64eb2ab0dcf86dc (patch)
treea5ac287bc8651d422cf4dea014ee05f82369f35e /conf
parentac1085576deb2782e84c7d3fbeab21ebfb81cbdf (diff)
Also build Guice extensions
I gave it -bootstrap because I did disable the 'struts2' and 'spring' extensions.
Diffstat (limited to 'conf')
-rw-r--r--conf/dependencies.mk5
-rw-r--r--conf/sources.mk2
2 files changed, 5 insertions, 2 deletions
diff --git a/conf/dependencies.mk b/conf/dependencies.mk
index 11aa0d2..d515f4d 100644
--- a/conf/dependencies.mk
+++ b/conf/dependencies.mk
@@ -34,6 +34,7 @@ dep-jsr315 = $(dep-servlet30) # "Java Servlet 3.0 Specificat
dep-jsr330 = build/packages/atinject-javax.inject # "Dependency Injection for Java"
dep-jsr340 = $(dep-servlet31) # "Java Servlet 3.1 Specification"
+dep-jpa10 = $(dep-jpa20)
dep-jpa20 = build/packages/eclipselink-persistence20
dep-jpa21 = build/packages/eclipselink-persistence21
@@ -178,8 +179,10 @@ build/packages/cglib: \
build/packages/jarjar
build/packages/guava: \
$(dep-jsr305)
-build/packages/guice-core: \
+build/packages/guice-bootstrap: \
$(dep-jsr330) \
+ $(dep-jpa10) \
+ $(dep-servlet25) \
build/packages/aopalliance \
build/packages/asm3 \
build/packages/cglib
diff --git a/conf/sources.mk b/conf/sources.mk
index 1e44a3d..0915014 100644
--- a/conf/sources.mk
+++ b/conf/sources.mk
@@ -82,7 +82,7 @@ cal10n = tar|https://github.com/qos-ch/cal
cglib = tar|https://github.com/cglib/cglib/archive/RELEASE_3_1.tar.gz
gradle = tar|https://services.gradle.org/distributions/gradle-1.12-src.zip
groovy = tar|https://dl.bintray.com/groovy/maven/groovy-src-2.3.3.zip
-guice-core = tar|https://google-guice.googlecode.com/files/guice-3.0-src.zip|core
+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