build: use zest extension for shorter dependency notation
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/abf92808 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/abf92808 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/abf92808 Branch: refs/heads/develop Commit: abf92808f601cc8da622a3feb6e0d7b9ea94110d Parents: 1775448 Author: Paul Merlin <[email protected]> Authored: Fri Nov 11 19:05:36 2016 +0100 Committer: Paul Merlin <[email protected]> Committed: Fri Nov 11 19:05:36 2016 +0100 ---------------------------------------------------------------------- core/api/build.gradle | 14 ++-- core/bootstrap/build.gradle | 8 +- core/io/build.gradle | 8 +- core/runtime/build.gradle | 7 +- core/spi/build.gradle | 14 ++-- core/testsupport/build.gradle | 8 +- extensions/cache-ehcache/build.gradle | 16 ++-- extensions/cache-memcache/build.gradle | 14 ++-- extensions/entitystore-file/build.gradle | 19 +++-- extensions/entitystore-geode/build.gradle | 19 ++--- extensions/entitystore-hazelcast/build.gradle | 19 ++--- extensions/entitystore-jclouds/build.gradle | 14 ++-- extensions/entitystore-jdbm/build.gradle | 17 ++--- extensions/entitystore-leveldb/build.gradle | 24 +++--- extensions/entitystore-memory/build.gradle | 13 ++-- extensions/entitystore-mongodb/build.gradle | 17 ++--- extensions/entitystore-preferences/build.gradle | 12 +-- extensions/entitystore-redis/build.gradle | 17 ++--- extensions/entitystore-riak/build.gradle | 17 ++--- extensions/entitystore-sql/build.gradle | 21 +++--- extensions/indexing-elasticsearch/build.gradle | 12 ++- extensions/indexing-rdf/build.gradle | 22 +++--- extensions/indexing-solr/build.gradle | 20 ++--- extensions/indexing-sql/build.gradle | 21 +++--- extensions/metrics-codahale/build.gradle | 15 ++-- extensions/migration/build.gradle | 9 ++- extensions/reindexer/build.gradle | 17 +++-- .../valueserialization-jackson/build.gradle | 11 ++- .../valueserialization-orgjson/build.gradle | 9 +-- extensions/valueserialization-stax/build.gradle | 11 ++- libraries/alarm/build.gradle | 11 +-- libraries/circuitbreaker/build.gradle | 20 ++--- libraries/constraints/build.gradle | 9 ++- libraries/fileconfig/build.gradle | 14 ++-- libraries/http/build.gradle | 78 ++++++++++---------- libraries/invocation-cache/build.gradle | 13 ++-- libraries/jmx/build.gradle | 17 +++-- libraries/lang-groovy/build.gradle | 13 ++-- libraries/lang-javascript/build.gradle | 15 ++-- libraries/locking/build.gradle | 11 +-- libraries/logging/build.gradle | 13 ++-- libraries/metrics/build.gradle | 13 ++-- libraries/osgi/build.gradle | 17 +++-- libraries/rdf/build.gradle | 27 +++---- libraries/rest-client/build.gradle | 18 ++--- libraries/rest-common/build.gradle | 4 +- libraries/rest-server/build.gradle | 20 ++--- libraries/rest/build.gradle | 25 +++---- libraries/restlet/build.gradle | 22 +++--- libraries/scripting/build.gradle | 16 ++-- libraries/servlet/build.gradle | 17 +++-- libraries/shiro-core/build.gradle | 18 ++--- libraries/shiro-web/build.gradle | 20 ++--- libraries/spring/build.gradle | 15 ++-- libraries/sql-bonecp/build.gradle | 6 +- libraries/sql-dbcp/build.gradle | 6 +- libraries/sql-liquibase/build.gradle | 17 +++-- libraries/sql/build.gradle | 32 ++++---- libraries/uid/build.gradle | 11 +-- libraries/uowfile/build.gradle | 13 ++-- manual/build.gradle | 19 +++-- samples/dci/build.gradle | 14 ++-- samples/forum/build.gradle | 29 ++++---- samples/rental/build.gradle | 10 +-- samples/sql-support/build.gradle | 23 +++--- samples/swing/build.gradle | 4 +- tests/performance/build.gradle | 54 +++++++------- tests/regression/build.gradle | 25 +++---- tools/envisage/build.gradle | 27 ++++--- tools/model-detail/build.gradle | 11 +-- tools/qidea/build.gradle | 9 ++- tutorials/cargo/build.gradle | 14 ++-- tutorials/composites/build.gradle | 14 ++-- tutorials/hello/build.gradle | 13 ++-- tutorials/introduction/build.gradle | 11 +-- tutorials/introduction/tenminutes/build.gradle | 13 ++-- .../introduction/thirtyminutes/build.gradle | 15 ++-- tutorials/introduction/twominutes/build.gradle | 10 +-- tutorials/services/build.gradle | 11 +-- 79 files changed, 635 insertions(+), 667 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/core/api/build.gradle ---------------------------------------------------------------------- diff --git a/core/api/build.gradle b/core/api/build.gradle index f9e42b8..8b717cd 100644 --- a/core/api/build.gradle +++ b/core/api/build.gradle @@ -18,16 +18,14 @@ * */ -jar { manifest { name = "Apache Zest⢠Core API"}} +jar { manifest { name = "Apache Zest⢠Core API" } } dependencies { + compile zest.core.io - compile project( ':org.apache.zest.core:org.apache.zest.core.io' ) - - testCompile project( ':org.apache.zest.core:org.apache.zest.core.testsupport' ) - testCompile project( ':org.apache.zest.libraries:org.apache.zest.library.constraints' ) - testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' ) - - testRuntime project( ':org.apache.zest.core:org.apache.zest.core.runtime' ) + testCompile zest.core.testsupport + testCompile zest.library( 'constraints' ) + testCompile zest.extension( 'valueserialization-orgjson' ) + testRuntime zest.core.runtime } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/core/bootstrap/build.gradle ---------------------------------------------------------------------- diff --git a/core/bootstrap/build.gradle b/core/bootstrap/build.gradle index 891a39f..3ce7f08 100644 --- a/core/bootstrap/build.gradle +++ b/core/bootstrap/build.gradle @@ -18,12 +18,10 @@ * */ -jar { manifest { name = "Apache Zest⢠Core Bootstrap"}} +jar { manifest { name = "Apache Zest⢠Core Bootstrap" } } dependencies { + compile zest.core.spi - compile project( ':org.apache.zest.core:org.apache.zest.core.spi' ) - - testRuntime project( ':org.apache.zest.core:org.apache.zest.core.runtime' ) - + testRuntime zest.core.runtime } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/core/io/build.gradle ---------------------------------------------------------------------- diff --git a/core/io/build.gradle b/core/io/build.gradle index 46fa120..0e0c50a 100644 --- a/core/io/build.gradle +++ b/core/io/build.gradle @@ -18,12 +18,10 @@ * */ -jar { manifest { name = "Apache Zest⢠I/O"}} +jar { manifest { name = "Apache Zest⢠I/O" } } dependencies { + compile zest.core.functional - compile project( ':org.apache.zest.core:org.apache.zest.core.functional' ) - - testCompile project( ':org.apache.zest.core:org.apache.zest.core.testsupport' ) - + testCompile zest.core.testsupport } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/core/runtime/build.gradle ---------------------------------------------------------------------- diff --git a/core/runtime/build.gradle b/core/runtime/build.gradle index e25008e..3b37d9f 100644 --- a/core/runtime/build.gradle +++ b/core/runtime/build.gradle @@ -21,15 +21,14 @@ jar { manifest { name = "Apache Zest⢠Core Runtime" } } dependencies { - compileOnly libraries.osgi_core - compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) + compile zest.core.bootstrap compile libraries.asm compile libraries.asm_util compile libraries.asm_commons - testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - testCompile project( ":org.apache.zest.libraries:org.apache.zest.library.constraints" ) + testCompile zest.core.testsupport + testCompile zest.library( 'constraints' ) testCompile libraries.hamcrest } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/core/spi/build.gradle ---------------------------------------------------------------------- diff --git a/core/spi/build.gradle b/core/spi/build.gradle index 0c94b3c..3b72e9e 100644 --- a/core/spi/build.gradle +++ b/core/spi/build.gradle @@ -18,16 +18,14 @@ * */ -jar { manifest { name = "Apache Zest⢠Core SPI"}} +jar { manifest { name = "Apache Zest⢠Core SPI" } } dependencies { + compile zest.core.api + compile libraries.org_json - compile project( ':org.apache.zest.core:org.apache.zest.core.api' ) - compile libraries.org_json - - testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") - - testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime") - testRuntime libraries.logback + testCompile zest.core.testsupport + testRuntime zest.core.runtime + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/core/testsupport/build.gradle ---------------------------------------------------------------------- diff --git a/core/testsupport/build.gradle b/core/testsupport/build.gradle index c5564c7..eb5602c 100644 --- a/core/testsupport/build.gradle +++ b/core/testsupport/build.gradle @@ -18,13 +18,11 @@ * */ -jar { manifest { name = "Apache Zest⢠Core TestSupport"}} +jar { manifest { name = "Apache Zest⢠Core TestSupport" } } dependencies { - - compile project( ':org.apache.zest.core:org.apache.zest.core.bootstrap' ) + compile zest.core.bootstrap compile libraries.junit - testRuntime project( ':org.apache.zest.core:org.apache.zest.core.runtime' ) - + testRuntime zest.core.runtime } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/cache-ehcache/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/cache-ehcache/build.gradle b/extensions/cache-ehcache/build.gradle index b56383a..ead23ee 100644 --- a/extensions/cache-ehcache/build.gradle +++ b/extensions/cache-ehcache/build.gradle @@ -20,17 +20,17 @@ description = "Apache Zest⢠Ehcache Cache Extension" -jar { manifest { name = "Apache Zest⢠Extension: EhCache"}} +jar { manifest { name = "Apache Zest⢠Extension: EhCache" } } dependencies { + compile zest.core.bootstrap + compile zest.library( 'constraints' ) + compile libraries.ehcache - compile(project(':org.apache.zest.core:org.apache.zest.core.spi')) - compile(project(':org.apache.zest.core:org.apache.zest.core.bootstrap')) - compile( project( ":org.apache.zest.libraries:org.apache.zest.library.constraints" ) ) - compile(libraries.ehcache) + runtime zest.core.runtime - testCompile( project(':org.apache.zest.core:org.apache.zest.core.testsupport') ) + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) - testRuntime( project(':org.apache.zest.core:org.apache.zest.core.runtime')) - testRuntime(libraries.logback) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/cache-memcache/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/cache-memcache/build.gradle b/extensions/cache-memcache/build.gradle index 424421f..2dbc263 100644 --- a/extensions/cache-memcache/build.gradle +++ b/extensions/cache-memcache/build.gradle @@ -20,16 +20,16 @@ description = "Apache Zest⢠Memcache Cache Extension" -jar { manifest { name = "Apache Zest⢠Extension - Cache - Memcache"}} +jar { manifest { name = "Apache Zest⢠Extension - Cache - Memcache" } } dependencies { + compile zest.core.bootstrap + compile libraries.spymemcached - compile project( ':org.apache.zest.core:org.apache.zest.core.bootstrap' ) - compile libraries.spymemcached + runtime zest.core.runtime - testCompile project( ':org.apache.zest.core:org.apache.zest.core.testsupport' ) - - testRuntime project( ':org.apache.zest.core:org.apache.zest.core.runtime' ) - testRuntime libraries.logback + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-file/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-file/build.gradle b/extensions/entitystore-file/build.gradle index 811616e..3a85e75 100644 --- a/extensions/entitystore-file/build.gradle +++ b/extensions/entitystore-file/build.gradle @@ -18,19 +18,18 @@ * */ -jar { manifest { name = "Apache Zest⢠Extension - EntityStore - File system" }} +jar { manifest { name = "Apache Zest⢠Extension - EntityStore - File system" } } dependencies { + compile zest.core.bootstrap + compile zest.library( 'locking' ) + compile zest.library( 'constraints' ) + compile zest.library( 'fileconfig' ) - compile(project(":org.apache.zest.core:org.apache.zest.core.spi")) - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.constraints")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.locking")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.fileconfig")) + runtime zest.core.runtime - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson")) + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-geode/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-geode/build.gradle b/extensions/entitystore-geode/build.gradle index 1b17e6c..5698186 100644 --- a/extensions/entitystore-geode/build.gradle +++ b/extensions/entitystore-geode/build.gradle @@ -20,20 +20,17 @@ description = "Apache Zest⢠Geode EntityStore Extension" -jar { manifest { name = "Apache Zest⢠Extension - EntityStore - Geode" }} +jar { manifest { name = "Apache Zest⢠Extension - EntityStore - Geode" } } dependencies { + compile zest.core.bootstrap + compile zest.library( 'locking' ) + compile libraries.geode - compile(project(":org.apache.zest.core:org.apache.zest.core.api")) - compile(project(":org.apache.zest.core:org.apache.zest.core.spi")) - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.locking")) - compile(libraries.geode) + runtime zest.core.runtime - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson")) - - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-hazelcast/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-hazelcast/build.gradle b/extensions/entitystore-hazelcast/build.gradle index 83f0ac6..cdae19f 100644 --- a/extensions/entitystore-hazelcast/build.gradle +++ b/extensions/entitystore-hazelcast/build.gradle @@ -20,20 +20,17 @@ description = "Apache Zest⢠Hazelcast EntityStore Extension" -jar { manifest { name = "Apache Zest⢠Extension - EntityStore - Hazelcast" }} +jar { manifest { name = "Apache Zest⢠Extension - EntityStore - Hazelcast" } } dependencies { + compile zest.core.bootstrap + compile zest.library( 'locking' ) + compile libraries.hazelcast - compile(project(":org.apache.zest.core:org.apache.zest.core.api")) - compile(project(":org.apache.zest.core:org.apache.zest.core.spi")) - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.locking")) - compile(libraries.hazelcast) + runtime zest.core.runtime - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson")) - - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-jclouds/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-jclouds/build.gradle b/extensions/entitystore-jclouds/build.gradle index 72fd53b..8b1959c 100644 --- a/extensions/entitystore-jclouds/build.gradle +++ b/extensions/entitystore-jclouds/build.gradle @@ -23,18 +23,18 @@ description = "Apache Zest⢠JClouds EntityStore Extension" jar { manifest { name = "Apache Zest⢠Extension - EntityStore - JClouds" } } dependencies { - - compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) - compile project( ":org.apache.zest.libraries:org.apache.zest.library.locking" ) - compile libraries.slf4j_api + compile zest.core.bootstrap + compile zest.library( 'locking' ) + compile zest.library( 'fileconfig' ) compile libraries.jclouds_core compile libraries.jclouds_blobstore - testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - testCompile( project( ":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson" ) ) + runtime zest.core.runtime + + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) testCompile libraries.jclouds_filesystem - testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-jdbm/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-jdbm/build.gradle b/extensions/entitystore-jdbm/build.gradle index 4bdec59..91f7d86 100644 --- a/extensions/entitystore-jdbm/build.gradle +++ b/extensions/entitystore-jdbm/build.gradle @@ -20,19 +20,18 @@ description = "Apache Zest⢠JDBM EntityStore Extension" -jar { manifest {name = "Apache Zest⢠Extension - EntityStore - JDBM" }} +jar { manifest { name = "Apache Zest⢠Extension - EntityStore - JDBM" } } dependencies { - - compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) - compile project( ":org.apache.zest.libraries:org.apache.zest.library.locking" ) - compile project( ":org.apache.zest.libraries:org.apache.zest.library.fileconfig" ) + compile zest.core.bootstrap + compile zest.library( 'locking' ) + compile zest.library( 'fileconfig' ) compile libraries.jdbm - testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson")) + runtime zest.core.runtime - testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) - testRuntime libraries.logback + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-leveldb/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-leveldb/build.gradle b/extensions/entitystore-leveldb/build.gradle index f38a7fc..0c40494 100644 --- a/extensions/entitystore-leveldb/build.gradle +++ b/extensions/entitystore-leveldb/build.gradle @@ -20,22 +20,20 @@ description = "Apache Zest⢠LevelDB EntityStore Extension" -jar { manifest { name = "Apache Zest⢠Extension - EntityStore - LevelDB" }} +jar { manifest { name = "Apache Zest⢠Extension - EntityStore - LevelDB" } } dependencies { + compile zest.core.bootstrap + compile zest.library( 'locking' ) + compile zest.library( 'fileconfig' ) + compile libraries.leveldb_api - compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) - compile project( ":org.apache.zest.libraries:org.apache.zest.library.locking" ) - compile project( ":org.apache.zest.libraries:org.apache.zest.library.fileconfig" ) - compile libraries.leveldb_api + runtime zest.core.runtime + runtime libraries.leveldb_java + runtime libraries.leveldb_jni_all - runtime libraries.leveldb_java - runtime libraries.leveldb_jni_all - - testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson")) - - testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) - testRuntime libraries.logback + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-memory/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-memory/build.gradle b/extensions/entitystore-memory/build.gradle index e6c6d74..2491be5 100644 --- a/extensions/entitystore-memory/build.gradle +++ b/extensions/entitystore-memory/build.gradle @@ -18,16 +18,15 @@ * */ -jar { manifest { name = "Apache Zest⢠Extension - EntityStore - Memory" }} +jar { manifest { name = "Apache Zest⢠Extension - EntityStore - Memory" } } dependencies { + compile zest.core.bootstrap - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) + runtime zest.core.runtime - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson")) - - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-mongodb/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-mongodb/build.gradle b/extensions/entitystore-mongodb/build.gradle index d368030..d7ae1ec 100644 --- a/extensions/entitystore-mongodb/build.gradle +++ b/extensions/entitystore-mongodb/build.gradle @@ -20,18 +20,17 @@ description = "Apache Zest⢠MongoDB EntityStore Extension" -jar { manifest { name = "Apache Zest⢠Extension - EntityStore - MongoDB" }} +jar { manifest { name = "Apache Zest⢠Extension - EntityStore - MongoDB" } } dependencies { + compile zest.core.bootstrap + compile zest.library( 'locking' ) + compile libraries.mongodb - compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) - compile project( ":org.apache.zest.libraries:org.apache.zest.library.locking" ) - compile libraries.mongodb + runtime zest.core.runtime - testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson")) - - testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) - testRuntime libraries.logback + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-preferences/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-preferences/build.gradle b/extensions/entitystore-preferences/build.gradle index 08276fb..6820f2d 100644 --- a/extensions/entitystore-preferences/build.gradle +++ b/extensions/entitystore-preferences/build.gradle @@ -23,14 +23,14 @@ description = "Apache Zest⢠Preferences EntityStore Extension" jar { manifest { name = "Apache Zest⢠Extension - EntityStore - Preferences" } } dependencies { - - compile( project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) ) + compile zest.core.bootstrap compile libraries.slf4j_api - testCompile( project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) ) - testCompile( project( ":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson" ) ) + runtime zest.core.runtime + + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) - testRuntime( project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) ) - testRuntime( libraries.logback ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-redis/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-redis/build.gradle b/extensions/entitystore-redis/build.gradle index 9fae6d6..7334bf6 100644 --- a/extensions/entitystore-redis/build.gradle +++ b/extensions/entitystore-redis/build.gradle @@ -20,19 +20,18 @@ description = "Apache Zest⢠Redis EntityStore Extension" -jar { manifest { name = "Apache Zest⢠Extension - EntityStore - Redis" }} +jar { manifest { name = "Apache Zest⢠Extension - EntityStore - Redis" } } dependencies { - - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.locking")) - compile(libraries.jedis) + compile zest.core.bootstrap + compile zest.library( 'locking' ) + compile libraries.jedis - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-riak/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-riak/build.gradle b/extensions/entitystore-riak/build.gradle index 54304f0..d859aba 100644 --- a/extensions/entitystore-riak/build.gradle +++ b/extensions/entitystore-riak/build.gradle @@ -23,17 +23,16 @@ description = "Apache Zest⢠Riak EntityStore Extension" jar { manifest { name = "Apache Zest⢠Extension - EntityStore - Riak" } } dependencies { + compile zest.core.bootstrap + compile zest.library( 'locking' ) + compile zest.library( 'constraints' ) + compile libraries.riak - compile( project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) ) - compile( project( ":org.apache.zest.libraries:org.apache.zest.library.locking" ) ) - compile( project( ":org.apache.zest.libraries:org.apache.zest.library.constraints" ) ) - compile libraries.slf4j_api - compile( libraries.riak ) + runtime zest.core.runtime - testCompile( project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) ) - testCompile( project( ":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson" ) ) + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) - testRuntime( project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) ) - testRuntime( libraries.logback ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/entitystore-sql/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/entitystore-sql/build.gradle b/extensions/entitystore-sql/build.gradle index f0d723c..0f0151d 100644 --- a/extensions/entitystore-sql/build.gradle +++ b/extensions/entitystore-sql/build.gradle @@ -20,27 +20,26 @@ description = "Apache Zest⢠SQL EntityStore Extension" -jar { manifest { name = "Apache Zest⢠Extension - EntityStore - SQL" }} +jar { manifest { name = "Apache Zest⢠Extension - EntityStore - SQL" } } dependencies { - - compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") - compile project(":org.apache.zest.libraries:org.apache.zest.library.sql") + compile zest.core.bootstrap + compile zest.library( 'sql' ) compile libraries.javaSqlGenerator - compile( libraries.javaSqlGeneratorImpl ) { - exclude group: 'junit' + compile( libraries.javaSqlGeneratorImpl ) { + exclude group: 'junit' } - testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") - testCompile project(":org.apache.zest.libraries:org.apache.zest.library.sql-dbcp") - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson")) + runtime zest.core.runtime + + testCompile zest.core.testsupport + testCompile zest.library( 'sql-dbcp' ) + testCompile zest.extension( 'valueserialization-orgjson' ) testCompile libraries.derby // Needed at compile time for polite test shutdown - testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime") testRuntime libraries.logback testRuntime libraries.h2 testRuntime libraries.mysql_connector testRuntime libraries.postgres testRuntime libraries.sqlite - } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/indexing-elasticsearch/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/indexing-elasticsearch/build.gradle b/extensions/indexing-elasticsearch/build.gradle index 735aa0e..7f36eb0 100644 --- a/extensions/indexing-elasticsearch/build.gradle +++ b/extensions/indexing-elasticsearch/build.gradle @@ -23,16 +23,14 @@ description = "Apache Zest⢠ElasticSearch Index/Query Extension" jar { manifest { name = "Apache Zest⢠Extension - Index/Query - ElasticSearch" } } dependencies { - - compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") - compile project(":org.apache.zest.libraries:org.apache.zest.library.fileconfig") - compile libraries.slf4j_api + compile zest.core.bootstrap + compile zest.library( 'fileconfig' ) compile libraries.elasticsearch - testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") + runtime zest.core.runtime - testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime") - testRuntime libraries.logback + testCompile zest.core.testsupport + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/indexing-rdf/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/indexing-rdf/build.gradle b/extensions/indexing-rdf/build.gradle index e377796..3a733a0 100644 --- a/extensions/indexing-rdf/build.gradle +++ b/extensions/indexing-rdf/build.gradle @@ -23,19 +23,17 @@ description = "Apache Zest⢠RDF Index/Query Extension" jar { manifest { name = "Apache Zest⢠Extension - Index/Query - RDF" } } dependencies { + compile zest.core.bootstrap + compile zest.library( 'rdf' ) + compile libraries.sesame + compile libraries.commons_lang - compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) - compile project( ":org.apache.zest.libraries:org.apache.zest.library.rdf" ) - compile libraries.sesame - compile libraries.commons_lang - compile libraries.slf4j_api + runtime zest.core.runtime - testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' ) - testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.entitystore-preferences' ) - testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.entitystore-jdbm' ) - testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - - testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) - testRuntime libraries.logback + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) + testCompile zest.extension( 'entitystore-preferences' ) + testCompile zest.extension( 'entitystore-jdbm' ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/indexing-solr/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/indexing-solr/build.gradle b/extensions/indexing-solr/build.gradle index 9509463..c011fa6 100644 --- a/extensions/indexing-solr/build.gradle +++ b/extensions/indexing-solr/build.gradle @@ -20,18 +20,18 @@ description = "Apache Zest⢠Solr Indexing Extension" -jar { manifest {name = "Apache Zest⢠Extension - Indexing - Solr" }} +jar { manifest { name = "Apache Zest⢠Extension - Indexing - Solr" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.fileconfig")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.rdf")) - compile(libraries.solr) - compile libraries.slf4j_api + compile zest.core.bootstrap + compile zest.library( 'fileconfig' ) + compile zest.library( 'rdf' ) + compile libraries.solr - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.servlet_api) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.servlet_api + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/indexing-sql/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/indexing-sql/build.gradle b/extensions/indexing-sql/build.gradle index ac651c3..ba61bdf 100644 --- a/extensions/indexing-sql/build.gradle +++ b/extensions/indexing-sql/build.gradle @@ -20,27 +20,26 @@ description = "Apache Zest⢠SQL Indexing Extension" -jar {manifest {name = "Apache Zest⢠Extension - Indexing - SQL"}} +jar { manifest { name = "Apache Zest⢠Extension - Indexing - SQL" } } dependencies { - - compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") - compile project(":org.apache.zest.libraries:org.apache.zest.library.sql") - compile project(':org.apache.zest.extensions:org.apache.zest.extension.reindexer') + compile zest.core.bootstrap + compile zest.library( 'sql' ) + compile zest.extension( 'reindexer' ) compile libraries.javaSqlGenerator - compile( libraries.javaSqlGeneratorImpl ) { - exclude group: 'junit' + compile( libraries.javaSqlGeneratorImpl ) { + exclude group: 'junit' } - testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") - testCompile project(":org.apache.zest.libraries:org.apache.zest.library.sql-dbcp") + runtime zest.core.runtime + + testCompile zest.core.testsupport + testCompile zest.library( 'sql-dbcp' ) - testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime") testRuntime libraries.logback testRuntime libraries.derby testRuntime libraries.h2 testRuntime libraries.mysql_connector testRuntime libraries.postgres testRuntime libraries.sqlite - } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/metrics-codahale/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/metrics-codahale/build.gradle b/extensions/metrics-codahale/build.gradle index c43f760..2adddcc 100644 --- a/extensions/metrics-codahale/build.gradle +++ b/extensions/metrics-codahale/build.gradle @@ -20,18 +20,17 @@ description = "Apache Zest⢠Codahale Metrics Extension" -jar { manifest { name = "Apache Zest⢠Extension - Metrics - Codahale" }} +jar { manifest { name = "Apache Zest⢠Extension - Metrics - Codahale" } } dependencies { - - compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") + compile zest.core.bootstrap compile libraries.codahale_metrics - testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") - testCompile project(":org.apache.zest.libraries:org.apache.zest.library.jmx") - testCompile project(":org.apache.zest.libraries:org.apache.zest.library.metrics") + runtime zest.core.runtime - testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) - testRuntime libraries.logback + testCompile zest.core.testsupport + testCompile zest.library( 'jmx' ) + testCompile zest.library( 'metrics' ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/migration/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/migration/build.gradle b/extensions/migration/build.gradle index 8a958d4..729de91 100644 --- a/extensions/migration/build.gradle +++ b/extensions/migration/build.gradle @@ -23,11 +23,12 @@ description = "Apache Zest⢠Migration Extension" jar { manifest { name = "Apache Zest⢠Extension - Migration" }} dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.spi")) + compile zest.core.spi compile libraries.slf4j_api - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/reindexer/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/reindexer/build.gradle b/extensions/reindexer/build.gradle index 05fdc91..e276e9a 100644 --- a/extensions/reindexer/build.gradle +++ b/extensions/reindexer/build.gradle @@ -18,16 +18,17 @@ * */ -jar { manifest { description = "Apache Zest⢠Reindexer Extension" }} +jar { manifest { description = "Apache Zest⢠Reindexer Extension" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.spi")) - compile(libraries.slf4j_api) + compile zest.core.spi + compile libraries.slf4j_api - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(project(':org.apache.zest.extensions:org.apache.zest.extension.entitystore-jdbm')) - testCompile(project(':org.apache.zest.extensions:org.apache.zest.extension.indexing-rdf')) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + testCompile zest.extension( 'entitystore-jdbm' ) + testCompile zest.extension( 'indexing-rdf' ) + + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/valueserialization-jackson/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/valueserialization-jackson/build.gradle b/extensions/valueserialization-jackson/build.gradle index ae1a037..58125ae 100644 --- a/extensions/valueserialization-jackson/build.gradle +++ b/extensions/valueserialization-jackson/build.gradle @@ -23,14 +23,13 @@ description = "Apache Zest⢠Jackson ValueSerialization Extension" jar { manifest { name = "Apache Zest⢠Extension - ValueSerialization - Jackson" } } dependencies { + compile zest.core.bootstrap + compile libraries.jackson_mapper - compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") - compile libraries.jackson_mapper + runtime zest.core.runtime - testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") - - testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime") - testRuntime libraries.slf4j_simple + testCompile zest.core.testsupport + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/valueserialization-orgjson/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/valueserialization-orgjson/build.gradle b/extensions/valueserialization-orgjson/build.gradle index cb25587..a879d30 100644 --- a/extensions/valueserialization-orgjson/build.gradle +++ b/extensions/valueserialization-orgjson/build.gradle @@ -23,13 +23,12 @@ description = "Apache Zest⢠org.json ValueSerialization Extension" jar { manifest { name = "Apache Zest⢠Extension - ValueSerialization - org.json" } } dependencies { + compile zest.core.bootstrap - compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") + runtime zest.core.runtime - testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") - - testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime") - testRuntime libraries.slf4j_simple + testCompile zest.core.testsupport + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/extensions/valueserialization-stax/build.gradle ---------------------------------------------------------------------- diff --git a/extensions/valueserialization-stax/build.gradle b/extensions/valueserialization-stax/build.gradle index 8feac4c..5fa59e0 100644 --- a/extensions/valueserialization-stax/build.gradle +++ b/extensions/valueserialization-stax/build.gradle @@ -23,14 +23,13 @@ description = "Apache Zest⢠StaX ValueSerialization Extension" jar { manifest { name = "Apache Zest⢠Extension - ValueSerialization - StaX" } } dependencies { + compile zest.core.bootstrap + compile libraries.commons_lang - compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap") - compile libraries.commons_lang + runtime zest.core.runtime - testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport") - - testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime") - testRuntime libraries.slf4j_simple + testCompile zest.core.testsupport + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/alarm/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/alarm/build.gradle b/libraries/alarm/build.gradle index 8227f8c..db1efe4 100644 --- a/libraries/alarm/build.gradle +++ b/libraries/alarm/build.gradle @@ -20,13 +20,14 @@ description = "Apache Zest⢠Alarm Library provides industrial automation style alarm point workflow semantics." -jar { manifest { name = "Apache Zest⢠Library - Alarm - APi" }} +jar { manifest { name = "Apache Zest⢠Library - Alarm - APi" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) + compile zest.core.bootstrap - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/circuitbreaker/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/circuitbreaker/build.gradle b/libraries/circuitbreaker/build.gradle index 96f8fef..7c2242e 100644 --- a/libraries/circuitbreaker/build.gradle +++ b/libraries/circuitbreaker/build.gradle @@ -20,21 +20,21 @@ description = "Apache Zest⢠Circuit Breaker Library provides a framework for connecting external resources, so that they can be disabled during re-play of events." -jar { manifest {name = "Apache Zest⢠Library - Circuit Breaker"}} +jar { manifest { name = "Apache Zest⢠Library - Circuit Breaker" } } dependencies { - compile project( ':org.apache.zest.core:org.apache.zest.core.api' ) - compile project( ':org.apache.zest.libraries:org.apache.zest.library.jmx' ) - compile libraries.slf4j_api + compile zest.core.bootstrap + compile zest.library( 'jmx' ) - testCompile project( ':org.apache.zest.core:org.apache.zest.core.testsupport' ) - testCompile libraries.awaitility + runtime zest.core.runtime - testRuntime project( ':org.apache.zest.core:org.apache.zest.core.runtime' ) - testRuntime libraries.logback + testCompile zest.core.testsupport + testCompile libraries.awaitility + + testRuntime libraries.logback } task( runSample, dependsOn: 'testClasses', type: JavaExec ) { - main = 'org.apache.zest.library.circuitbreaker.jmx.CircuitBreakerManagementTest' - classpath = sourceSets.test.runtimeClasspath + main = 'org.apache.zest.library.circuitbreaker.jmx.CircuitBreakerManagementTest' + classpath = sourceSets.test.runtimeClasspath } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/constraints/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/constraints/build.gradle b/libraries/constraints/build.gradle index a419050..f7a8ffb 100644 --- a/libraries/constraints/build.gradle +++ b/libraries/constraints/build.gradle @@ -23,10 +23,11 @@ description = "Apache Zest⢠Constraint Library provides common set of constrai jar { manifest { name = "Apache Zest⢠Library - Constraints"}} dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) + compile zest.core.bootstrap - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/fileconfig/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/fileconfig/build.gradle b/libraries/fileconfig/build.gradle index 588ea56..fb233c3 100644 --- a/libraries/fileconfig/build.gradle +++ b/libraries/fileconfig/build.gradle @@ -17,17 +17,21 @@ * * */ +import org.apache.zest.gradle.test.TestSupportPlugin + +apply plugin: TestSupportPlugin description = "Apache Zest⢠File Configuration Library provides platform specific file locations." -jar { manifest { name = "Apache Zest⢠Library - FileConfig" }} +jar { manifest { name = "Apache Zest⢠Library - FileConfig" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) + compile zest.core.bootstrap compile libraries.slf4j_api - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime + + testCompile zest.core.testsupport - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/http/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/http/build.gradle b/libraries/http/build.gradle index c049c65..8e78c8a 100644 --- a/libraries/http/build.gradle +++ b/libraries/http/build.gradle @@ -20,52 +20,52 @@ description = "Apache Zest⢠Http Library provides embedded Jetty for Apache Zest⢠application use." -jar { manifest { name = "Apache Zest⢠Library - Http" }} +jar { manifest { name = "Apache Zest⢠Library - Http" } } dependencies { + compile zest.core.bootstrap + compile zest.library( 'jmx' ) + compile zest.library( 'constraints' ) + compile libraries.bouncy_castle + compile libraries.jetty_webapp + compile libraries.jetty_jmx - compile( project( ":org.apache.zest.core:org.apache.zest.core.api" ) ) - compile( project( ":org.apache.zest.libraries:org.apache.zest.library.constraints" ) ) - compile( project( ":org.apache.zest.libraries:org.apache.zest.library.jmx" ) ) - compile( libraries.bouncy_castle ) - compile( libraries.jetty_webapp ) - compile( libraries.jetty_jmx ) + runtime zest.core.runtime - testCompile( project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) ) - testCompile( libraries.http_client ) - - testRuntime( project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) ) - testRuntime( libraries.logback ) + testCompile zest.core.testsupport + testCompile libraries.http_client + testRuntime libraries.logback } // Do not run vhost tests on Java >= 9 because they use internal JDK apis -if(JavaVersion.current() < JavaVersion.VERSION_1_9) { - sourceSets { - vhostTest { - java { - compileClasspath += main.output + test.output - runtimeClasspath += main.output + test.output - srcDir file('src/vhost-test/java') - } - resources { - srcDir file('src/vhost-test/resources') - } - } - } - configurations { - vhostTestCompile.extendsFrom testCompile - vhostTestRuntime.extendsFrom testRuntime - } - dependencies { - vhostTestCompile( libraries.dnsjava ) - } - task vhostTest(type: Test) { - testClassesDir = sourceSets.vhostTest.output.classesDir - classpath = sourceSets.vhostTest.runtimeClasspath - systemProperties 'networkaddress.cache.ttl': '0' - systemProperties 'sun.net.spi.nameservice.provider.1': 'dns,LocalManagedDns' +if( JavaVersion.current() < JavaVersion.VERSION_1_9 ) +{ + sourceSets { + vhostTest { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file( 'src/vhost-test/java' ) + } + resources { + srcDir file( 'src/vhost-test/resources' ) + } } - check.dependsOn vhostTest - vhostTest.mustRunAfter test + } + configurations { + vhostTestCompile.extendsFrom testCompile + vhostTestRuntime.extendsFrom testRuntime + } + dependencies { + vhostTestCompile( libraries.dnsjava ) + } + task vhostTest( type: Test ) { + testClassesDir = sourceSets.vhostTest.output.classesDir + classpath = sourceSets.vhostTest.runtimeClasspath + systemProperties 'networkaddress.cache.ttl': '0' + systemProperties 'sun.net.spi.nameservice.provider.1': 'dns,LocalManagedDns' + } + check.dependsOn vhostTest + vhostTest.mustRunAfter test } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/invocation-cache/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/invocation-cache/build.gradle b/libraries/invocation-cache/build.gradle index fc89390..88ce64f 100644 --- a/libraries/invocation-cache/build.gradle +++ b/libraries/invocation-cache/build.gradle @@ -20,14 +20,15 @@ description = "Apache Zest⢠Invocation Cache Library provides caching framework for methods." -jar { manifest { name = "Apache Zest⢠Library - Invocation Cache" }} +jar { manifest { name = "Apache Zest⢠Library - Invocation Cache" } } dependencies { - compile( project(":org.apache.zest.core:org.apache.zest.core.api") ) - compile( project(':org.apache.zest.libraries:org.apache.zest.library.jmx' ) ) + compile zest.core.api + compile zest.library( 'jmx' ) - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/jmx/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/jmx/build.gradle b/libraries/jmx/build.gradle index 368bb2e..0131292 100644 --- a/libraries/jmx/build.gradle +++ b/libraries/jmx/build.gradle @@ -20,20 +20,21 @@ description = "Apache Zest⢠JMX Library provides Java Management Extension (JMX) integration for Apache Zest⢠applications." -jar { manifest { name = "Apache Zest⢠Library - JMX" }} +jar { manifest { name = "Apache Zest⢠Library - JMX" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) + compile zest.core.bootstrap compile libraries.slf4j_api - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.logback } -task(runSample, dependsOn: 'testClasses', type: JavaExec) { - main = 'org.apache.zest.library.jmx.JMXTest' - classpath = sourceSets.test.runtimeClasspath +task( runSample, dependsOn: 'testClasses', type: JavaExec ) { + main = 'org.apache.zest.library.jmx.JMXTest' + classpath = sourceSets.test.runtimeClasspath } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/lang-groovy/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/lang-groovy/build.gradle b/libraries/lang-groovy/build.gradle index 4513f10..0f23d4c 100644 --- a/libraries/lang-groovy/build.gradle +++ b/libraries/lang-groovy/build.gradle @@ -20,16 +20,17 @@ description = "Apache Zest⢠Groovy Library allows for Mixins to be implemented in Groovy scripts instead of directly in compiled Java." -jar { manifest { name = "Apache Zest⢠Library - Scripting - Groovy" }} +jar { manifest { name = "Apache Zest⢠Library - Scripting - Groovy" } } apply plugin: 'groovy' dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile(libraries.groovy) + compile zest.core.api + compile libraries.groovy - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/lang-javascript/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/lang-javascript/build.gradle b/libraries/lang-javascript/build.gradle index 5154447..3e2a791 100644 --- a/libraries/lang-javascript/build.gradle +++ b/libraries/lang-javascript/build.gradle @@ -20,16 +20,17 @@ description = "Apache Zest⢠JavaScript Library allows for Mixins to be implemented in JavaScript instead of directly in compiled Java." -jar { manifest { name = "Apache Zest⢠Library - Scripting - JavaScript" }} +jar { manifest { name = "Apache Zest⢠Library - Scripting - JavaScript" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile( project( ':org.apache.zest.libraries:org.apache.zest.library.scripting' )) - compile(libraries.javascript) + compile zest.core.api + compile zest.library( 'scripting' ) + compile libraries.javascript - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/locking/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/locking/build.gradle b/libraries/locking/build.gradle index 9332a1b..179bf5e 100644 --- a/libraries/locking/build.gradle +++ b/libraries/locking/build.gradle @@ -20,13 +20,14 @@ description = "Apache Zest⢠Locking Library provides lock management for methods." -jar { manifest { name = "Apache Zest⢠Library - Locking" }} +jar { manifest { name = "Apache Zest⢠Library - Locking" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.api")) + compile zest.core.api - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/logging/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/logging/build.gradle b/libraries/logging/build.gradle index 473887b..18ee658 100644 --- a/libraries/logging/build.gradle +++ b/libraries/logging/build.gradle @@ -20,15 +20,14 @@ description = "Apache Zest⢠Logging Library provides an advanced logging framework which separates trace, debug and log systems." -jar { manifest { name = "Apache Zest⢠Library - Logging" }} +jar { manifest { name = "Apache Zest⢠Library - Logging" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile( project( ':org.apache.zest.libraries:org.apache.zest.library.constraints' )) + compile zest.core.bootstrap + compile zest.library( 'constraints' ) - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.indexing-rdf")) + testCompile zest.core.testsupport + testCompile zest.extension( 'indexing-rdf' ) - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/metrics/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/metrics/build.gradle b/libraries/metrics/build.gradle index f5c9cec..bf011e8 100644 --- a/libraries/metrics/build.gradle +++ b/libraries/metrics/build.gradle @@ -20,14 +20,15 @@ description = "Apache Zest⢠Metrics Library." -jar { manifest { name = "Apache Zest⢠Library - Metrics" }} +jar { manifest { name = "Apache Zest⢠Library - Metrics" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) + compile zest.core.bootstrap - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.metrics-codahale")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + testCompile zest.extension( 'metrics-codahale' ) + + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/osgi/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/osgi/build.gradle b/libraries/osgi/build.gradle index 9772bee..1b15604 100644 --- a/libraries/osgi/build.gradle +++ b/libraries/osgi/build.gradle @@ -20,16 +20,17 @@ description = "Apache Zest⢠OSGi Library provides integration of OSGi and Apache Zestâ¢, so that services in each system can be shared." -jar { manifest { name = "Apache Zest⢠Library - OSGi Integration" }} +jar { manifest { name = "Apache Zest⢠Library - OSGi Integration" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.api")) - compile(libraries.osgi_core) - compile(libraries.osgi_compendium) + compile zest.core.api + compile libraries.osgi_core + compile libraries.osgi_compendium - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(libraries.mockito) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + testCompile libraries.mockito + + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/rdf/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/rdf/build.gradle b/libraries/rdf/build.gradle index 2d4ba54..93ec705 100644 --- a/libraries/rdf/build.gradle +++ b/libraries/rdf/build.gradle @@ -20,25 +20,18 @@ description = "Apache Zest⢠RDF Library provides commonalities of various RDF based services in Apache Zestâ¢, such as RDF Indexing." -jar { manifest { name = "Apache Zest⢠Library - RDF" }} +jar { manifest { name = "Apache Zest⢠Library - RDF" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.spi")) - compile(project(':org.apache.zest.libraries:org.apache.zest.library.constraints')) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.fileconfig")) - compile(libraries.sesame) -// compile("org.openrdf.sesame:sesame-model:$rdfVersion") -// compile("org.openrdf.sesame:sesame-repository-dataset:$rdfVersion") -// compile("org.openrdf.sesame:sesame-repository-http:$rdfVersion") -// compile("org.openrdf.sesame:sesame-rio-n3:$rdfVersion") -// compile("org.openrdf.sesame:sesame-rio-rdfxml:$rdfVersion") -// compile("org.openrdf.sesame:sesame-sail-memory:$rdfVersion") -// compile("org.openrdf.sesame:sesame-sail-nativerdf:$rdfVersion") -// compile("org.openrdf.sesame:sesame-sail-rdbms:$rdfVersion") + compile zest.core.spi + compile zest.library( 'constraints' ) + compile zest.library( 'fileconfig' ) + compile libraries.sesame - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' ) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + testCompile zest.extension( 'valueserialization-orgjson' ) + + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/rest-client/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/rest-client/build.gradle b/libraries/rest-client/build.gradle index 46ca9d4..2f59d01 100644 --- a/libraries/rest-client/build.gradle +++ b/libraries/rest-client/build.gradle @@ -20,20 +20,16 @@ description = "Apache Zest⢠REST Client Library provides a client library for the Apache Zest⢠REST Server library" -jar { manifest { name = "Apache Zest⢠Library - REST Client" }} +jar { manifest { name = "Apache Zest⢠Library - REST Client" } } dependencies { + compile zest.library( 'rest-common' ) - compile project( ":org.apache.zest.core:org.apache.zest.core.api" ) - compile project( ":org.apache.zest.libraries:org.apache.zest.library.rest-common" ) - compile libraries.restlet - compile libraries.slf4j_api + runtime zest.core.runtime - testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - testCompile project( ":org.apache.zest.libraries:org.apache.zest.library.rest-server" ) - testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' ) - - testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) - testRuntime libraries.logback + testCompile zest.core.testsupport + testCompile zest.library( 'rest-server' ) + testCompile zest.extension( 'valueserialization-orgjson' ) + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/rest-common/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/rest-common/build.gradle b/libraries/rest-common/build.gradle index 6d17251..7bc5f5f 100644 --- a/libraries/rest-common/build.gradle +++ b/libraries/rest-common/build.gradle @@ -20,10 +20,10 @@ description = "Apache Zest⢠REST Library provides various Restlet resources that can be used to expose Apache Zest⢠entities and indexes. Mostly for debugging." -jar { manifest { name = "Apache Zest⢠Library - REST" }} +jar { manifest { name = "Apache Zest⢠Library - REST" } } dependencies { - compile project( ':org.apache.zest.core:org.apache.zest.core.bootstrap' ) + compile zest.core.bootstrap compile libraries.restlet compile libraries.velocity compile libraries.servlet_api http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/rest-server/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/rest-server/build.gradle b/libraries/rest-server/build.gradle index 6275ff1..60c5436 100644 --- a/libraries/rest-server/build.gradle +++ b/libraries/rest-server/build.gradle @@ -20,19 +20,19 @@ description = "Apache Zest⢠REST Server Library provides a server component for building REST API's based on usecases" -jar { manifest { name = "Apache Zest⢠Library - REST server" }} +jar { manifest { name = "Apache Zest⢠Library - REST server" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.api")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.rest-common")) - compile(libraries.servlet_api) + compile zest.library( 'rest-common' ) + compile libraries.servlet_api compile libraries.slf4j_api - compile(libraries.velocity) - compile(libraries.restlet) - compile(libraries.freemarker) + compile libraries.velocity + compile libraries.restlet + compile libraries.freemarker - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/rest/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/rest/build.gradle b/libraries/rest/build.gradle index f744056..fc48288 100644 --- a/libraries/rest/build.gradle +++ b/libraries/rest/build.gradle @@ -20,22 +20,21 @@ description = "Apache Zest⢠REST Library provides various Restlet resources that can be used to expose Apache Zest⢠entities and indexes. Mostly for debugging." -jar { manifest { name = "Apache Zest⢠Library - REST" }} +jar { manifest { name = "Apache Zest⢠Library - REST" } } dependencies { + compile zest.extension( 'indexing-rdf' ) + compile libraries.restlet + compile libraries.sparql + compile libraries.velocity + compile libraries.servlet_api - compile project( ':org.apache.zest.extensions:org.apache.zest.extension.indexing-rdf' ) - compile libraries.restlet - compile libraries.sparql - compile libraries.velocity - compile libraries.servlet_api + runtime zest.core.runtime - testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - testCompile project( ":org.apache.zest.libraries:org.apache.zest.library.http" ) - testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' ) - testCompile libraries.http_client - - testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) - testRuntime libraries.logback + testCompile zest.core.testsupport + testCompile zest.library( 'http' ) + testCompile zest.extension( 'valueserialization-orgjson' ) + testCompile libraries.http_client + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/restlet/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/restlet/build.gradle b/libraries/restlet/build.gradle index c8bc1fb..70a58b1 100644 --- a/libraries/restlet/build.gradle +++ b/libraries/restlet/build.gradle @@ -24,26 +24,24 @@ jar { manifest { name = "Apache Zest⢠Library - Restlet" } } dependencies { - compile project( ":org.apache.zest.core:org.apache.zest.core.api" ) - compile project( ":org.apache.zest.core:org.apache.zest.core.spi" ) - compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) - compile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-jackson' ) - compile project( ':org.apache.zest.extensions:org.apache.zest.extension.indexing-rdf' ) - compile project( ':org.apache.zest.extensions:org.apache.zest.extension.entitystore-file' ) - + compile zest.core.bootstrap + compile zest.extension( 'valueserialization-jackson' ) + compile zest.extension( 'indexing-rdf' ) + compile zest.extension( 'entitystore-file' ) compile libraries.restlet compile libraries.servlet_api - testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - testCompile project( ":org.apache.zest.libraries:org.apache.zest.library.http" ) + runtime zest.core.runtime + + testCompile zest.core.testsupport + testCompile zest.library( 'http' ) testCompile libraries.http_client - testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) testRuntime libraries.logback } task runSample( type: JavaExec, dependsOn: 'testClasses' ) { - classpath = sourceSets.test.runtimeClasspath - main = 'org.apache.zest.library.restlet.TestApplication' + classpath = sourceSets.test.runtimeClasspath + main = 'org.apache.zest.library.restlet.TestApplication' } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/scripting/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/scripting/build.gradle b/libraries/scripting/build.gradle index 1bcf6ab..f2f0a13 100644 --- a/libraries/scripting/build.gradle +++ b/libraries/scripting/build.gradle @@ -20,16 +20,12 @@ description = "Apache Zest⢠Common Scripting Library contains common classes across scripting implementations." -jar { manifest { name = "Apache Zest⢠Library - Scripting - Common" }} +jar { manifest { name = "Apache Zest⢠Library - Scripting - Common" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.api")) - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile(libraries.slf4j_api) - testCompile(libraries.junit) - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.asm) - testRuntime(libraries.asm_commons) - testRuntime(libraries.slf4j_simple) + compile zest.core.bootstrap + + runtime zest.core.runtime + + testCompile zest.core.testsupport } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/servlet/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/servlet/build.gradle b/libraries/servlet/build.gradle index c8f633a..c75e9b2 100644 --- a/libraries/servlet/build.gradle +++ b/libraries/servlet/build.gradle @@ -20,17 +20,18 @@ description = "Apache Zest⢠Servlet Library provides integration of Apache Zest⢠into web applications." -jar { manifest { name = "Apache Zest⢠Library - Servlet" }} +jar { manifest { name = "Apache Zest⢠Library - Servlet" } } dependencies { - compile( project(":org.apache.zest.core:org.apache.zest.core.bootstrap") ) - compile libraries.servlet_api + compile zest.core.bootstrap + compile libraries.servlet_api compile libraries.slf4j_api - testCompile( project(":org.apache.zest.core:org.apache.zest.core.testsupport") ) - testCompile( libraries.jetty_webapp ) - testCompile( libraries.http_client ) + runtime zest.core.runtime - testRuntime( project(":org.apache.zest.core:org.apache.zest.core.runtime") ) - testRuntime(libraries.logback ) + testCompile zest.core.testsupport + testCompile libraries.jetty_webapp + testCompile libraries.http_client + + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/shiro-core/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/build.gradle b/libraries/shiro-core/build.gradle index 88e20f9..06b15ca 100644 --- a/libraries/shiro-core/build.gradle +++ b/libraries/shiro-core/build.gradle @@ -20,23 +20,21 @@ description = "Apache Zest⢠Shiro Library integrates Apache Shiro security framework into Apache Zestâ¢." -jar { manifest { name = "Apache Zest⢠Library - Shiro Core" }} +jar { manifest { name = "Apache Zest⢠Library - Shiro Core" } } dependencies { - - compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) + compile zest.core.bootstrap compile libraries.shiro compile libraries.bouncy_castle - compile libraries.slf4j_api - testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - testCompile project( ":org.apache.zest.libraries:org.apache.zest.library.shiro-web" ) - testCompile project( ":org.apache.zest.libraries:org.apache.zest.library.servlet" ) - testCompile project( ":org.apache.zest.extensions:org.apache.zest.extension.indexing-rdf" ) + runtime zest.core.runtime + + testCompile zest.core.testsupport + testCompile zest.library( 'shiro-web' ) + testCompile zest.library( 'servlet' ) + testCompile zest.extension( 'indexing-rdf' ) testCompile libraries.jetty_webapp testCompile libraries.http_client - testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) testRuntime libraries.logback - } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/shiro-web/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/shiro-web/build.gradle b/libraries/shiro-web/build.gradle index 7283088..b1b6893 100644 --- a/libraries/shiro-web/build.gradle +++ b/libraries/shiro-web/build.gradle @@ -20,25 +20,25 @@ description = "Apache Zest⢠Shiro Library integrates Apache Shiro security framework into Apache Zestâ¢. This bundle provides Servlet support." -jar { manifest { name = "Apache Zest⢠Library - Shiro Web" }} +jar { manifest { name = "Apache Zest⢠Library - Shiro Web" } } dependencies { - compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) - compile project( ':org.apache.zest.libraries:org.apache.zest.library.shiro-core' ) - compile project( ':org.apache.zest.libraries:org.apache.zest.library.servlet' ) - compile project( ':org.apache.zest.libraries:org.apache.zest.library.http' ) + compile zest.core.bootstrap + compile zest.library( 'shiro-core' ) + compile zest.library( 'servlet' ) + compile zest.library( 'http' ) compile libraries.shiro_web compile libraries.servlet_api compile libraries.slf4j_api - testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) - testCompile project( ":org.apache.zest.libraries:org.apache.zest.library.shiro-web" ) - testCompile project( ":org.apache.zest.libraries:org.apache.zest.library.servlet" ) - testCompile project( ":org.apache.zest.extensions:org.apache.zest.extension.indexing-rdf" ) + runtime zest.core.runtime + + testCompile zest.core.testsupport + testCompile zest.library( 'shiro-web' ) + testCompile zest.extension( 'indexing-rdf' ) testCompile libraries.jetty_webapp testCompile libraries.http_client - testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/spring/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/spring/build.gradle b/libraries/spring/build.gradle index 7e31c7b..93ec1e4 100644 --- a/libraries/spring/build.gradle +++ b/libraries/spring/build.gradle @@ -20,15 +20,16 @@ description = "Apache Zest⢠Spring Library allows for tight integration of Spring Framework and Apache Zest⢠applications." -jar { manifest { name = "Apache Zest⢠Library - Spring" }} +jar { manifest { name = "Apache Zest⢠Library - Spring" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile(libraries.spring_core) + compile zest.core.bootstrap + compile libraries.spring_core - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(libraries.spring_testsupport) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + testCompile libraries.spring_testsupport + + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/sql-bonecp/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/sql-bonecp/build.gradle b/libraries/sql-bonecp/build.gradle index 359bc92..98dbd58 100644 --- a/libraries/sql-bonecp/build.gradle +++ b/libraries/sql-bonecp/build.gradle @@ -20,10 +20,10 @@ description = "Apache Zest⢠SQL BoneCP Library provides BoneCP support." -jar { manifest { name = "Apache Zest⢠Library - SQL BoneCP" }} +jar { manifest { name = "Apache Zest⢠Library - SQL BoneCP" } } dependencies { - compile(project(":org.apache.zest.libraries:org.apache.zest.library.sql")) - compile(libraries.bonecp) + compile zest.library( 'sql' ) + compile libraries.bonecp } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/sql-dbcp/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/sql-dbcp/build.gradle b/libraries/sql-dbcp/build.gradle index e48d305..a282359 100644 --- a/libraries/sql-dbcp/build.gradle +++ b/libraries/sql-dbcp/build.gradle @@ -20,10 +20,10 @@ description = "Apache Zest⢠SQL DBCP Library provides DBCP support." -jar { manifest { name = "Apache Zest⢠Library - SQL DBCP" }} +jar { manifest { name = "Apache Zest⢠Library - SQL DBCP" } } dependencies { - compile(project(":org.apache.zest.libraries:org.apache.zest.library.sql")) - compile(libraries.commons_dbcp) + compile zest.library( 'sql' ) + compile libraries.commons_dbcp } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/sql-liquibase/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/sql-liquibase/build.gradle b/libraries/sql-liquibase/build.gradle index 12a3672..8eced93 100644 --- a/libraries/sql-liquibase/build.gradle +++ b/libraries/sql-liquibase/build.gradle @@ -20,18 +20,19 @@ description = "Apache Zest⢠SQL Liquibase Library provides Liquibase support." -jar { manifest { name = "Apache Zest⢠Library - SQL Liquibase" }} +jar { manifest { name = "Apache Zest⢠Library - SQL Liquibase" } } dependencies { - compile(project(":org.apache.zest.libraries:org.apache.zest.library.sql")) - compile(libraries.liquibase) + compile zest.library( 'sql' ) + compile libraries.liquibase compile libraries.slf4j_api - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(project(":org.apache.zest.libraries:org.apache.zest.library.sql-dbcp")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.derby) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + testCompile zest.library( 'sql-dbcp' ) + + testRuntime libraries.derby + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/sql/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/sql/build.gradle b/libraries/sql/build.gradle index c168628..44a84da 100644 --- a/libraries/sql/build.gradle +++ b/libraries/sql/build.gradle @@ -20,23 +20,23 @@ description = "Apache Zest⢠SQL Library provides SQL support." -jar { manifest { name = "Apache Zest⢠Library - SQL" }} +jar { manifest { name = "Apache Zest⢠Library - SQL" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.circuitbreaker")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.jmx")) - compile libraries.slf4j_api + compile zest.core.bootstrap + compile zest.library( 'circuitbreaker' ) + compile zest.library( 'jmx' ) - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) - testCompile(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testCompile(project(":org.apache.zest.libraries:org.apache.zest.library.sql-bonecp")) - testCompile(project(":org.apache.zest.libraries:org.apache.zest.library.sql-dbcp")) - testCompile(project(":org.apache.zest.libraries:org.apache.zest.library.sql-liquibase")) - testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.entitystore-preferences")) - - testRuntime(libraries.derby) - testRuntime(libraries.mysql_connector) - testRuntime(libraries.postgres) - testRuntime(libraries.logback) + runtime zest.core.runtime + + testCompile zest.core.testsupport + testCompile zest.library( 'sql-bonecp' ) + testCompile zest.library( 'sql-dbcp' ) + testCompile zest.library( 'sql-liquibase' ) + testCompile zest.extension( 'entitystore-preferences' ) + + testRuntime libraries.logback + testRuntime libraries.derby + testRuntime libraries.mysql_connector + testRuntime libraries.postgres } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/uid/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/uid/build.gradle b/libraries/uid/build.gradle index d331fb2..1288e3d 100644 --- a/libraries/uid/build.gradle +++ b/libraries/uid/build.gradle @@ -20,13 +20,14 @@ description = "Apache Zest⢠UID Library contains various Identity generation services." -jar { manifest { name = "Apache Zest⢠Library - UID" }} +jar { manifest { name = "Apache Zest⢠Library - UID" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) + compile zest.core.bootstrap - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.logback } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/libraries/uowfile/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/uowfile/build.gradle b/libraries/uowfile/build.gradle index 527f505..67950d8 100644 --- a/libraries/uowfile/build.gradle +++ b/libraries/uowfile/build.gradle @@ -20,14 +20,15 @@ description = "Apache Zest⢠UoWFile Library provides file operations binding to UoWs." -jar { manifest { name = "Apache Zest⢠Library - UoWFile" }} +jar { manifest { name = "Apache Zest⢠Library - UoWFile" } } dependencies { - compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap")) - compile(project(":org.apache.zest.libraries:org.apache.zest.library.fileconfig")) + compile zest.core.bootstrap + compile zest.library( 'fileconfig' ) - testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport")) + runtime zest.core.runtime - testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime")) - testRuntime(libraries.logback) + testCompile zest.core.testsupport + + testRuntime libraries.logback } http://git-wip-us.apache.org/repos/asf/zest-java/blob/abf92808/manual/build.gradle ---------------------------------------------------------------------- diff --git a/manual/build.gradle b/manual/build.gradle index 173b2b3..9c10a2d 100644 --- a/manual/build.gradle +++ b/manual/build.gradle @@ -23,10 +23,11 @@ import org.apache.zest.gradle.doc.DocumentationTask description = "Apache Zest⢠Manuals and Website." dependencies { - compile( project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) ) - compile( project( ":org.apache.zest.libraries:org.apache.zest.library.constraints" ) ) - compile( project( ":org.apache.zest.libraries:org.apache.zest.library.logging" ) ) - runtime( project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) ) + compile zest.core.bootstrap + compile zest.library( 'constraints' ) + compile zest.library( 'logging' ) + + runtime zest.core.runtime runtime( libraries.slf4j_simple ) } @@ -85,14 +86,16 @@ task manuals() { // Skip if asciidoc is not found in PATH when building a 0 or SNAPSHOT version, // or if skipAsciidocIfAbsent property is set and asciidoc is not found in PATH [ website, archiveWebsite, copyWebsite, manuals ]*.onlyIf { - def skipAsciidocIfAbsent = rootProject.hasProperty( 'skipAsciidocIfAbsent' ) ? rootProject.skipAsciidocIfAbsent : false + def skipAsciidocIfAbsent = rootProject.findProperty 'skipAsciidocIfAbsent' def pathDirs = System.getenv( 'PATH' ).split( File.pathSeparator ) - def present = pathDirs.collect( { new File( it, 'asciidoc') } ).flatten().findAll( { it.isFile() } ) - if( !skipAsciidocIfAbsent && version != '0' && !version.contains( 'SNAPSHOT' ) ) { + def present = pathDirs.collect( { new File( it, 'asciidoc' ) } ).flatten().findAll( { it.isFile() } ) + if( !skipAsciidocIfAbsent && version != '0' && !version.contains( 'SNAPSHOT' ) ) + { project.logger.debug 'Asciidoc tasks forced because version is no-0 and no-SNAPSHOT, hope you have Asciidoc installed' return true } - if( !present ) { + if( !present ) + { project.logger.warn 'Asciidoc not found in PATH, manual tasks will skip, please install http://www.methods.co.nz/asciidoc/' } present
