From 01c52652098405673e2b0bbb72852f7ba35f5816 Mon Sep 17 00:00:00 2001
From: Peter Somogyvari <peter.somogyvari@accenture.com>
Date: Wed, 16 Aug 2023 15:10:22 -0700
Subject: [PATCH] build(deps): swap deprecated Corda artifactory URL to new
 working one

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>
---
 commitlint.config.js                                 |  6 ++++++
 .../gen/kotlin-spring/.idea/jarRepositories.xml      | 12 +-----------
 .../kotlin/gen/kotlin-spring/build.gradle.kts        |  5 +----
 tools/docker/corda-all-in-one/Dockerfile             |  2 +-
 .../corda-all-in-one/corda-v4_8-flowdb/Dockerfile    |  2 +-
 .../corda-all-in-one/corda-v4_8-flowdb/build.gradle  |  4 ++--
 tools/docker/corda-all-in-one/corda-v4_8/Dockerfile  |  2 +-
 weaver/common/protos-java-kt/build.gradle            |  3 ++-
 weaver/common/protos-java-kt/repositories.gradle     |  3 ++-
 weaver/core/drivers/corda-driver/build.gradle        |  8 ++++++--
 weaver/core/network/corda-interop-app/build.gradle   |  5 +++--
 .../network/corda-interop-app/repositories.gradle    |  3 ++-
 .../corda/corda-simple-application/build.gradle      |  5 +++--
 .../corda-simple-application/clients/build.gradle    |  2 +-
 .../corda-simple-application/repositories.gradle     |  3 ++-
 .../samples/corda/fungible-house-token/build.gradle  |  6 +++---
 weaver/sdks/corda/build.gradle                       |  3 ++-
 .../corda/dev/Corda_Network/build.gradle             |  7 ++++---
 .../corda/dev/Corda_Network2/build.gradle            |  7 ++++---
 .../network-setups/corda/scripts/get-cordapps.sh     |  6 +++---
 .../charts/corda-net/corda-gradle/build.gradle       |  5 +++--
 21 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/commitlint.config.js b/commitlint.config.js
index 69b4242cc7..d758ba850c 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -1,3 +1,9 @@
 module.exports = {
   extends: ["@commitlint/config-conventional"],
+  rules: { "footer-max-line-length": [1, "always", 100] },
+  parserPreset: {
+    parserOpts: {
+      noteKeywords: ["\\[\\d+\\]"],
+    },
+  },
 };
diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.idea/jarRepositories.xml b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.idea/jarRepositories.xml
index dba6d3ccf2..58b8bba1a8 100644
--- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.idea/jarRepositories.xml
+++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/.idea/jarRepositories.xml
@@ -6,16 +6,6 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven7" />
-      <option name="name" value="maven7" />
-      <option name="url" value="https://ci-artifactory.corda.r3cev.com/artifactory/corda-lib-dev" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven6" />
-      <option name="name" value="maven6" />
-      <option name="url" value="https://ci-artifactory.corda.r3cev.com/artifactory/corda-lib" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="maven8" />
       <option name="name" value="maven8" />
@@ -44,7 +34,7 @@
     <remote-repository>
       <option name="id" value="maven5" />
       <option name="name" value="maven5" />
-      <option name="url" value="https://ci-artifactory.corda.r3cev.com/artifactory/corda" />
+      <option name="url" value="https://download.corda.net/maven/corda-dependencies" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="MavenLocal" />
diff --git a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/build.gradle.kts b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/build.gradle.kts
index 5aace1df62..54c5eec734 100644
--- a/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/build.gradle.kts
+++ b/packages/cactus-plugin-ledger-connector-corda/src/main-server/kotlin/gen/kotlin-spring/build.gradle.kts
@@ -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") }
 }
diff --git a/tools/docker/corda-all-in-one/Dockerfile b/tools/docker/corda-all-in-one/Dockerfile
index f9a89d8e06..ab71ff3484 100644
--- a/tools/docker/corda-all-in-one/Dockerfile
+++ b/tools/docker/corda-all-in-one/Dockerfile
@@ -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
 
diff --git a/tools/docker/corda-all-in-one/corda-v4_8-flowdb/Dockerfile b/tools/docker/corda-all-in-one/corda-v4_8-flowdb/Dockerfile
index 41245c93f5..086b0d22ce 100644
--- a/tools/docker/corda-all-in-one/corda-v4_8-flowdb/Dockerfile
+++ b/tools/docker/corda-all-in-one/corda-v4_8-flowdb/Dockerfile
@@ -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
 
diff --git a/tools/docker/corda-all-in-one/corda-v4_8-flowdb/build.gradle b/tools/docker/corda-all-in-one/corda-v4_8-flowdb/build.gradle
index c3c0129a89..c2bfa0ef75 100644
--- a/tools/docker/corda-all-in-one/corda-v4_8-flowdb/build.gradle
+++ b/tools/docker/corda-all-in-one/corda-v4_8-flowdb/build.gradle
@@ -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 {
@@ -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' }
     }
 
diff --git a/tools/docker/corda-all-in-one/corda-v4_8/Dockerfile b/tools/docker/corda-all-in-one/corda-v4_8/Dockerfile
index b31b07c9d0..513908bee2 100644
--- a/tools/docker/corda-all-in-one/corda-v4_8/Dockerfile
+++ b/tools/docker/corda-all-in-one/corda-v4_8/Dockerfile
@@ -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
 
diff --git a/weaver/common/protos-java-kt/build.gradle b/weaver/common/protos-java-kt/build.gradle
index 694aece34c..6d3acc5006 100644
--- a/weaver/common/protos-java-kt/build.gradle
+++ b/weaver/common/protos-java-kt/build.gradle
@@ -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' }
 }
 
@@ -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'
 
 }
 
diff --git a/weaver/common/protos-java-kt/repositories.gradle b/weaver/common/protos-java-kt/repositories.gradle
index 2874c2ab4a..b9d1d4140b 100644
--- a/weaver/common/protos-java-kt/repositories.gradle
+++ b/weaver/common/protos-java-kt/repositories.gradle
@@ -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' }
 }
diff --git a/weaver/core/drivers/corda-driver/build.gradle b/weaver/core/drivers/corda-driver/build.gradle
index 90680da11a..9309439001 100644
--- a/weaver/core/drivers/corda-driver/build.gradle
+++ b/weaver/core/drivers/corda-driver/build.gradle
@@ -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"
@@ -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)
diff --git a/weaver/core/network/corda-interop-app/build.gradle b/weaver/core/network/corda-interop-app/build.gradle
index 33b1e0a94f..69c4b08304 100644
--- a/weaver/core/network/corda-interop-app/build.gradle
+++ b/weaver/core/network/corda-interop-app/build.gradle
@@ -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 {
@@ -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")
diff --git a/weaver/core/network/corda-interop-app/repositories.gradle b/weaver/core/network/corda-interop-app/repositories.gradle
index 510ec62533..e80e6e7809 100644
--- a/weaver/core/network/corda-interop-app/repositories.gradle
+++ b/weaver/core/network/corda-interop-app/repositories.gradle
@@ -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' }
 }
diff --git a/weaver/samples/corda/corda-simple-application/build.gradle b/weaver/samples/corda/corda-simple-application/build.gradle
index a42670cc9d..0c9fe252dc 100644
--- a/weaver/samples/corda/corda-simple-application/build.gradle
+++ b/weaver/samples/corda/corda-simple-application/build.gradle
@@ -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 {
@@ -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()) {
diff --git a/weaver/samples/corda/corda-simple-application/clients/build.gradle b/weaver/samples/corda/corda-simple-application/clients/build.gradle
index 62c001f370..d95d207051 100644
--- a/weaver/samples/corda/corda-simple-application/clients/build.gradle
+++ b/weaver/samples/corda/corda-simple-application/clients/build.gradle
@@ -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'
diff --git a/weaver/samples/corda/corda-simple-application/repositories.gradle b/weaver/samples/corda/corda-simple-application/repositories.gradle
index 2874c2ab4a..b9d1d4140b 100644
--- a/weaver/samples/corda/corda-simple-application/repositories.gradle
+++ b/weaver/samples/corda/corda-simple-application/repositories.gradle
@@ -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' }
 }
diff --git a/weaver/samples/corda/fungible-house-token/build.gradle b/weaver/samples/corda/fungible-house-token/build.gradle
index af15d8766b..9618ba4cc9 100644
--- a/weaver/samples/corda/fungible-house-token/build.gradle
+++ b/weaver/samples/corda/fungible-house-token/build.gradle
@@ -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 {
@@ -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()) {
diff --git a/weaver/sdks/corda/build.gradle b/weaver/sdks/corda/build.gradle
index 3dbe5b2240..9928171eb1 100644
--- a/weaver/sdks/corda/build.gradle
+++ b/weaver/sdks/corda/build.gradle
@@ -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 {
diff --git a/weaver/tests/network-setups/corda/dev/Corda_Network/build.gradle b/weaver/tests/network-setups/corda/dev/Corda_Network/build.gradle
index 703040054c..cf2677d1ed 100644
--- a/weaver/tests/network-setups/corda/dev/Corda_Network/build.gradle
+++ b/weaver/tests/network-setups/corda/dev/Corda_Network/build.gradle
@@ -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 {
@@ -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 {
diff --git a/weaver/tests/network-setups/corda/dev/Corda_Network2/build.gradle b/weaver/tests/network-setups/corda/dev/Corda_Network2/build.gradle
index da4a64fa75..552abecb6b 100644
--- a/weaver/tests/network-setups/corda/dev/Corda_Network2/build.gradle
+++ b/weaver/tests/network-setups/corda/dev/Corda_Network2/build.gradle
@@ -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 {
@@ -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 {
diff --git a/weaver/tests/network-setups/corda/scripts/get-cordapps.sh b/weaver/tests/network-setups/corda/scripts/get-cordapps.sh
index 81d548f60b..0841255227 100755
--- a/weaver/tests/network-setups/corda/scripts/get-cordapps.sh
+++ b/weaver/tests/network-setups/corda/scripts/get-cordapps.sh
@@ -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
diff --git a/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/build.gradle b/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/build.gradle
index 9034345a7d..2dba283f73 100644
--- a/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/build.gradle
+++ b/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/build.gradle
@@ -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 {
@@ -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' }
 }