From 8ef1d767c9863a64b1223c90070ebd0732d0bd75 Mon Sep 17 00:00:00 2001 From: Rick Parker Date: Tue, 28 Mar 2017 17:17:40 +0100 Subject: [PATCH] Consolidate maven repositories (#445) * Consolidate repositories into root build.gradle --- build.gradle | 7 +++++++ client/jackson/build.gradle | 9 --------- client/jfx/build.gradle | 12 ------------ client/mock/build.gradle | 12 ------------ client/rpc/build.gradle | 12 ------------ core/build.gradle | 12 ------------ experimental/sandbox/build.gradle | 4 ---- finance/build.gradle | 12 ------------ finance/isolated/build.gradle | 10 ---------- node-api/build.gradle | 12 ------------ node-schemas/build.gradle | 12 ------------ node/build.gradle | 13 ------------- node/capsule/build.gradle | 12 ------------ node/webserver/build.gradle | 9 --------- node/webserver/webcapsule/build.gradle | 12 ------------ samples/attachment-demo/build.gradle | 9 --------- samples/bank-of-corda-demo/build.gradle | 9 --------- samples/irs-demo/build.gradle | 9 --------- samples/network-visualiser/build.gradle | 9 --------- samples/raft-notary-demo/build.gradle | 9 --------- samples/simm-valuation-demo/build.gradle | 13 ------------- samples/trader-demo/build.gradle | 9 --------- test-utils/build.gradle | 12 ------------ tools/demobench/build.gradle | 7 ------- tools/explorer/build.gradle | 6 ------ tools/loadtest/build.gradle | 12 ------------ verifier/build.gradle | 12 ------------ 27 files changed, 7 insertions(+), 269 deletions(-) diff --git a/build.gradle b/build.gradle index 48b8a888ad..344a9c061f 100644 --- a/build.gradle +++ b/build.gradle @@ -98,6 +98,13 @@ allprojects { version "$corda_version" repositories { + mavenLocal() + mavenCentral() + jcenter() + // TODO: remove this once we eliminate Exposed + maven { + url 'https://dl.bintray.com/kotlin/exposed' + } maven { url 'https://jitpack.io' } } } diff --git a/client/jackson/build.gradle b/client/jackson/build.gradle index f961a88581..d55a3104de 100644 --- a/client/jackson/build.gradle +++ b/client/jackson/build.gradle @@ -2,15 +2,6 @@ apply plugin: 'java' apply plugin: 'kotlin' apply plugin: 'net.corda.plugins.publish-utils' -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - dependencies { compile project(':core') compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" diff --git a/client/jfx/build.gradle b/client/jfx/build.gradle index 6279c489c1..653acaf835 100644 --- a/client/jfx/build.gradle +++ b/client/jfx/build.gradle @@ -4,18 +4,6 @@ apply plugin: 'net.corda.plugins.publish-utils' description 'Corda client JavaFX modules' -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - //noinspection GroovyAssignabilityCheck configurations { // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment diff --git a/client/mock/build.gradle b/client/mock/build.gradle index 1a08e05b38..b9111e9785 100644 --- a/client/mock/build.gradle +++ b/client/mock/build.gradle @@ -4,18 +4,6 @@ apply plugin: 'net.corda.plugins.publish-utils' description 'Corda client mock modules' -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - //noinspection GroovyAssignabilityCheck configurations { // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment diff --git a/client/rpc/build.gradle b/client/rpc/build.gradle index eaeb7a81ef..c6ad9c5c69 100644 --- a/client/rpc/build.gradle +++ b/client/rpc/build.gradle @@ -4,18 +4,6 @@ apply plugin: 'net.corda.plugins.publish-utils' description 'Corda client RPC modules' -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - //noinspection GroovyAssignabilityCheck configurations { // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment diff --git a/core/build.gradle b/core/build.gradle index 82322e8f0e..5ef7a6e896 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -10,18 +10,6 @@ buildscript { } } -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - sourceSets { test { resources { diff --git a/experimental/sandbox/build.gradle b/experimental/sandbox/build.gradle index 5965890f85..b3d3411149 100644 --- a/experimental/sandbox/build.gradle +++ b/experimental/sandbox/build.gradle @@ -10,10 +10,6 @@ buildscript { ext.asm_version = '5.1' } -repositories { - mavenCentral() -} - dependencies { // Asm: bytecode manipulation library. compile "org.ow2.asm:asm:$asm_version" diff --git a/finance/build.gradle b/finance/build.gradle index f9e19c1dcf..7cdd8b769e 100644 --- a/finance/build.gradle +++ b/finance/build.gradle @@ -8,18 +8,6 @@ apply plugin: 'net.corda.plugins.quasar-utils' description 'Corda finance modules' -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - dependencies { compile project(':core') diff --git a/finance/isolated/build.gradle b/finance/isolated/build.gradle index 7e5dd359fa..49ba0c1ae5 100644 --- a/finance/isolated/build.gradle +++ b/finance/isolated/build.gradle @@ -1,16 +1,6 @@ apply plugin: 'kotlin' apply plugin: CanonicalizerPlugin -repositories { - mavenCentral() - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } -} - dependencies { compile project(':core') } diff --git a/node-api/build.gradle b/node-api/build.gradle index 0c7f81735a..3dc8a7bb75 100644 --- a/node-api/build.gradle +++ b/node-api/build.gradle @@ -10,18 +10,6 @@ buildscript { } } -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - sourceSets { test { resources { diff --git a/node-schemas/build.gradle b/node-schemas/build.gradle index 14d15165e7..013a0f83f6 100644 --- a/node-schemas/build.gradle +++ b/node-schemas/build.gradle @@ -9,18 +9,6 @@ buildscript { ext.generatedSourcesDir = "${projectDir}/generated/source/kapt/main" } -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - // Kapt plugin is hardcoded in output directory and sourcesets. Use a separate sourceset to keep the generated // files in git and outside of the build directory (to avoid cleaning issues) sourceSets { diff --git a/node/build.gradle b/node/build.gradle index d9838048be..a3294c3382 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -5,19 +5,6 @@ apply plugin: 'net.corda.plugins.publish-utils' description 'Corda node modules' -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - - //noinspection GroovyAssignabilityCheck configurations { // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment diff --git a/node/capsule/build.gradle b/node/capsule/build.gradle index 8c2f070dc3..4c4aebda38 100644 --- a/node/capsule/build.gradle +++ b/node/capsule/build.gradle @@ -7,18 +7,6 @@ apply plugin: 'us.kirchmeier.capsule' description 'Corda standalone node' -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - configurations { runtimeArtifacts.extendsFrom runtime } diff --git a/node/webserver/build.gradle b/node/webserver/build.gradle index 3c56692395..bec65b0f8e 100644 --- a/node/webserver/build.gradle +++ b/node/webserver/build.gradle @@ -5,15 +5,6 @@ apply plugin: 'net.corda.plugins.publish-utils' // TODO: Break dependency on node and move to another location such as a submodule of client. description 'Corda node web server' -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - configurations { integrationTestCompile.extendsFrom testCompile integrationTestRuntime.extendsFrom testRuntime diff --git a/node/webserver/webcapsule/build.gradle b/node/webserver/webcapsule/build.gradle index cae7d3057e..cd5fd14d40 100644 --- a/node/webserver/webcapsule/build.gradle +++ b/node/webserver/webcapsule/build.gradle @@ -7,18 +7,6 @@ apply plugin: 'us.kirchmeier.capsule' description 'Corda node web server capsule' -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - configurations { runtimeArtifacts } diff --git a/samples/attachment-demo/build.gradle b/samples/attachment-demo/build.gradle index e4b4536384..25b3d39e29 100644 --- a/samples/attachment-demo/build.gradle +++ b/samples/attachment-demo/build.gradle @@ -6,15 +6,6 @@ apply plugin: 'net.corda.plugins.publish-utils' apply plugin: 'net.corda.plugins.cordformation' apply plugin: 'maven-publish' -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - sourceSets { main { resources { diff --git a/samples/bank-of-corda-demo/build.gradle b/samples/bank-of-corda-demo/build.gradle index a111de61a8..5f2eb2766c 100644 --- a/samples/bank-of-corda-demo/build.gradle +++ b/samples/bank-of-corda-demo/build.gradle @@ -6,15 +6,6 @@ apply plugin: 'net.corda.plugins.publish-utils' apply plugin: 'net.corda.plugins.cordformation' apply plugin: 'maven-publish' -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - sourceSets { main { resources { diff --git a/samples/irs-demo/build.gradle b/samples/irs-demo/build.gradle index 0cd355752a..beda652c6f 100644 --- a/samples/irs-demo/build.gradle +++ b/samples/irs-demo/build.gradle @@ -7,15 +7,6 @@ apply plugin: 'net.corda.plugins.cordformation' apply plugin: 'maven-publish' apply plugin: 'application' -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - mainClassName = 'net.corda.irs.IRSDemo' sourceSets { diff --git a/samples/network-visualiser/build.gradle b/samples/network-visualiser/build.gradle index 97bbda8538..6046f94e2a 100644 --- a/samples/network-visualiser/build.gradle +++ b/samples/network-visualiser/build.gradle @@ -5,15 +5,6 @@ apply plugin: 'application' apply plugin: 'net.corda.plugins.quasar-utils' apply plugin: 'us.kirchmeier.capsule' -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - dependencies { compile project(':samples:irs-demo') diff --git a/samples/raft-notary-demo/build.gradle b/samples/raft-notary-demo/build.gradle index 269d887b6d..7923537a18 100644 --- a/samples/raft-notary-demo/build.gradle +++ b/samples/raft-notary-demo/build.gradle @@ -13,15 +13,6 @@ ext { advertisedNotary = "$notaryType|$notaryName" } -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - sourceSets { main { resources { diff --git a/samples/simm-valuation-demo/build.gradle b/samples/simm-valuation-demo/build.gradle index d21def1643..1923267023 100644 --- a/samples/simm-valuation-demo/build.gradle +++ b/samples/simm-valuation-demo/build.gradle @@ -10,19 +10,6 @@ apply plugin: 'net.corda.plugins.publish-utils' apply plugin: 'net.corda.plugins.cordformation' apply plugin: 'maven-publish' -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - - sourceSets { main { resources { diff --git a/samples/trader-demo/build.gradle b/samples/trader-demo/build.gradle index a8261ac1a0..8aa09c661e 100644 --- a/samples/trader-demo/build.gradle +++ b/samples/trader-demo/build.gradle @@ -6,15 +6,6 @@ apply plugin: 'net.corda.plugins.publish-utils' apply plugin: 'net.corda.plugins.cordformation' apply plugin: 'maven-publish' -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - sourceSets { main { resources { diff --git a/test-utils/build.gradle b/test-utils/build.gradle index 2b9b8905d1..8830b7e969 100644 --- a/test-utils/build.gradle +++ b/test-utils/build.gradle @@ -4,18 +4,6 @@ apply plugin: 'net.corda.plugins.publish-utils' description 'Testing utilities for Corda' -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - //noinspection GroovyAssignabilityCheck configurations { // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment diff --git a/tools/demobench/build.gradle b/tools/demobench/build.gradle index eac80a95e0..b3a3243e20 100644 --- a/tools/demobench/build.gradle +++ b/tools/demobench/build.gradle @@ -29,16 +29,9 @@ repositories { flatDir { dirs 'libs' } - - mavenLocal() - mavenCentral() - jcenter() maven { url 'http://www.sparetimelabs.com/maven2' } - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } } dependencies { diff --git a/tools/explorer/build.gradle b/tools/explorer/build.gradle index ad15ff818a..c1ac163b0d 100644 --- a/tools/explorer/build.gradle +++ b/tools/explorer/build.gradle @@ -25,12 +25,6 @@ sourceSets { } } -repositories { - jcenter() - mavenCentral() - mavenLocal() -} - dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" diff --git a/tools/loadtest/build.gradle b/tools/loadtest/build.gradle index 8f068e402a..d3710def2b 100644 --- a/tools/loadtest/build.gradle +++ b/tools/loadtest/build.gradle @@ -1,18 +1,6 @@ apply plugin: 'kotlin' apply plugin: 'application' -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - sourceSets { main { resources { diff --git a/verifier/build.gradle b/verifier/build.gradle index eb4cb1fb93..3c782996b6 100644 --- a/verifier/build.gradle +++ b/verifier/build.gradle @@ -4,18 +4,6 @@ apply plugin: 'net.corda.plugins.publish-utils' description 'Corda verifier' -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - maven { - url 'https://dl.bintray.com/kotlin/exposed' - } -} - //noinspection GroovyAssignabilityCheck configurations { integrationTestCompile.extendsFrom testCompile