From b36352b641c3a477e950636a76e1aa10570174f1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Jul 2014 17:40:30 -0400 Subject: de-bootstrap aether-core --- conf/dependencies.mk | 13 ++++++++++--- conf/sources.mk | 2 +- rules/aether-core-bootstrap/subdir-deps.mk | 12 ------------ rules/aether-core/subdir-deps.mk | 10 ++++++++++ 4 files changed, 21 insertions(+), 16 deletions(-) delete mode 100644 rules/aether-core-bootstrap/subdir-deps.mk create mode 100644 rules/aether-core/subdir-deps.mk diff --git a/conf/dependencies.mk b/conf/dependencies.mk index c2c7e37..b253bfc 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -162,10 +162,17 @@ build/packages/asm5: build/packages/ow-util-ant-tasks build/packages/bnd # Misc -build/packages/aether-core-bootstrap: \ - $(dep-jsr330) \ +build/packages/aether-core: \ + build/packages/guice-bootstrap \ + build/packages/httpcomponents-client-bootstrap \ build/packages/httpcomponents-core \ - build/packages/httpcomponents-client-bootstrap + build/packages/plexus-classworlds \ + build/packages/plexus-component-annotations \ + build/packages/plexus-container-default \ + build/packages/plexus-utils \ + build/packages/sisu-inject-bootstrap \ + build/packages/slf4j-api \ + build/packages/wagon build/packages/bnd: \ $(dep-junit) \ build/packages/osgi50-core \ diff --git a/conf/sources.mk b/conf/sources.mk index 2941b4d..a6aba99 100644 --- a/conf/sources.mk +++ b/conf/sources.mk @@ -97,7 +97,7 @@ eclipselink-persistence21 = tar|https://git.eclipse.org/c/ecl sisu-inject-bootstrap = tar|https://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/snapshot/releases/0.2.1.tar.gz|0.2.1 # Misc Git -aether-core-bootstrap = git|git://git.eclipse.org/gitroot/aether/aether-core.git|aether-1.0.0.v20140518 +aether-core = git|git://git.eclipse.org/gitroot/aether/aether-core.git|aether-1.0.0.v20140518 bouncycastle-java = git|http://git.bouncycastle.org/repositories/bc-java|r1rv50 # SSL is broken guava = git|https://code.google.com/p/guava-libraries/|v17.0/guava jsoup = git|git://github.com/jhy/jsoup.git|jsoup-1.7.3 diff --git a/rules/aether-core-bootstrap/subdir-deps.mk b/rules/aether-core-bootstrap/subdir-deps.mk deleted file mode 100644 index 2a3c957..0000000 --- a/rules/aether-core-bootstrap/subdir-deps.mk +++ /dev/null @@ -1,12 +0,0 @@ -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/aether-core/subdir-deps.mk b/rules/aether-core/subdir-deps.mk new file mode 100644 index 0000000..dc7d2fe --- /dev/null +++ b/rules/aether-core/subdir-deps.mk @@ -0,0 +1,10 @@ +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 +aether-transport-wagon_deps = aether-api aether-spi aether-util -- cgit v1.2.3