Skip to content

Commit

Permalink
build(deps): swap deprecated Corda artifactory URL to new working one
Browse files Browse the repository at this point in the history 
R3 has phased out some of their artifactory repositories that we've been
using in the past and this broke all our Corda builds.

On their website[1] they explain the solution, see the important part pasted
below:

Note: corda-dependencies is just one example of a repo, any build code
which references https://software.r3.com/artifactory must be updated in
the same manner swapping
https://software.r3.com/artifactory/
to
https://download.corda.net/maven/ and keeping the existing repository name.

When will this change be made?
The Maven repository on https://download.corda.net/maven/corda-dependencies/ is available now.
The Artifactory repositories will become unavailable on 31st July 2023.

[1]: https://developer.r3.com/forums/topic/artifactory-repositories-for-cordapp-developers-becoming-private/

Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
  • Loading branch information
@petermetz
petermetz committed Aug 17, 2023
1 parent 59f9f91 commit 01c5265
Show file tree
Hide file tree
Showing 21 changed files with 53 additions and 46 deletions.
6 changes: 6 additions & 0 deletions commitlint.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
module.exports = {
extends: ["@commitlint/config-conventional"],
rules: { "footer-max-line-length": [1, "always", 100] },
parserPreset: {
parserOpts: {
noteKeywords: ["\\[\\d+\\]"],
},
},
};
12 changes: 1 addition & 11 deletions ...ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.idea/jarRepositories.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions ...s-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,7 @@ repositories {

mavenLocal()
mavenCentral()
maven { url = uri("https://ci-artifactory.corda.r3cev.com/artifactory/corda") }
// Can be removed post-release - used to get nightly snapshot build.
maven { url = uri("https://ci-artifactory.corda.r3cev.com/artifactory/corda-lib") }
maven { url = uri("https://ci-artifactory.corda.r3cev.com/artifactory/corda-lib-dev") }
maven { url = uri("https://download.corda.net/maven/corda-dependencies") }
maven { url = uri("https://jitpack.io") }
maven { url = uri("https://repo.gradle.org/gradle/libs-releases-local") }
}
2 changes: 1 addition & 1 deletion tools/docker/corda-all-in-one/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ RUN cp $CACTUS_CFG_PATH/corda-aio-image.pub ~/.ssh/authorized_keys
# RUN cat /root-password.txt | chpasswd
RUN echo "root:root" | chpasswd

RUN curl https://software.r3.com/artifactory/corda-releases/net/corda/corda-tools-shell-cli/${CORDA_TOOLS_SHELL_CLI_VERSION}/corda-tools-shell-cli-${CORDA_TOOLS_SHELL_CLI_VERSION}-all.jar --output /corda-tools-shell-cli-all.jar
RUN curl https://download.corda.net/maven/corda-releases/net/corda/corda-tools-shell-cli/${CORDA_TOOLS_SHELL_CLI_VERSION}/corda-tools-shell-cli-${CORDA_TOOLS_SHELL_CLI_VERSION}-all.jar --output /corda-tools-shell-cli-all.jar
# This is what makes the "corda-shell" alias avaialble on the terminal
RUN java -jar /corda-tools-shell-cli-all.jar install-shell-extensions

Expand Down
2 changes: 1 addition & 1 deletion tools/docker/corda-all-in-one/corda-v4_8-flowdb/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ RUN cp $CACTUS_CFG_PATH/corda-aio-image.pub ~/.ssh/authorized_keys
# RUN cat /root-password.txt | chpasswd
RUN echo "root:root" | chpasswd

RUN curl https://software.r3.com/artifactory/corda-releases/net/corda/corda-tools-shell-cli/${CORDA_TOOLS_SHELL_CLI_VERSION}/corda-tools-shell-cli-${CORDA_TOOLS_SHELL_CLI_VERSION}-all.jar --output /corda-tools-shell-cli-all.jar
RUN curl https://download.corda.net/maven/corda-releases/net/corda/corda-tools-shell-cli/${CORDA_TOOLS_SHELL_CLI_VERSION}/corda-tools-shell-cli-${CORDA_TOOLS_SHELL_CLI_VERSION}-all.jar --output /corda-tools-shell-cli-all.jar
# This is what makes the "corda-shell" alias avaialble on the terminal
RUN java -jar /corda-tools-shell-cli-all.jar install-shell-extensions

Expand Down
4 changes: 2 additions & 2 deletions tools/docker/corda-all-in-one/corda-v4_8-flowdb/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript { //properties that you need to build the project
repositories {
mavenLocal()
mavenCentral()
maven { url 'https://software.r3.com/artifactory/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-releases' }
}

dependencies {
Expand All @@ -37,7 +37,7 @@ allprojects { //Properties that you need to compile your project (The applicatio
repositories {
mavenLocal()
mavenCentral()
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda' }
maven { url 'https://jitpack.io' }
}

Expand Down
2 changes: 1 addition & 1 deletion tools/docker/corda-all-in-one/corda-v4_8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ RUN cp $CACTUS_CFG_PATH/corda-aio-image.pub ~/.ssh/authorized_keys
# RUN cat /root-password.txt | chpasswd
RUN echo "root:root" | chpasswd

RUN curl https://software.r3.com/artifactory/corda-releases/net/corda/corda-tools-shell-cli/${CORDA_TOOLS_SHELL_CLI_VERSION}/corda-tools-shell-cli-${CORDA_TOOLS_SHELL_CLI_VERSION}-all.jar --output /corda-tools-shell-cli-all.jar
RUN curl https://download.corda.net/maven/corda-releases/net/corda/corda-tools-shell-cli/${CORDA_TOOLS_SHELL_CLI_VERSION}/corda-tools-shell-cli-${CORDA_TOOLS_SHELL_CLI_VERSION}-all.jar --output /corda-tools-shell-cli-all.jar
# This is what makes the "corda-shell" alias avaialble on the terminal
RUN java -jar /corda-tools-shell-cli-all.jar install-shell-extensions

Expand Down
3 changes: 2 additions & 1 deletion weaver/common/protos-java-kt/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repositories {
mavenLocal()
mavenCentral()
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda-dependencies/' }
maven { url 'https://jitpack.io' }
}

Expand Down Expand Up @@ -65,6 +65,7 @@ dependencies {
implementation "io.grpc:grpc-netty-shaded:$grpc_version"
implementation "io.grpc:grpc-protobuf:$grpc_version"
implementation "io.grpc:grpc-stub:$grpc_version"
implementation 'javax.annotation:javax.annotation-api:1.3.2'

}

Expand Down
3 changes: 2 additions & 1 deletion weaver/common/protos-java-kt/repositories.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ repositories {
mavenCentral()
jcenter()
maven { url 'https://jitpack.io' }
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
8 changes: 6 additions & 2 deletions weaver/core/drivers/corda-driver/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ buildscript {

repositories {
mavenCentral()
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-lib' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand All @@ -40,7 +42,9 @@ repositories {
mavenCentral()
mavenLocal()
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-lib' }
if (file("$projectDir/./github.properties").exists()) {
def styler = 'black red green yellow blue magenta cyan white'
.split().toList().withIndex(30)
Expand Down
5 changes: 3 additions & 2 deletions weaver/core/network/corda-interop-app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ buildscript {
mavenLocal()
mavenCentral()
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://download.corda.net/maven/corda-releases' }
}

dependencies {
Expand Down Expand Up @@ -61,7 +62,7 @@ allprojects {
mavenLocal()
mavenCentral()
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda' }
maven { url 'https://jitpack.io' }
if (github_url != "") {
println("Fetching Weaver packages from: $github_url")
Expand Down
3 changes: 2 additions & 1 deletion weaver/core/network/corda-interop-app/repositories.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ repositories {
mavenCentral()
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://jitpack.io' }
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
5 changes: 3 additions & 2 deletions weaver/samples/corda/corda-simple-application/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ buildscript {
mavenLocal()
mavenCentral()
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
}

dependencies {
Expand All @@ -46,7 +47,7 @@ allprojects {
mavenLocal()
maven { url 'https://repo1.maven.org/maven2' }
mavenCentral()
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda' }
maven { url 'https://jitpack.io' }

if (file("$projectDir/github.properties").exists()) {
Expand Down
2 changes: 1 addition & 1 deletion weaver/samples/corda/corda-simple-application/clients/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ repositories {
jcenter()
mavenCentral()
mavenLocal()
maven { url 'https://software.r3.com/artifactory/corda-lib' }
maven { url 'https://download.corda.net/maven/corda-lib' }
flatDir {
dirs '../../fungible-house-token/source/contracts/build/libs'
dirs '../../fungible-house-token/source/workflows/build/libs'
Expand Down
3 changes: 2 additions & 1 deletion weaver/samples/corda/corda-simple-application/repositories.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ repositories {
mavenCentral()
jcenter()
maven { url 'https://jitpack.io' }
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
6 changes: 3 additions & 3 deletions weaver/samples/corda/fungible-house-token/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ buildscript {
mavenLocal()
mavenCentral()
jcenter()
maven { url 'https://software.r3.com/artifactory/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-releases' }
}

dependencies {
Expand All @@ -45,10 +45,10 @@ allprojects {
mavenLocal()
jcenter()
mavenCentral()
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda' }
maven { url 'https://jitpack.io' }
//SDK lib
maven { url 'https://software.r3.com/artifactory/corda-lib' }
maven { url 'https://download.corda.net/maven/corda-lib' }
//Gradle Plugins
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
if (file("$projectDir/../github.properties").exists()) {
Expand Down
3 changes: 2 additions & 1 deletion weaver/sdks/corda/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ Properties constants = new Properties()

repositories {
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
if (file("$projectDir/./github.properties").exists()) {
file("$projectDir/github.properties").withInputStream { constants.load(it) }
maven {
Expand Down
7 changes: 4 additions & 3 deletions weaver/tests/network-setups/corda/dev/Corda_Network/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ buildscript {
mavenLocal()
mavenCentral()
jcenter()
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
}

dependencies {
Expand Down Expand Up @@ -59,9 +60,9 @@ repositories {
mavenLocal()
jcenter()
mavenCentral()
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda' }
maven { url 'https://jitpack.io' }
maven { url 'https://software.r3.com/artifactory/corda-lib' }
maven { url 'https://download.corda.net/maven/corda-lib' }
}

task ganache {
Expand Down
7 changes: 4 additions & 3 deletions weaver/tests/network-setups/corda/dev/Corda_Network2/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ buildscript {
mavenLocal()
mavenCentral()
jcenter()
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
}

dependencies {
Expand Down Expand Up @@ -59,9 +60,9 @@ repositories {
mavenLocal()
jcenter()
mavenCentral()
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda' }
maven { url 'https://jitpack.io' }
maven { url 'https://software.r3.com/artifactory/corda-lib' }
maven { url 'https://download.corda.net/maven/corda-lib' }
}

task ganache {
Expand Down
6 changes: 3 additions & 3 deletions weaver/tests/network-setups/corda/scripts/get-cordapps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ elif [ "house" = "$app" ]; then

### Token SDK ###

(cd $directory/../shared/artifacts && curl -O https://software.r3.com/artifactory/corda-lib/com/r3/corda/lib/ci/ci-workflows/1.0/ci-workflows-1.0.jar) || exit 1
(cd $directory/../shared/artifacts && curl -O https://software.r3.com/artifactory/corda-lib/com/r3/corda/lib/tokens/tokens-contracts/$tokenVersion/tokens-contracts-$tokenVersion.jar) || exit 1
(cd $directory/../shared/artifacts && curl -O https://software.r3.com/artifactory/corda-lib/com/r3/corda/lib/tokens/tokens-workflows/$tokenVersion/tokens-workflows-$tokenVersion.jar) || exit 1
(cd $directory/../shared/artifacts && curl -O https://download.corda.net/maven/corda-lib/com/r3/corda/lib/ci/ci-workflows/1.0/ci-workflows-1.0.jar) || exit 1
(cd $directory/../shared/artifacts && curl -O https://download.corda.net/maven/corda-lib/com/r3/corda/lib/tokens/tokens-contracts/$tokenVersion/tokens-contracts-$tokenVersion.jar) || exit 1
(cd $directory/../shared/artifacts && curl -O https://download.corda.net/maven/corda-lib/com/r3/corda/lib/tokens/tokens-workflows/$tokenVersion/tokens-workflows-$tokenVersion.jar) || exit 1

else
echo "Cordapp not found" && exit 1
Expand Down
5 changes: 3 additions & 2 deletions weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ buildscript {
mavenLocal()
mavenCentral()
jcenter()
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
}

dependencies {
Expand Down Expand Up @@ -52,7 +53,7 @@ repositories {
mavenLocal()
jcenter()
mavenCentral()
maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://download.corda.net/maven/corda' }
maven { url 'https://jitpack.io' }
}

Expand Down

0 comments on commit 01c5265

Please sign in to comment.