From a28fa69865e5080ead23e1c3eb3b4173eb0a16e7 Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Mon, 3 Sep 2018 18:21:58 +0100 Subject: [PATCH 1/3] 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/3] 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) } } From 0b495098a80e730a85811416c3a22239b8c89e15 Mon Sep 17 00:00:00 2001 From: Michele Sollecito Date: Tue, 4 Sep 2018 17:33:05 +0100 Subject: [PATCH 3/3] [CORDA-1937]: Fixes to enterprise float and bridge. --- .../corda/bridge/smoketest/BridgeSmokeTest.kt | 21 ++++++++----------- .../internal/stubs/CertificateStoreStubs.kt | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/bridge/bridgecapsule/src/smoke-test/kotlin/net/corda/bridge/smoketest/BridgeSmokeTest.kt b/bridge/bridgecapsule/src/smoke-test/kotlin/net/corda/bridge/smoketest/BridgeSmokeTest.kt index 0d7a16b993..4ffebf5645 100644 --- a/bridge/bridgecapsule/src/smoke-test/kotlin/net/corda/bridge/smoketest/BridgeSmokeTest.kt +++ b/bridge/bridgecapsule/src/smoke-test/kotlin/net/corda/bridge/smoketest/BridgeSmokeTest.kt @@ -72,10 +72,10 @@ class BridgeSmokeTest { val artemisConfig = CertificateStoreStubs.P2P.withBaseDirectory(baseDirectory) artemisConfig.createBridgeKeyStores(DUMMY_BANK_A_NAME) - copyBridgeResource("corda-firewall.jar") - copyBridgeResource("firewall.conf") + copyBridgeResource("corda-firewall.jar", baseDirectory) + copyBridgeResource("firewall.conf", baseDirectory) createNetworkParams(baseDirectory) - val (artemisServer, artemisClient) = createArtemis() + val (artemisServer, artemisClient) = createArtemis(baseDirectory, baseDirectory / "certificates", artemisConfig) val zkServer = TestingServer(11105, false) try { installBridgeControlResponder(artemisClient) @@ -89,13 +89,12 @@ class BridgeSmokeTest { } } - private fun copyBridgeResource(resourceName: String) { - val testDir = tempFolder.root.toPath() - // Find the finance jar file for the smoke tests of this module + private fun copyBridgeResource(resourceName: String, baseDirectory: Path) { + // Find the firewall jar file for the smoke tests of this module val bridgeJar = Paths.get("build", "resources/smokeTest/net/corda/bridge/smoketest").list { it.filter { resourceName in it.toString() }.toList().single() } - bridgeJar.copyToDirectory(testDir) + bridgeJar.copyToDirectory(baseDirectory) } private fun createNetworkParams(baseDirectory: Path) { @@ -200,18 +199,16 @@ class BridgeSmokeTest { } } - private fun createArtemis(): Pair { - val baseDirectory = tempFolder.root.toPath() - val certificatesDirectory = baseDirectory / "certificates" - val p2pSslConfiguration = CertificateStoreStubs.P2P.withCertificatesDirectory(certificatesDirectory) + private fun createArtemis(baseDirectory: Path, certificatesDirectory: Path, p2pSslConfiguration: MutualSslConfiguration): Pair { + val signingCertificateStore = CertificateStoreStubs.Signing.withCertificatesDirectory(certificatesDirectory) val artemisConfig = rigorousMock().also { doReturn(baseDirectory).whenever(it).baseDirectory doReturn(certificatesDirectory).whenever(it).certificatesDirectory doReturn(ALICE_NAME).whenever(it).myLegalName - doReturn(p2pSslConfiguration).whenever(it).p2pSslOptions doReturn(signingCertificateStore).whenever(it).signingCertificateStore + doReturn(p2pSslConfiguration).whenever(it).p2pSslOptions doReturn(NetworkHostAndPort("localhost", 11005)).whenever(it).p2pAddress doReturn(null).whenever(it).jmxMonitoringHttpPort doReturn(EnterpriseConfiguration(MutualExclusionConfiguration(false, "", 20000, 40000), externalBridge = true)).whenever(it).enterpriseConfiguration 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) } }