From bbdb1b41cae4c83af5f61b4e8565f168a6798315 Mon Sep 17 00:00:00 2001 From: Chris Barratt Date: Wed, 26 Oct 2022 15:55:50 +0100 Subject: [PATCH] Use published artifacts --- build.gradle | 47 ++--------------------------------------------- gradle.properties | 9 ++------- settings.gradle | 31 ++----------------------------- 3 files changed, 6 insertions(+), 81 deletions(-) diff --git a/build.gradle b/build.gradle index 733d3bf..ff011d9 100644 --- a/build.gradle +++ b/build.gradle @@ -55,51 +55,8 @@ tasks.withType(JavaCompile) { } repositories { - mavenLocal() // All dependencies are held in Maven Central mavenCentral() - - // R3 Internal repositories - // Repository the provides kotlin-stdlib-jdk8-osgi created by R3. - // Final location to be decided. - maven { - url = "$artifactoryContextUrl/corda-dependencies" - } - // Repository provides Corda 5 binaries that implement Corda-API. - // These will be made publicly available. - // Final location to be decided. - // Repository subject to change - maven { - url = "$artifactoryContextUrl/corda-os-maven" - credentials { - username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } - // Provides the combined-worker Jars - // These will be made publicly available. - // Final location to be decided. - maven { - url = "$artifactoryContextUrl/corda-ent-maven-unstable-local" - credentials { - username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } - maven { - url = "$artifactoryContextUrl/corda-ent-maven" - credentials { - username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } - maven { - url = "$artifactoryContextUrl/engineering-tools-maven-unstable" - credentials { - username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } } // Declare dependencies for the modules we will use. @@ -128,8 +85,8 @@ dependencies { cordaProvided 'org.slf4j:slf4j-api' // Dependencies Required By Test Tooling - testImplementation "net.corda:corda-simulator-api:$simulatorVersion" - testRuntimeOnly "net.corda:corda-simulator-runtime:$simulatorVersion" + testImplementation "net.corda:corda-simulator-api:$combinedWorkerVersion" + testRuntimeOnly "net.corda:corda-simulator-runtime:$combinedWorkerVersion" // 3rd party libraries // Required diff --git a/gradle.properties b/gradle.properties index 1581641..c6aac50 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,7 @@ kotlin.code.style=official # Specify the version of the Corda-API to use. # This needs to match the version supported by the Corda Cluster the CorDapp will run on. -# cordaApiVersion=5.0.0.190-DevPreview-2 -cordaApiVersion=5.0.0.414-beta+ +cordaApiVersion=5.0.0.190-DevPreview-2 # Specify the version of the cordapp-cpb and cordapp-cpk plugins cordaPluginsVersion=7.0.0-DevPreview-2 @@ -26,8 +25,7 @@ hamcrestVersion=2.2 # Settings For Development Utilities testUtilsVersion=5.0.0.0-DevPreview-2 -#combinedWorkerVersion=5.0.0.0-DevPreview-2 -combinedWorkerVersion=5.0.0.0-beta+ +combinedWorkerVersion=5.0.0.0-DevPreview-2 cordaClusterURL=https://localhost:8888 cordaRpcUser=admin @@ -35,6 +33,3 @@ cordaRpcPasswd=admin devEnvWorkspace=workspace dbContainerName=CSDEpostgresql -# R3 internal repository -artifactoryContextUrl=https://software.r3.com/artifactory -simulatorVersion=5.0.0.0-SNAPSHOT \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 8fb0cb1..655a3be 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,41 +1,12 @@ pluginManagement { // Declare the repositories where plugins are stored. repositories { - mavenLocal() gradlePluginPortal() mavenCentral { content { includeGroupByRegex 'net\\.corda(\\..*)?' } } - // R3 internal repositories - maven { - url "${artifactoryContextUrl}/corda-dev" - content { - includeGroupByRegex 'net\\.corda\\.plugins(\\..*)?' - } - } - maven { - url = "$artifactoryContextUrl/corda-os-maven-unstable" - credentials { - username = settings.ext.find('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = settings.ext.find('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } - maven { - url = "$artifactoryContextUrl/corda-os-maven-unstable-local" - credentials { - username = settings.ext.find('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = settings.ext.find('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } - maven { - url = "$artifactoryContextUrl/corda-dev" - credentials { - username = settings.ext.find('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = settings.ext.find('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } } // The plugin dependencies with versions of the plugins congruent with the specified CorDapp plugin version, @@ -54,3 +25,5 @@ pluginManagement { rootProject.name = 'csde-cordapp-template-java' + +