diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-04 00:23:07 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-04 00:23:07 -0400 |
| commit | d5902fc1e3c8b9cf8574b4cf61dc5a8ceae7fefc (patch) | |
| tree | baeaab1028b4b4fbd56dda7418f54882ebb8c640 /conf | |
| parent | 0492728b0c768cc704a6ba6b3360e43787313916 (diff) | |
It turns out the jdom1 and jdom2 APIs are different.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/dependencies.mk | 16 | ||||
| -rw-r--r-- | conf/sources.mk | 6 |
2 files changed, 18 insertions, 4 deletions
diff --git a/conf/dependencies.mk b/conf/dependencies.mk index 444b426..b4f4b20 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -7,6 +7,11 @@ dep-modello-cli = \ build/packages/plexus-container-default \ build/packages/plexus-utils \ build/packages/xbean-reflect-bootstrap +# 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 @@ -50,7 +55,7 @@ build/packages/plexus-build-api: \ build/packages/plexus-cipher: \ $(dep-jsr330) build/packages/plexus-component-metadata: \ - build/packages/jdom-bootstrap \ + build/packages/jdom1 \ build/packages/maven-plugin-api-bootstrap \ build/packages/plexus-classworlds \ build/packages/plexus-container-default \ @@ -68,5 +73,10 @@ build/packages/plexus-container-default: \ build/packages/guava: \ $(dep-jsr305) -build/packages/jdom-bootstrap: \ - build/packages/jaxen-bootstrap +build/packages/jdom1: \ + build/packages/jaxen-bootstrap \ + $(dep-xerces2) +build/packages/jaxen-bootstrap: \ + build/packages/jdom1-bootstrap +build/packages/jdom1-bootstrap: \ + $(dep-xerces2) diff --git a/conf/sources.mk b/conf/sources.mk index 8bc9d48..9ceebc4 100644 --- a/conf/sources.mk +++ b/conf/sources.mk @@ -22,8 +22,12 @@ plexus-interpolation = git|git://github.com/sonatype/ple plexus-utils = git|git://github.com/sonatype/plexus-utils.git|plexus-utils-3.0.17 guava = git|https://code.google.com/p/guava-libraries/|v17.0/guava + +# Is missing support for jom4j and xom jaxen-bootstrap = tar|http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz -jdom-bootstrap = git|git://github.com/hunterhacker/jdom.git|JDOM-2.0.5 + +jdom1 = git|git://github.com/hunterhacker/jdom.git|jdom-1.1.3 +jdom1-bootstrap = $(jdom1) # Any other implementation of JSR-305 would probably be fine too. jsr305 = svn|http://jsr-305.googlecode.com/svn|trunk/ri |