Use published artifacts

This commit is contained in:
Chris Barratt 2022-10-26 15:55:50 +01:00
parent 3cffe5ab90
commit bbdb1b41ca
3 changed files with 6 additions and 81 deletions

View File

@ -55,51 +55,8 @@ tasks.withType(JavaCompile) {
} }
repositories { repositories {
mavenLocal()
// All dependencies are held in Maven Central // All dependencies are held in Maven Central
mavenCentral() 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. // Declare dependencies for the modules we will use.
@ -128,8 +85,8 @@ dependencies {
cordaProvided 'org.slf4j:slf4j-api' cordaProvided 'org.slf4j:slf4j-api'
// Dependencies Required By Test Tooling // Dependencies Required By Test Tooling
testImplementation "net.corda:corda-simulator-api:$simulatorVersion" testImplementation "net.corda:corda-simulator-api:$combinedWorkerVersion"
testRuntimeOnly "net.corda:corda-simulator-runtime:$simulatorVersion" testRuntimeOnly "net.corda:corda-simulator-runtime:$combinedWorkerVersion"
// 3rd party libraries // 3rd party libraries
// Required // Required

View File

@ -2,8 +2,7 @@ kotlin.code.style=official
# Specify the version of the Corda-API to use. # 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. # 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.190-DevPreview-2
cordaApiVersion=5.0.0.414-beta+
# Specify the version of the cordapp-cpb and cordapp-cpk plugins # Specify the version of the cordapp-cpb and cordapp-cpk plugins
cordaPluginsVersion=7.0.0-DevPreview-2 cordaPluginsVersion=7.0.0-DevPreview-2
@ -26,8 +25,7 @@ hamcrestVersion=2.2
# Settings For Development Utilities # Settings For Development Utilities
testUtilsVersion=5.0.0.0-DevPreview-2 testUtilsVersion=5.0.0.0-DevPreview-2
#combinedWorkerVersion=5.0.0.0-DevPreview-2 combinedWorkerVersion=5.0.0.0-DevPreview-2
combinedWorkerVersion=5.0.0.0-beta+
cordaClusterURL=https://localhost:8888 cordaClusterURL=https://localhost:8888
cordaRpcUser=admin cordaRpcUser=admin
@ -35,6 +33,3 @@ cordaRpcPasswd=admin
devEnvWorkspace=workspace devEnvWorkspace=workspace
dbContainerName=CSDEpostgresql dbContainerName=CSDEpostgresql
# R3 internal repository
artifactoryContextUrl=https://software.r3.com/artifactory
simulatorVersion=5.0.0.0-SNAPSHOT

View File

@ -1,41 +1,12 @@
pluginManagement { pluginManagement {
// Declare the repositories where plugins are stored. // Declare the repositories where plugins are stored.
repositories { repositories {
mavenLocal()
gradlePluginPortal() gradlePluginPortal()
mavenCentral { mavenCentral {
content { content {
includeGroupByRegex 'net\\.corda(\\..*)?' 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, // 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' rootProject.name = 'csde-cordapp-template-java'