diff options
| -rw-r--r-- | conf/dependencies.mk | 16 | ||||
| -rw-r--r-- | conf/sources.mk | 5 | ||||
| -rw-r--r-- | rules/aether-core-bootstrap/subdir-deps.mk | 12 | ||||
| -rw-r--r-- | rules/httpcomponents-client-bootstrap/delete.list | 2 | ||||
| -rw-r--r-- | rules/httpcomponents-client-bootstrap/subdir-deps.mk | 9 | ||||
| -rw-r--r-- | rules/httpcomponents-core/subdir-deps.mk | 4 |
6 files changed, 46 insertions, 2 deletions
diff --git a/conf/dependencies.mk b/conf/dependencies.mk index 19259df..a6c3356 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -33,8 +33,9 @@ build/packages/maven: \ $(dep-modello-cli) \ $(dep-plexus-metadata-generator-cli) \ $(dep-jsr330) \ - build/packages/plexus-component-annotations \ - build/packages/modello-plugins + build/packages/aether-core-bootstrap \ + build/packages/modello-plugins \ + build/packages/plexus-component-annotations build/packages/maven-artifact-bootstrap: \ build/packages/plexus-utils build/packages/maven-plugin-api-bootstrap: \ @@ -93,11 +94,22 @@ build/packages/plexus-container-default: \ build/packages/xbean-reflect-bootstrap \ /usr/share/java/junit.jar +build/packages/aether-core-bootstrap: \ + $(dep-jsr330) \ + build/packages/httpcomponents-core \ + build/packages/httpcomponents-client-bootstrap build/packages/guava: \ $(dep-jsr305) build/packages/qdox: \ build/packages/jflex +build/packages/httpcomponents-core: \ + build/packages/commons-cli +build/packages/httpcomponents-client-bootstrap: \ + build/packages/commons-codec \ + build/packages/httpcomponents-core \ + /usr/share/java/commons-logging/commons-logging.jar + build/packages/jdom1: \ build/packages/jaxen-bootstrap \ $(dep-xerces2) diff --git a/conf/sources.mk b/conf/sources.mk index 35456dc..6ef3f2f 100644 --- a/conf/sources.mk +++ b/conf/sources.mk @@ -24,9 +24,14 @@ plexus-component-metadata-bootstrap = git|git://github.com/sonatype/ple plexus-container-default = git|git://github.com/sonatype/plexus-containers.git|plexus-containers-1.5.5/plexus-container-default +aether-core-bootstrap = git|git://git.eclipse.org/gitroot/aether/aether-core.git|aether-1.0.0.v20140518 guava = git|https://code.google.com/p/guava-libraries/|v17.0/guava qdox = tar|http://nexus.codehaus.org/content/repositories/releases/com/thoughtworks/qdox/qdox/2.0-M1/qdox-2.0-M1-project.tar.bz2 commons-cli = tar|$(_apache_mirror)/commons/cli/source/commons-cli-1.2-src.tar.gz +commons-codec = tar|$(_apache_mirror)/commons/codec/source/commons-codec-1.9-src.tar.gz + +httpcomponents-core = tar|$(_apache_mirror)/httpcomponents/httpcore/source/httpcomponents-core-4.3.2-src.tar.gz +httpcomponents-client-bootstrap = tar|$(_apache_mirror)/httpcomponents/httpclient/source/httpcomponents-client-4.3.4-src.tar.gz # Is missing support for jom4j and xom jaxen-bootstrap = tar|http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz diff --git a/rules/aether-core-bootstrap/subdir-deps.mk b/rules/aether-core-bootstrap/subdir-deps.mk new file mode 100644 index 0000000..2a3c957 --- /dev/null +++ b/rules/aether-core-bootstrap/subdir-deps.mk @@ -0,0 +1,12 @@ +aether-impl_deps = aether-api aether-spi aether-util +aether-spi_deps = aether-api +aether-test-util_deps = aether-api aether-spi +aether-util_deps = aether-api + +aether-connector-basic_deps = aether-api aether-spi aether-util +aether-transport-classpath_deps = aether-api aether-spi aether-util +aether-transport-file_deps = aether-api aether-spi +aether-transport-http_deps = aether-api aether-spi aether-util + +subdirs := $(filter-out aether-impl,$(subdirs)) # depends on slf4j and sisu-inject +subdirs := $(filter-out aether-transport-wagon,$(subdirs)) # depends on wagon, others diff --git a/rules/httpcomponents-client-bootstrap/delete.list b/rules/httpcomponents-client-bootstrap/delete.list new file mode 100644 index 0000000..3f4a6fb --- /dev/null +++ b/rules/httpcomponents-client-bootstrap/delete.list @@ -0,0 +1,2 @@ +httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ehcache +httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached diff --git a/rules/httpcomponents-client-bootstrap/subdir-deps.mk b/rules/httpcomponents-client-bootstrap/subdir-deps.mk new file mode 100644 index 0000000..a6d3999 --- /dev/null +++ b/rules/httpcomponents-client-bootstrap/subdir-deps.mk @@ -0,0 +1,9 @@ +fluent-hc_deps = httpclient +httpclient-cache_deps = httpclient +httpclient-osgi_deps = httpclient +httpclient-win_deps = httpclient + +subdirs := $(filter-out httpclient-osgi,$(subdirs)) # depends on an OSGi framework implementation +subdirs := $(filter-out httpclient-win,$(subdirs)) # depends on native Windows JNI crud + +sourceDirectory += src/main/java-deprecated diff --git a/rules/httpcomponents-core/subdir-deps.mk b/rules/httpcomponents-core/subdir-deps.mk new file mode 100644 index 0000000..d0da4d9 --- /dev/null +++ b/rules/httpcomponents-core/subdir-deps.mk @@ -0,0 +1,4 @@ +httpcore-ab_deps = httpcore +httpcore-nio_deps = httpcore + +sourceDirectory += src/main/java-deprecated |