From 9ccbfe178c267a64da1732fb627b9dabcbefb044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Waldemar=20=C5=BBurowski?= <45210402+wzur-r3@users.noreply.github.com> Date: Tue, 11 Feb 2020 08:40:22 +0000 Subject: [PATCH] Updating Artifactory URLs for Corda OS 4.3 (#5930) * Switching Artifactory URLs from obsolete ci-artifactory to software.r3.com --- build.gradle | 4 ++-- create-jdk8u/build.gradle | 2 +- docker/src/bash/example-mini-network.sh | 8 ++++---- docs/source/network-builder.rst | 4 ++-- docs/source/node-upgrade-notes.rst | 2 +- docs/source/testnet-explorer-corda.rst | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 93001ccf3b..6e49f4f5f1 100644 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,7 @@ buildscript { ext.artifactory_plugin_version = constants.getProperty('artifactoryPluginVersion') ext.hikari_version = '3.3.1' ext.liquibase_version = '3.6.3' - ext.artifactory_contextUrl = 'https://ci-artifactory.corda.r3cev.com/artifactory' + ext.artifactory_contextUrl = 'https://software.r3.com/artifactory' ext.snake_yaml_version = constants.getProperty('snakeYamlVersion') ext.docker_compose_rule_version = '0.35.0' ext.selenium_version = '3.141.59' @@ -153,7 +153,7 @@ buildscript { url 'https://kotlin.bintray.com/kotlinx' } maven { - url "https://ci-artifactory.corda.r3cev.com/artifactory/corda-dependencies-dev" + url "$artifactory_contextUrl/corda-dependencies-dev" } maven { url "$artifactory_contextUrl/corda-releases" diff --git a/create-jdk8u/build.gradle b/create-jdk8u/build.gradle index 7c03dcbe3e..809bfdadc5 100644 --- a/create-jdk8u/build.gradle +++ b/create-jdk8u/build.gradle @@ -3,7 +3,7 @@ buildscript { file("../constants.properties").withInputStream { constants.load(it) } ext { - artifactory_contextUrl = 'https://ci-artifactory.corda.r3cev.com/artifactory' + artifactory_contextUrl = 'https://software.r3.com/artifactory' artifactory_plugin_version = constants.getProperty('artifactoryPluginVersion') proguard_version = constants.getProperty("proguardVersion") } diff --git a/docker/src/bash/example-mini-network.sh b/docker/src/bash/example-mini-network.sh index 33da0fbf25..569ea52e25 100755 --- a/docker/src/bash/example-mini-network.sh +++ b/docker/src/bash/example-mini-network.sh @@ -7,9 +7,9 @@ DOCKER_IMAGE_VERSION="corda-zulu-4.3-SNAPSHOT" mkdir cordapps rm -f cordapps/* -wget -O cordapps/finance-contracts.jar https://ci-artifactory.corda.r3cev.com/artifactory/list/corda-dev/net/corda/corda-finance-contracts/${CORDAPP_VERSION}/corda-finance-contracts-${CORDAPP_VERSION}.jar -wget -O cordapps/finance-workflows.jar https://ci-artifactory.corda.r3cev.com/artifactory/list/corda-dev/net/corda/corda-finance-workflows/${CORDAPP_VERSION}/corda-finance-workflows-${CORDAPP_VERSION}.jar -wget -O cordapps/confidential-identities.jar https://ci-artifactory.corda.r3cev.com/artifactory/list/corda-dev/net/corda/corda-confidential-identities/${CORDAPP_VERSION}/corda-confidential-identities-${CORDAPP_VERSION}.jar +wget -O cordapps/finance-contracts.jar https://software.r3.com/artifactory/list/corda-dev/net/corda/corda-finance-contracts/${CORDAPP_VERSION}/corda-finance-contracts-${CORDAPP_VERSION}.jar +wget -O cordapps/finance-workflows.jar https://software.r3.com/artifactory/list/corda-dev/net/corda/corda-finance-workflows/${CORDAPP_VERSION}/corda-finance-workflows-${CORDAPP_VERSION}.jar +wget -O cordapps/confidential-identities.jar https://software.r3.com/artifactory/list/corda-dev/net/corda/corda-confidential-identities/${CORDAPP_VERSION}/corda-confidential-identities-${CORDAPP_VERSION}.jar rm keystore @@ -83,4 +83,4 @@ do --name ${NODE} \ --network="${NETWORK_NAME}" \ corda/${DOCKER_IMAGE_VERSION}:latest config-generator --generic -done \ No newline at end of file +done diff --git a/docs/source/network-builder.rst b/docs/source/network-builder.rst index 1629920948..168888ee21 100644 --- a/docs/source/network-builder.rst +++ b/docs/source/network-builder.rst @@ -16,7 +16,7 @@ Unlike the official image, a `node.conf` file and CorDapps are embedded into the More backends may be added in future. The tool is open source, so contributions to add more destinations for the containers are welcome! -`Download the Corda Network Builder `_. +`Download the Corda Network Builder `_. .. _pre-requisites: @@ -195,4 +195,4 @@ node has been started correctly, run the following in the previously connected S Shutting down the nodes ----------------------- -Run ``docker kill $(docker ps -q)`` to kill all running Docker processes. \ No newline at end of file +Run ``docker kill $(docker ps -q)`` to kill all running Docker processes. diff --git a/docs/source/node-upgrade-notes.rst b/docs/source/node-upgrade-notes.rst index d6c0da05b4..8830eb9bef 100644 --- a/docs/source/node-upgrade-notes.rst +++ b/docs/source/node-upgrade-notes.rst @@ -50,7 +50,7 @@ for further information. Step 4. Replace ``corda.jar`` with the new version -------------------------------------------------- -Download the latest version of Corda from `our Artifactory site `_. +Download the latest version of Corda from `our Artifactory site `_. Make sure it's available on your path, and that you've read the :doc:`release-notes`, in particular to discover what version of Java this node requires. diff --git a/docs/source/testnet-explorer-corda.rst b/docs/source/testnet-explorer-corda.rst index e0fdbc2fd4..e62452253f 100644 --- a/docs/source/testnet-explorer-corda.rst +++ b/docs/source/testnet-explorer-corda.rst @@ -34,8 +34,8 @@ couple of resources. .. code-block:: bash - wget https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases/net/corda/corda-finance-contracts/|corda_version|/corda-finance-contracts-|corda_version|.jar - wget https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases/net/corda/corda-finance-workflows/|corda_version|/corda-finance-workflows-|corda_version|.jar + wget https://software.r3.com/artifactory/corda-releases/net/corda/corda-finance-contracts/|corda_version|/corda-finance-contracts-|corda_version|.jar + wget https://software.r3.com/artifactory/corda-releases/net/corda/corda-finance-workflows/|corda_version|/corda-finance-workflows-|corda_version|.jar This is required to run some flows to check your connections, and to issue/transfer cash to counterparties. Copy it to the Corda installation location: @@ -70,7 +70,7 @@ couple of resources. .. code:: bash - http://ci-artifactory.corda.r3cev.com/artifactory/corda-releases/net/corda/corda-tools-explorer/|corda_version|-corda/corda-tools-explorer-|corda_version|-corda.jar + https://software.r3.com/artifactory/corda-releases/net/corda/corda-tools-explorer/|corda_version|-corda/corda-tools-explorer-|corda_version|-corda.jar .. warning:: This Node Explorer is incompatible with the Corda Enterprise distribution and vice versa as they currently use different serialisation schemes (Kryo vs AMQP).