Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ES-2028: Update cordapp template to support 5.2-GA #103

Merged
merged 3 commits into from
Apr 16, 2024
Merged

ES-2028: Update cordapp template to support 5.2-GA #103

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60689ac
Bumpled to 5.2
pavelnenov-r3 Apr 15, 2024
8ce7886
Removed artifactory references from repositories
pavelnenov-r3 Apr 16, 2024
c9e0814
Updated combined worker image
pavelnenov-r3 Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ allprojects {
cordaRuntimePluginWorkspaceDir = "workspace"
cordaBinDir = "${System.getProperty("user.home")}/.corda/corda5"
cordaCliBinDir = "${System.getProperty("user.home")}/.corda/cli"

// Only need to supply these if you want to use an unpublished version
artifactoryUsername = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
artifactoryPassword = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
}

// Declare the set of Kotlin compiler options we need to build a CorDapp.
Expand Down Expand Up @@ -73,22 +69,6 @@ allprojects {
// All dependencies are held in Maven Central
mavenLocal()
mavenCentral()

// R3 Internal repositories for dev
// 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"
authentication {
basic(BasicAuthentication)
}
credentials {
username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
}
}
}

tasks.withType(Test).configureEach {
Expand Down
2 changes: 1 addition & 1 deletion config/combined-worker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ services:
]

corda:
image: corda-os-docker.software.r3.com/corda-os-combined-worker-kafka:5.2.0.0-RC02
image: corda-os-docker.software.r3.com/corda-os-combined-worker-kafka:5.2.0.0
Copy link
Contributor

@anton-subbotin anton-subbotin Apr 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the corda-os-docker.software.r3.com registry public? (just asking)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It downloaded when I removed credentials and artifactory configuration, but it does look suspicious. I'll check again

depends_on:
- postgresql
- kafka
Expand Down
119 changes: 0 additions & 119 deletions .../src/test/kotlin/com/r3/developers/apples/contracts/AppleStampContractIssueCommandTest.kt
View file
Open in desktop

This file was deleted.

85 changes: 0 additions & 85 deletions contracts/src/test/kotlin/com/r3/developers/apples/contracts/ApplesContractTest.kt
View file
Open in desktop

This file was deleted.

Loading
Loading