ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-02 03:06:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[NOTICK]: Change Corda version

Browse Source 
Change Corda version
This commit is contained in:
Jonathan Locke 2019-08-28 15:38:36 +01:00 committed by GitHub
commit 20585266a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
View File

@ -8,4 +8,4 @@ package net.corda.common.logging
* the generated file does not need to be committed to source control (originally added to source control for ease of use) * the generated file does not need to be committed to source control (originally added to source control for ease of use)
*/ */
internal const val CURRENT_MAJOR_RELEASE = "5.0-SNAPSHOT" internal const val CURRENT_MAJOR_RELEASE = "4.3-SNAPSHOT"

2
constants.properties
View File

@ -2,7 +2,7 @@
# because some versions here need to be matched by app authors in # because some versions here need to be matched by app authors in
# their own projects. So don't get fancy with syntax! # their own projects. So don't get fancy with syntax!
cordaVersion=5.0-SNAPSHOT cordaVersion=4.3-SNAPSHOT
gradlePluginsVersion=5.0.2 gradlePluginsVersion=5.0.2
kotlinVersion=1.2.71 kotlinVersion=1.2.71
java8MinUpdateVersion=171 java8MinUpdateVersion=171

4
docker/src/bash/example-mini-network.sh
View File

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
NODE_LIST=("dockerNode1" "dockerNode2" "dockerNode3") NODE_LIST=("dockerNode1" "dockerNode2" "dockerNode3")
NETWORK_NAME=mininet NETWORK_NAME=mininet
CORDAPP_VERSION="5.0-SNAPSHOT" CORDAPP_VERSION="4.3-SNAPSHOT"
DOCKER_IMAGE_VERSION="corda-zulu-5.0-snapshot" DOCKER_IMAGE_VERSION="corda-zulu-4.3-snapshot"
mkdir cordapps mkdir cordapps
rm -f cordapps/* rm -f cordapps/*

12
docs/source/docker-image.rst
View File

@ -21,7 +21,7 @@ In this example, the certificates are stored at ``/home/user/cordaBase/certifica
-v /path/to/cordapps:/opt/corda/cordapps \ -v /path/to/cordapps:/opt/corda/cordapps \
-p 10200:10200 \ -p 10200:10200 \
-p 10201:10201 \ -p 10201:10201 \
corda/corda-zulu-5.0-snapshot:latest corda/corda-zulu-4.3-snapshot:latest
As the node runs within a container, several mount points are required: As the node runs within a container, several mount points are required:
@ -59,7 +59,7 @@ In this example, we have previously generated a network-parameters file using th
-v /home/user/sharedFolder/network-parameters:/opt/corda/network-parameters \ -v /home/user/sharedFolder/network-parameters:/opt/corda/network-parameters \
-p 10200:10200 \ -p 10200:10200 \
-p 10201:10201 \ -p 10201:10201 \
corda/corda-zulu-5.0-snapshot:latest corda/corda-zulu-4.3-snapshot:latest
There is a new mount ``/home/user/sharedFolder/node-infos:/opt/corda/additional-node-infos`` which is used to hold the ``nodeInfo`` of all the nodes within the network. There is a new mount ``/home/user/sharedFolder/node-infos:/opt/corda/additional-node-infos`` which is used to hold the ``nodeInfo`` of all the nodes within the network.
As the node within the container starts up, it will place it's own nodeInfo into this directory. This will allow other nodes also using this folder to see this new node. As the node within the container starts up, it will place it's own nodeInfo into this directory. This will allow other nodes also using this folder to see this new node.
@ -83,7 +83,7 @@ Joining TestNet
-e LOCALITY="London" -e COUNTRY="GB" \ -e LOCALITY="London" -e COUNTRY="GB" \
-v /home/user/docker/config:/etc/corda \ -v /home/user/docker/config:/etc/corda \
-v /home/user/docker/certificates:/opt/corda/certificates \ -v /home/user/docker/certificates:/opt/corda/certificates \
corda/corda-zulu-5.0-snapshot:latest config-generator --testnet corda/corda-zulu-4.3-snapshot:latest config-generator --testnet
``$MY_PUBLIC_ADDRESS`` will be the public address that this node will be advertised on. ``$MY_PUBLIC_ADDRESS`` will be the public address that this node will be advertised on.
``$ONE_TIME_DOWNLOAD_KEY`` is the one-time code provided for joining TestNet. ``$ONE_TIME_DOWNLOAD_KEY`` is the one-time code provided for joining TestNet.
@ -108,7 +108,7 @@ It is now possible to start the node using the generated config and certificates
-v /home/user/corda/samples/bank-of-corda-demo/build/nodes/BankOfCorda/cordapps:/opt/corda/cordapps \ -v /home/user/corda/samples/bank-of-corda-demo/build/nodes/BankOfCorda/cordapps:/opt/corda/cordapps \
-p 10200:10200 \ -p 10200:10200 \
-p 10201:10201 \ -p 10201:10201 \
corda/corda-zulu-5.0-snapshot:latest corda/corda-zulu-4.3-snapshot:latest
Joining an existing Compatibility Zone Joining an existing Compatibility Zone
@ -132,7 +132,7 @@ It is possible to configure the name of the Trust Root file by setting the ``TRU
-e MY_EMAIL_ADDRESS="cordauser@r3.com" \ -e MY_EMAIL_ADDRESS="cordauser@r3.com" \
-v /home/user/docker/config:/etc/corda \ -v /home/user/docker/config:/etc/corda \
-v /home/user/docker/certificates:/opt/corda/certificates \ -v /home/user/docker/certificates:/opt/corda/certificates \
corda/corda-zulu-5.0-snapshot:latest config-generator --generic corda/corda-zulu-4.3-snapshot:latest config-generator --generic
Several environment variables must also be passed to the container to allow it to register: Several environment variables must also be passed to the container to allow it to register:
@ -163,5 +163,5 @@ Once the container has finished performing the initial registration, the node ca
-v /home/user/corda/samples/bank-of-corda-demo/build/nodes/BankOfCorda/cordapps:/opt/corda/cordapps \ -v /home/user/corda/samples/bank-of-corda-demo/build/nodes/BankOfCorda/cordapps:/opt/corda/cordapps \
-p 10200:10200 \ -p 10200:10200 \
-p 10201:10201 \ -p 10201:10201 \
corda/corda-zulu-5.0-snapshot:latest corda/corda-zulu-4.3-snapshot:latest

2
node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt
View File

@ -10,7 +10,7 @@ import kotlin.test.assertEquals
import kotlin.test.assertTrue import kotlin.test.assertTrue
class NodeRPCTests { class NodeRPCTests {
private val CORDA_VERSION_REGEX = "\\d+(\\.\\d+)?(-\\w+)?".toRegex() // e.g. "5.0-SNAPSHOT" private val CORDA_VERSION_REGEX = "\\d+(\\.\\d+)?(-\\w+)?".toRegex()
private val CORDA_VENDOR = "Corda Open Source" private val CORDA_VENDOR = "Corda Open Source"
private val CORDAPPS = listOf(FINANCE_CONTRACTS_CORDAPP, FINANCE_WORKFLOWS_CORDAPP) private val CORDAPPS = listOf(FINANCE_CONTRACTS_CORDAPP, FINANCE_WORKFLOWS_CORDAPP)
private val CORDAPP_TYPES = setOf("Contract CorDapp", "Workflow CorDapp") private val CORDAPP_TYPES = setOf("Contract CorDapp", "Workflow CorDapp")