From a28fa69865e5080ead23e1c3eb3b4173eb0a16e7 Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Mon, 3 Sep 2018 18:21:58 +0100 Subject: [PATCH 1/2] Updated repository lists to reduce dependency on Jitpack and removed unused repositories. --- build.gradle | 7 +------ docs/source/example-code/build.gradle | 9 --------- experimental/build.gradle | 9 --------- tools/explorer/build.gradle | 4 ---- tools/explorer/capsule/build.gradle | 9 --------- 5 files changed, 1 insertion(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index 669311b082..b5e034bfaf 100644 --- a/build.gradle +++ b/build.gradle @@ -210,6 +210,7 @@ allprojects { mavenLocal() mavenCentral() jcenter() + maven { url "$artifactory_contextUrl/corda-dependencies" } maven { url 'https://jitpack.io' } } @@ -258,12 +259,6 @@ allprojects { if (!JavaVersion.current().java8Compatible) throw new GradleException("Corda requires Java 8, please upgrade to at least 1.8.0_$java8_minUpdateVersion") -repositories { - mavenLocal() - mavenCentral() - jcenter() -} - // Required for building out the fat JAR. dependencies { compile project(':node') diff --git a/docs/source/example-code/build.gradle b/docs/source/example-code/build.gradle index 9a2d0ed5a4..eeeb489eb4 100644 --- a/docs/source/example-code/build.gradle +++ b/docs/source/example-code/build.gradle @@ -3,15 +3,6 @@ apply plugin: 'application' apply plugin: 'net.corda.plugins.cordformation' apply plugin: 'net.corda.plugins.quasar-utils' -repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } -} - configurations { integrationTestCompile.extendsFrom testCompile integrationTestRuntime.extendsFrom testRuntime diff --git a/experimental/build.gradle b/experimental/build.gradle index 2aa7d36615..1be6ecc6c5 100644 --- a/experimental/build.gradle +++ b/experimental/build.gradle @@ -3,15 +3,6 @@ version '1.0-SNAPSHOT' apply plugin: 'kotlin' -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() -} - compileKotlin { kotlinOptions.suppressWarnings = true } diff --git a/tools/explorer/build.gradle b/tools/explorer/build.gradle index 065625a789..05517cc7ca 100644 --- a/tools/explorer/build.gradle +++ b/tools/explorer/build.gradle @@ -1,7 +1,3 @@ -repositories { - mavenCentral() -} - apply plugin: 'java' apply plugin: 'kotlin' apply plugin: 'application' diff --git a/tools/explorer/capsule/build.gradle b/tools/explorer/capsule/build.gradle index aba8ca33ff..757c9b503a 100644 --- a/tools/explorer/capsule/build.gradle +++ b/tools/explorer/capsule/build.gradle @@ -11,15 +11,6 @@ configurations { runtimeArtifacts.extendsFrom runtime } -repositories { - mavenLocal() - mavenCentral() - maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' - } - jcenter() -} - // Force the Caplet to target Java 6. This ensures that running 'java -jar explorer.jar' on any Java 6 VM upwards // will get as far as the Capsule version checks, meaning that if your JVM is too old, you will at least get // a sensible error message telling you what to do rather than a bytecode version exception that doesn't. From a7f9320985002a6a6f9259780189072c7f6fcd60 Mon Sep 17 00:00:00 2001 From: Michele Sollecito Date: Tue, 4 Sep 2018 17:31:42 +0100 Subject: [PATCH 2/2] Fixedd a mistake in CertificateStoreStubs. (#3893) --- .../net/corda/testing/internal/stubs/CertificateStoreStubs.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/test-utils/src/main/kotlin/net/corda/testing/internal/stubs/CertificateStoreStubs.kt b/testing/test-utils/src/main/kotlin/net/corda/testing/internal/stubs/CertificateStoreStubs.kt index 1eba7b9aa5..62f871ca8c 100644 --- a/testing/test-utils/src/main/kotlin/net/corda/testing/internal/stubs/CertificateStoreStubs.kt +++ b/testing/test-utils/src/main/kotlin/net/corda/testing/internal/stubs/CertificateStoreStubs.kt @@ -52,7 +52,7 @@ class CertificateStoreStubs { @JvmStatic fun withBaseDirectory(baseDirectory: Path, certificatesDirectoryName: String = DEFAULT_CERTIFICATES_DIRECTORY_NAME, keyStoreFileName: String = KeyStore.DEFAULT_STORE_FILE_NAME, keyStorePassword: String = KeyStore.DEFAULT_STORE_PASSWORD, trustStoreFileName: String = TrustStore.DEFAULT_STORE_FILE_NAME, trustStorePassword: String = TrustStore.DEFAULT_STORE_PASSWORD): MutualSslConfiguration { - return withCertificatesDirectory(baseDirectory / certificatesDirectoryName, keyStorePassword, trustStorePassword, keyStoreFileName, trustStoreFileName) + return withCertificatesDirectory(baseDirectory / certificatesDirectoryName, keyStoreFileName, keyStorePassword, trustStoreFileName, trustStorePassword) } }