diff --git a/Accounts/README.md b/Accounts/README.md index 81a297d5..f304320a 100644 --- a/Accounts/README.md +++ b/Accounts/README.md @@ -6,7 +6,7 @@ This folder features Corda Accounts sample projects. Learn more about [Accounts] This CorDapp mimics a supply chain transaction, where the deal is incorporated among different teams in the companies on both side of the trade.

- Corda + Corda

### [Tic Tac Thor](./tictacthor): @@ -15,3 +15,7 @@ This CorDapp recreates the game of Tic Tac Toe via Corda. It primarily demonstra

Corda

+ +### [World Cup Ticket Booking](./worldcupticketbooking): + +This sample shows you how to integrate accounts and tokens. This sample talks about a scenario where typically when the Cricket season starts, BCCI (Board of Control for Cricket) starts selling tickets. As of now there are multiple dealers whom the BCCI issues tickets and further these dealers sell tickets to their client. We are trying to simulate similar functionality maintaining the entire issuance and selling of the tickets on Corda Platform. \ No newline at end of file diff --git a/Accounts/constants.properties b/Accounts/constants.properties index c20697dd..adcdb361 100644 --- a/Accounts/constants.properties +++ b/Accounts/constants.properties @@ -1,12 +1,12 @@ cordaReleaseGroup=net.corda cordaCoreReleaseGroup=net.corda -cordaVersion=4.9 -cordaCoreVersion=4.9 +cordaVersion=4.10 +cordaCoreVersion=4.10 gradlePluginsVersion=5.0.12 kotlinVersion=1.2.71 junitVersion=4.12 quasarVersion=0.7.10 log4jVersion =2.17.1 -platformVersion=8 +platformVersion=12 slf4jVersion=1.7.25 nettyVersion=4.1.22.Final diff --git a/Accounts/supplychain/Business Flow.png b/Accounts/supplychain/Business_Flow.png similarity index 100% rename from Accounts/supplychain/Business Flow.png rename to Accounts/supplychain/Business_Flow.png diff --git a/Accounts/supplychain/README.md b/Accounts/supplychain/README.md index cc8730a4..87168170 100644 --- a/Accounts/supplychain/README.md +++ b/Accounts/supplychain/README.md @@ -1,6 +1,6 @@ # Accounts_SupplyChain -For More information regarding the Accounts Library, please read at: https://github.com/corda/accounts/blob/master/docs.md +For more information regarding the Accounts Library, please read at: https://github.com/corda/accounts/blob/master/docs.md This sample describes a mock/simple supply chain business flow. @@ -10,10 +10,15 @@ This sample describes a mock/simple supply chain business flow. From the above chart, you can see the flow is going back and forth between different parties' accounts. Please follow the instruction below to experience the [Accounts](https://training.corda.net/libraries/accounts-lib/) library. -# Setting up + +## Pre-Requisites + +For development environment setup, please refer to: [Setup Guide](https://docs.r3.com/en/platform/corda/4.9/community/getting-set-up.html). + +## Runnning the nodes Go into the project directory and build the project ``` -./gradlew clean deployNodes +./gradlew clean build deployNodes ``` Run the project ``` @@ -21,7 +26,7 @@ Run the project ``` Now, you should have four Corda terminals opened automatically. -# Shell Instructions (Part 1) - Creating & Sharing Accounts +## Shell Instructions (Part 1) - Creating & Sharing Accounts Go to the Buyer's node terminal and paste in the following code: (You can select all 7 lines and copy to the terminal all at once) ``` flow start CreateNewAccount acctName: BuyerProcurement @@ -33,7 +38,7 @@ flow start ShareAccountTo acctNameShared: BuyerFinance, shareTo: Seller flow start ShareAccountTo acctNameShared: BuyerWarehouse, shareTo: ShippingCo flow start ShareAccountTo acctNameShared: BuyerWarehouse, shareTo: Seller ``` -This is creating 3 accounts under Buyer's node and sharing with their specific conterpartie's node or account. +This is creating 3 accounts under Buyer's node and sharing with their specific counterparty's node or account. Go to the Seller's node terminal and paste in the following code: ``` @@ -45,14 +50,14 @@ flow start ShareAccountTo acctNameShared: SellerSales, shareTo: Buyer flow start ShareAccountTo acctNameShared: SellerFinance, shareTo: Buyer flow start ShareAccountTo acctNameShared: SellerInventory, shareTo: ShippingCo ``` -This is creating 3 accounts under Seller's node and sharing with their specific conterparty's node or account. +This is creating 3 accounts under Seller's node and sharing with their specific counterparty's node or account. [Optional]: You can run a vaultQuery to see the [AccountInfo](https://training.corda.net/libraries/accounts-lib/#design) that been stored at each node by using: ``` run vaultQuery contractStateType: com.r3.corda.lib.accounts.contracts.states.AccountInfo ``` -# Shell Instructions (Part 2) - Executing Business Flows -## Step 1: Seller's sales team send inovice of $500 to Buyer's procurement team +## Shell Instructions (Part 2) - Executing Business Flows +### Step 1: Seller's sales team send invoice for $500 to Buyer's procurement team navigate to Seller's node terminal and run ``` flow start SendInvoice whoAmI: SellerSales, whereTo: BuyerProcurement, amount: 500 @@ -63,42 +68,42 @@ flow start ViewInboxByAccount acctname: BuyerProcurement ``` You see that the invoice state amount 500 is returned. You can also replace the BuyerProcurement with BuyerWarehouse to see that the non-relevant accounts has no visiblity about the invoice state. -## Step 2: Buyer's procurement team will send an internal message to Buyer's Buyer's finance team +### Step 2: Buyer's procurement team will send an internal message to Buyer's Buyer's finance team Navigate to Buyer's node terminal and type in: ``` flow start InternalMessage fromWho: BuyerProcurement, whereTo: BuyerFinance, message: Send 500 to SellerFinance ``` [Optional verification]: run ```flow start ViewInboxByAccount acctname: BuyerFinance``` at Buyer' node terminal -## Step 3: Buyer's finance team send a payment to Seller's finance team +### Step 3: Buyer's finance team send a payment to Seller's finance team Navigate to Buyer's node terminal and type in: ``` flow start SendPayment whoAmI: BuyerFinance, whereTo: SellerFinance, amount: 500 ``` [Optional verification]: run ```flow start ViewInboxByAccount acctname: SellerFinance``` at Seller's node terminal -## Step 4: Seller's finance team send an internal message to Seller's inventory team to instruct them to send the cargo +### Step 4: Seller's finance team send an internal message to Seller's inventory team to instruct them to send the cargo Navigate to Seller's node terminal and type in ``` flow start InternalMessage fromWho: SellerFinance, whereTo: SellerInventory, message: send Cargo to Buyer ``` [Optional verification]: run ```flow start ViewInboxByAccount acctname: SellerInventory``` at Seller's node terminal -## step 5: Seller's inventory team send a shipping work order for shipping company +### step 5: Seller's inventory team send a shipping work order for shipping company Navigate to Seller's node terminal and type in ``` flow start SendShippingRequest whoAmI: SellerInventory, whereTo: BuyerWarehouse, shipper: ShippingCo, Cargo: 10 boxes of Books ``` [Optional verification]: run ```run vaultQuery contractStateType: ShippingRequestState``` at ShippingCo's node terminal -## Step 6: Shipping company sends the cargo to Buyer's warehouse +### Step 6: Shipping company sends the cargo to Buyer's warehouse Navigate to ShippingCo's node terminal and type in ``` flow start SendCargo pickupFrom: SellerInventory, shipTo: BuyerWarehouse, cargo: Books ``` [Optional verification]: run ```flow start ViewInboxByAccount acctname: BuyerWarehouse``` at Buyer's node terminal -## Now, the entire business chain is completed. +### Now, the entire business chain is completed. diff --git a/Accounts/supplychain/build.gradle b/Accounts/supplychain/build.gradle index d85ffd43..4d70ff49 100644 --- a/Accounts/supplychain/build.gradle +++ b/Accounts/supplychain/build.gradle @@ -26,7 +26,7 @@ buildscript { repositories { mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda-releases' } + maven { url 'https://download.corda.net/maven/corda-releases' } } dependencies { @@ -44,10 +44,10 @@ allprojects { mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } 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' } } @@ -89,7 +89,7 @@ dependencies { cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" - cordaDriver "net.corda:corda-shell:4.9" + cordaDriver "net.corda:corda-shell:4.10" //accounts diff --git a/Accounts/supplychain/repositories.gradle b/Accounts/supplychain/repositories.gradle index 7dc03179..9797c0ea 100644 --- a/Accounts/supplychain/repositories.gradle +++ b/Accounts/supplychain/repositories.gradle @@ -2,6 +2,6 @@ repositories { mavenLocal() mavenCentral() maven { url 'https://jitpack.io' } - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'https://repo.gradle.org/gradle/libs-releases' } } diff --git a/Accounts/tictacthor/README.md b/Accounts/tictacthor/README.md index b989e03f..5c388345 100644 --- a/Accounts/tictacthor/README.md +++ b/Accounts/tictacthor/README.md @@ -1,31 +1,36 @@ # Tic Tac Thor -This CorDapp recreates the game of Tic Tac Toe via Corda. It primarilly demonstrates how you can have [LinearState](https://docs.corda.net/docs/corda-os/api-states.html#linearstate) transactions between cross-node accounts. +This CorDapp recreates the game of Tic Tac Toe via Corda. It primarily demonstrates how you can have [LinearState](https://docs.corda.net/docs/corda-os/api-states.html#linearstate) transactions between cross-node accounts.

Corda

+ +## Pre-Requisites + +For development environment setup, please refer to: [Setup Guide](https://docs.r3.com/en/platform/corda/4.9/community/getting-set-up.html). + ## Running the sample Deploy and run the nodes by: ``` -./gradlew deployNodes +./gradlew clean build deployNodes ./build/nodes/runnodes ``` -Then you will need to also start the spring server for the Cordapp by running the following commands seperately: +Then you will need to also start the spring server for the CorDapp by running the following commands separately: `./gradlew bootRunDevRel`will have the DevRel server running on 8080 port , and `./gradlew bootRunSOE`will start the Solution Engineering server on 8090 port -## Operating the Cordapp -Now go to postman and excute the following in order: (All of the API are POST request!) +## Operating the CorDapp +Now go to postman and execute the following in order: (All the APIs are POST requests!) 1. Create an account on DevRel node: `http://localhost:8080/createAccount/PeterLi` 2. Create an account on SoE node: `http://localhost:8090/createAccount/DavidWinner` 3. Peter now requests game with David: `http://localhost:8080/requestGameWith/PeterLi/SolutionEng/DavidWinner` -4. David has to accept the challenege: `http://localhost:8090/acceptGameInvite/DavidWinner/DevRel/PeterLi` +4. David has to accept the challenge: `http://localhost:8090/acceptGameInvite/DavidWinner/DevRel/PeterLi` 5. Game Starts, and Peter makes the first move: `http://localhost:8080/startGameAndFirstMove/PeterLi/DavidWinner/0` 6. David's turn: `http://localhost:8090/submitMove/DavidWinner/PeterLi/4` API Syntax: `http://localhost:8080/submitMove/WHO-AM-I/MY-COUNTERPART/POSITION` -From here, you can start play the game by changing the very last number from the `submitMove`API call. The game board is representated by an 1-D array: What we just ran can transfer into a tic-tac-toe game board like the one we see on the right. +From here, you can start play the game by changing the very last number from the `submitMove`API call. The game board is represented by an 1-D array: What we just ran can transfer into a tic-tac-toe game board like the one we see on the right. ``` │0│1│2│ │O│ │ │ │3│4│5│ -> │ │X│ │ @@ -34,7 +39,7 @@ From here, you can start play the game by changing the very last number from the The Game will automatically end when one player wins the game. You can also run `run vaultQuery contractStateType: net.corda.samples.tictacthor.states.BoardState` at any given time to see the board games stored in vault. -now if you want to fast forward the game, Play the following moves in order: +now if you want to fast-forward the game, Play the following moves in order: According to syntax: we should have `http://localhost:8080/submitMove/PeterLi/DavidWinner/3` for the first move below. ``` * Peter: 3 │O│ │ │ @@ -49,7 +54,7 @@ We can play a bit more about the accounts. Now let's create two accounts, a new * Create an account on SoE node: `http://localhost:8090/createAccount/ThorG` Now, try to have Anthony play a game with Thor while start a new game between Peter and David. It worked! -One key feature about account is that, each account's data is segregated, meaning that it can be enforced that each account will not be able to see other account's data. In this sample cordapp, the game is queried by account name. Therefore, we see that each account only knows about the game that he participated. Account Peter doesn't know anything about the game between Thor and Anthony. +One key feature about account is that, each account's data is segregated, meaning that it can be enforced that each account will not be able to see other account's data. In this sample CorDapp, the game is queried by account name. Therefore, we see that each account only knows about the game that he participated. Account Peter doesn't know anything about the game between Thor and Anthony. ## Credit This project is inspired and evolved from a simple [tic-tac-toe](https://github.com/thorgilman/tictactoe) game on Corda by Thor Gilman. diff --git a/Accounts/tictacthor/build.gradle b/Accounts/tictacthor/build.gradle index 5f3ecdca..b33c32b0 100644 --- a/Accounts/tictacthor/build.gradle +++ b/Accounts/tictacthor/build.gradle @@ -32,7 +32,7 @@ buildscript { mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda-releases' } + maven { url 'https://download.corda.net/maven/corda-releases' } } dependencies { @@ -52,10 +52,10 @@ allprojects { mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } 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' } } @@ -100,7 +100,7 @@ dependencies { cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" - cordaDriver "net.corda:corda-shell:4.9" + cordaDriver "net.corda:corda-shell:4.10" //Account lib cordapp "$confidential_id_release_group:ci-workflows:$confidential_id_release_version" diff --git a/Accounts/tictacthor/clients/build.gradle b/Accounts/tictacthor/clients/build.gradle index 5bc011bd..bbba1aea 100644 --- a/Accounts/tictacthor/clients/build.gradle +++ b/Accounts/tictacthor/clients/build.gradle @@ -8,6 +8,12 @@ sourceSets { } } +configurations { + all { + exclude group: 'ch.qos.logback', module: 'logback-classic' + } +} + dependencies { // Corda dependencies. compile "$corda_release_group:corda-rpc:$corda_release_version" diff --git a/Accounts/tictacthor/repositories.gradle b/Accounts/tictacthor/repositories.gradle index 3198e5c6..8be7b630 100644 --- a/Accounts/tictacthor/repositories.gradle +++ b/Accounts/tictacthor/repositories.gradle @@ -3,6 +3,6 @@ repositories { mavenCentral() maven { url 'https://jitpack.io' } - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'https://repo.gradle.org/gradle/libs-releases' } } diff --git a/Accounts/worldcupticketbooking/README.md b/Accounts/worldcupticketbooking/README.md index 5cf3797a..324533db 100644 --- a/Accounts/worldcupticketbooking/README.md +++ b/Accounts/worldcupticketbooking/README.md @@ -1,4 +1,4 @@ -# T20 Cricket World Cup Ticket Booking Cordapp [](https://ide.corda.net/?folder=/home/coder/samples-java/Accounts/worldcupticketbooking) +# T20 Cricket World Cup Ticket Booking CorDapp ## Introduction @@ -11,10 +11,10 @@ of the tickets on Corda Platform. Nodes: * BCCI node: source of ticket creation. All the tickets in the market are created by this node. -* Bank Node: souce of money. All the money that is transacted between each individual is issued by this node. +* Bank Node: source of money. All the money that is transacted between each individual is issued by this node. * Dealer1 Node: Dealer Agency 1 and it includes - * agent1 account: who will get ticket from the BCCI and sell to others. (To demostrate same node account token transaction.) - * buyer1 account: who will get the ticket from agent1 and later sell to buyer3 (To demostrate cross node account token transaction) + * agent1 account: who will get ticket from the BCCI and sell to others. (To demonstrate same node account token transaction.) + * buyer1 account: who will get the ticket from agent1 and later sell to buyer3 (To demonstrate cross node account token transaction) * buyer2 account: who will buy the ticket from buyer3. * Dealer2 Node: Dealer Agency 2 and it includes * buyer3 account: who will get the ticket from buyer1 and sell to buyer2 @@ -23,41 +23,49 @@ Nodes: Corda

+## Pre-Requisites + +For development environment setup, please refer to: [Setup Guide](https://docs.r3.com/en/platform/corda/4.9/community/getting-set-up.html). + +## Running the sample +Deploy and run the nodes by: +``` +./gradlew clean build deployNodes +./build/nodes/runnodes +``` ### Step 1 +Run the below flow in Dealer1's interactive node shell. This will create the agent1, buyer1 and buyer2 accounts on the Dealer1 node and share this account info with BCCI, Bank, and Dealer2 node respectively. ``` flow start CreateAndShareAccountFlow accountName: agent1, partyToShareAccountInfoToList: [BCCI, Dealer2] flow start CreateAndShareAccountFlow accountName: buyer1, partyToShareAccountInfoToList: [Bank, Dealer2] flow start CreateAndShareAccountFlow accountName: buyer2, partyToShareAccountInfoToList: [Bank, Dealer2] ``` -Run the above flow on the Dealer1 node. This will create the agent1, buyer1 and buyer2 accounts on the Dealer1 node and share this account info with BCCI, Bank, and Dealer2 node respecticely. -Then let's go to the Dealer2 node and create buyer3 account: +Then let's go to the Dealer2 interactive node shell and create buyer3 account: ``` flow start CreateAndShareAccountFlow accountName: buyer3, partyToShareAccountInfoToList: [Bank, Dealer1] ``` -Run the below query to confirm if accounts are created on Dealer1 node. Also run the above query on Bank and BCCI node to confirm if account info is shared with these nodes. +Run the below query to confirm if accounts are created on Dealer1 node. Also run the below query on Bank and BCCI's interactive node shell to confirm if account info is shared with these nodes. run vaultQuery contractStateType : com.r3.corda.lib.accounts.contracts.states.AccountInfo - - ### Step 2 +Run the below command on the Bank's interactive node shell, which will issue 20 USD to buyer1 account. ``` start IssueCashFlow accountName : buyer1 , currency : USD , amount : 10 start IssueCashFlow accountName : buyer3 , currency : USD , amount : 20 start IssueCashFlow accountName : buyer2 , currency : USD , amount : 50 ``` -Run the above command on the Bank node, which will issue 20 USD to buyer1 account. ### Step 3 ``` flow start QuerybyAccount whoAmI: buyer1 ``` -You can check balance of buyer1 account at Dealer1's node -[Option] You can also run the below command to confirm if 20 USD fungible tokens are stored at Dealer1's node. The current holder field in the output will be an [AnonymousParty](https://docs.corda.net/docs/corda-os/4.4/api-identity.html#party) which specifies an account. +You can check balance of buyer1 account at Dealer1's interactive node shell. +[Option] You can also run the below command to confirm if 20 USD fungible tokens are stored at Dealer1's node. The current holder field in the output will be an [AnonymousParty](https://docs.r3.com/en/platform/corda/4.9/community/api-identity.html) which specifies an account. ``` run vaultQuery contractStateType : com.r3.corda.lib.tokens.contracts.states.FungibleToken ``` @@ -65,25 +73,27 @@ run vaultQuery contractStateType : com.r3.corda.lib.tokens.contracts.states.Fung ### Step 4 +Run the below flow on BCCI's node. BCCI node will create base token type for the T20 Ticket for the match MumbaiIndians Vs RajasthanRoyals. The ticket ID returned from this flow will be needed in the next steps. + start CreateT20CricketTicketTokenFlow ticketTeam : MumbaiIndiansVsRajasthanRoyals -Run the above flow on BCCI's node. BCCI node will create base token type for the T20 Ticket for the match MumbaiIndians Vs RajasthanRoyals. The ticket ID returned from this flow will be needed in the next steps. -You can see your ticket state generated via vault query at the BCCI'd node: +You can see your ticket state generated via vault query at the BCCI's node: run vaultQuery contractStateType : com.t20worldcup.states.T20CricketTicket ### Step 5 +Run the below flow on BCCI's node to issue a non-fungible token based off the token type which we created in Step5. You will need to replace the `` with the uuid returned from step 6. This token will be issued by the BCCI node to agent1 account on Dealer1 node. + start IssueNonFungibleTicketFlow tokenId : , dealerAccountName : agent1 -Run the above flow on BCCI's node to issue a non fungible token based off the token type which we created in Step5. You will need to replace the `` with the uuid returned from step 6. This token will be issued by the BCCI node to agent1 account on Dealer1 node. Switching to the Dealer1's node, you can run the following code to confirm if the token has been issued to the dealer1 account. ``` flow start QuerybyAccount whoAmI: agent1 ``` -You can also look for the acutal state that is recoreded by: +You can also look for the actual state that is recorded by: run vaultQuery contractStateType : com.r3.corda.lib.tokens.contracts.states.NonFungibleToken Note that, the current holder it will be a key representing the account. @@ -97,7 +107,7 @@ flow start DVPAccountsOnSameNode tokenId: , buyerAccountName This is the DVP flow where the buyer(buyer1 account on Dealer1 node) account will pay cash to seller account(agent1 account on Dealer1 node), and the seller account will transfer the ticket token to the buyer. Again, replace the `` with the uuid generated in step 6. ### Step 7 -Now lets continue the flow logic to intiate an ticket sale between buyer1 and buyer3. Go to Dealer2 node and run the following code: +Now let's continue the flow logic to initiate a ticket sale between buyer1 and buyer3. Go to Dealer2 node and run the following code: ``` flow start DVPAccountsHostedOnDifferentNodes tokenId: , buyerAccountName: buyer3, sellerAccountName: buyer1, costOfTicket: 10, currency: USD @@ -130,30 +140,32 @@ For someone who is looking into how to only transfer tokens from one account to ### Step 1 +Run the below flow on the Dealer1 node. This will create the agent1, buyer1 and buyer2 accounts on the Dealer1 node and share this account info with BCCI, Bank, and Dealer2 node respectively. + ``` flow start CreateAndShareAccountFlow accountName: agent1, partyToShareAccountInfoToList: [BCCI, Dealer2] flow start CreateAndShareAccountFlow accountName: buyer1, partyToShareAccountInfoToList: [Bank, Dealer2] flow start CreateAndShareAccountFlow accountName: buyer2, partyToShareAccountInfoToList: [Bank, Dealer2] ``` -Run the above flow on the Dealer1 node. This will create the agent1, buyer1 and buyer2 accounts on the Dealer1 node and share this account info with BCCI, Bank, and Dealer2 node respecticely. Then let's go to the Dealer2 node and create buyer3 account: ``` flow start CreateAndShareAccountFlow accountName: buyer3, partyToShareAccountInfoToList: [Bank, Dealer1] ``` -Run the below query to confirm if accounts are created on Dealer1 node. Also run the above query on Bank and BCCI node to confirm if account info is shared with these nodes. +Run the below query to confirm if accounts are created on Dealer1 node. Also run the below query on Bank and BCCI node to confirm if account info is shared with these nodes. run vaultQuery contractStateType : com.r3.corda.lib.accounts.contracts.states.AccountInfo ### Step 2 +Run the below command on the Bank node, which will issue 77 USD to buyer1 account. + ``` start IssueCashFlow accountName : buyer1 , currency : USD , amount : 77 ``` -Run the above command on the Bank node, which will issue 77 USD to buyer1 account. ### Step 3 ``` diff --git a/Accounts/worldcupticketbooking/build.gradle b/Accounts/worldcupticketbooking/build.gradle index bc8a87d7..e567053f 100644 --- a/Accounts/worldcupticketbooking/build.gradle +++ b/Accounts/worldcupticketbooking/build.gradle @@ -37,7 +37,7 @@ buildscript { mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda-releases' } + maven { url 'https://download.corda.net/maven/corda-releases' } // maven { url 'http://software.r3.com/artifactory/corda-lib-dev' } maven { url 'http://software.r3.com/artifactory/corda-lib' } } @@ -59,10 +59,10 @@ allprojects { mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } // Can be removed post-release - used to get nightly snapshot build. - maven { url 'https://software.r3.com/artifactory/corda-lib' } - maven { url 'https://software.r3.com/artifactory/corda-lib-dev' } + maven { url 'https://download.corda.net/maven/corda-lib' } + maven { url 'https://download.corda.net/maven/corda-lib-dev' } // maven { url 'https://jitpack.io' } maven { url "https://repo.gradle.org/gradle/libs-releases-local" } } @@ -107,7 +107,7 @@ dependencies { cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" - cordaDriver "net.corda:corda-shell:4.9" + cordaDriver "net.corda:corda-shell:4.10" //accounts cordapp "$accounts_release_group:accounts-contracts:$accounts_release_version" diff --git a/Accounts/worldcupticketbooking/clients/build.gradle b/Accounts/worldcupticketbooking/clients/build.gradle index bfed0e1f..c6be5398 100644 --- a/Accounts/worldcupticketbooking/clients/build.gradle +++ b/Accounts/worldcupticketbooking/clients/build.gradle @@ -8,6 +8,12 @@ sourceSets { } } +configurations { + all { + exclude group: 'ch.qos.logback', module: 'logback-classic' + } +} + dependencies { // Corda dependencies. compile "$corda_release_group:corda-rpc:$corda_release_version" diff --git a/Accounts/worldcupticketbooking/repositories.gradle b/Accounts/worldcupticketbooking/repositories.gradle index 0d2802f1..072b616b 100644 --- a/Accounts/worldcupticketbooking/repositories.gradle +++ b/Accounts/worldcupticketbooking/repositories.gradle @@ -3,7 +3,7 @@ repositories { mavenCentral() maven { url 'https://jitpack.io' } - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'https://repo.gradle.org/gradle/libs-releases' } maven { url 'http://software.r3.com/artifactory/corda-lib-dev' } maven { url 'http://software.r3.com/artifactory/corda-lib' } diff --git a/Advanced/auction-cordapp/build.gradle b/Advanced/auction-cordapp/build.gradle index 06558a13..4d87e6dc 100644 --- a/Advanced/auction-cordapp/build.gradle +++ b/Advanced/auction-cordapp/build.gradle @@ -21,7 +21,8 @@ buildscript { mavenLocal() mavenCentral() - 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' } } dependencies { @@ -39,7 +40,8 @@ allprojects { mavenLocal() mavenCentral() - 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://jitpack.io' } maven { url 'https://repo.gradle.org/gradle/libs-releases' } } @@ -87,7 +89,8 @@ dependencies { cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" - cordaDriver "net.corda:corda-shell:4.9" + + cordaDriver "net.corda:corda-shell:4.10" } diff --git a/Advanced/auction-cordapp/client/build.gradle b/Advanced/auction-cordapp/client/build.gradle index e9184696..e94a0e39 100644 --- a/Advanced/auction-cordapp/client/build.gradle +++ b/Advanced/auction-cordapp/client/build.gradle @@ -1,5 +1,11 @@ apply plugin: 'org.springframework.boot' +configurations { + all { + exclude group: 'ch.qos.logback', module: 'logback-classic' + } +} + dependencies { // Corda dependencies. compile "$corda_release_group:corda-rpc:$corda_release_version" diff --git a/Advanced/auction-cordapp/contracts/build.gradle b/Advanced/auction-cordapp/contracts/build.gradle index 6d9813f8..d35b4df3 100644 --- a/Advanced/auction-cordapp/contracts/build.gradle +++ b/Advanced/auction-cordapp/contracts/build.gradle @@ -23,7 +23,7 @@ dependencies { // Corda dependencies. cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version" - compileOnly "$corda_release_group:corda-testserver-impl:$corda_release_version" + cordaRuntime "$corda_release_group:corda:$corda_release_version" cordaRuntime "$corda_release_group:corda-testserver:$corda_release_version" diff --git a/Advanced/constants.properties b/Advanced/constants.properties index 5a20bdc4..adcdb361 100644 --- a/Advanced/constants.properties +++ b/Advanced/constants.properties @@ -1,12 +1,12 @@ cordaReleaseGroup=net.corda cordaCoreReleaseGroup=net.corda -cordaVersion=4.9 -cordaCoreVersion=4.9 +cordaVersion=4.10 +cordaCoreVersion=4.10 gradlePluginsVersion=5.0.12 kotlinVersion=1.2.71 junitVersion=4.12 quasarVersion=0.7.10 log4jVersion =2.17.1 -platformVersion=10 +platformVersion=12 slf4jVersion=1.7.25 nettyVersion=4.1.22.Final diff --git a/Advanced/duediligence-cordapp/build.gradle b/Advanced/duediligence-cordapp/build.gradle index 128abe22..ef682822 100644 --- a/Advanced/duediligence-cordapp/build.gradle +++ b/Advanced/duediligence-cordapp/build.gradle @@ -23,7 +23,7 @@ buildscript {//properties that you need to build the project mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda-releases' } + maven { url 'https://download.corda.net/maven/corda-releases' } } dependencies { @@ -42,7 +42,7 @@ allprojects {//Properties that you need to compile your project (The application mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'https://jitpack.io' } } @@ -83,7 +83,7 @@ dependencies { cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" - cordaDriver "net.corda:corda-shell:4.9" + cordaDriver "net.corda:corda-shell:4.10" } diff --git a/Advanced/duediligence-cordapp/clients/build.gradle b/Advanced/duediligence-cordapp/clients/build.gradle index ff114932..0585ba30 100644 --- a/Advanced/duediligence-cordapp/clients/build.gradle +++ b/Advanced/duediligence-cordapp/clients/build.gradle @@ -8,6 +8,12 @@ sourceSets { } } +configurations { + all { + exclude group: 'ch.qos.logback', module: 'logback-classic' + } +} + dependencies { // Corda dependencies. compile "$corda_release_group:corda-rpc:$corda_release_version" diff --git a/Advanced/duediligence-cordapp/repositories.gradle b/Advanced/duediligence-cordapp/repositories.gradle index 3198e5c6..8be7b630 100644 --- a/Advanced/duediligence-cordapp/repositories.gradle +++ b/Advanced/duediligence-cordapp/repositories.gradle @@ -3,6 +3,6 @@ repositories { mavenCentral() maven { url 'https://jitpack.io' } - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'https://repo.gradle.org/gradle/libs-releases' } } diff --git a/Advanced/duediligence-cordapp/workflows/src/test/java/net/corda/samples/duediligence/FlowTests.java b/Advanced/duediligence-cordapp/workflows/src/test/java/net/corda/samples/duediligence/FlowTests.java index 045d9f6f..ae0438d4 100644 --- a/Advanced/duediligence-cordapp/workflows/src/test/java/net/corda/samples/duediligence/FlowTests.java +++ b/Advanced/duediligence-cordapp/workflows/src/test/java/net/corda/samples/duediligence/FlowTests.java @@ -18,7 +18,7 @@ import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import static org.jgroups.util.Util.assertEquals; +import static org.junit.Assert.assertEquals; public class FlowTests { private MockNetwork network; diff --git a/Advanced/negotiation-cordapp/build.gradle b/Advanced/negotiation-cordapp/build.gradle index 504e0e05..d98cff3d 100644 --- a/Advanced/negotiation-cordapp/build.gradle +++ b/Advanced/negotiation-cordapp/build.gradle @@ -24,13 +24,13 @@ buildscript { mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'http://software.r3.com/artifactory/corda-lib' } maven { url 'http://software.r3.com/artifactory/corda-lib-dev' } - maven { url 'https://software.r3.com/artifactory/corda-releases' } + maven { url 'https://download.corda.net/maven/corda-releases' } // Corda dependencies for the patched Quasar version - maven { url "https://software.r3.com/artifactory/corda-dependencies" } // access to the patched Quasar version + maven { url "https://download.corda.net/maven/corda-dependencies" } // access to the patched Quasar version } dependencies { @@ -49,10 +49,10 @@ allprojects { mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } // Can be removed post-release - used to get nightly snapshot build. - maven { url 'https://software.r3.com/artifactory/corda-lib' } - maven { url 'https://software.r3.com/artifactory/corda-lib-dev' } + maven { url 'https://download.corda.net/maven/corda-lib' } + maven { url 'https://download.corda.net/maven/corda-lib-dev' } maven { url 'https://jitpack.io' } maven { url "https://repo.gradle.org/gradle/libs-releases-local" } } @@ -94,7 +94,7 @@ dependencies { cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" - cordaDriver "net.corda:corda-shell:4.9" + cordaDriver "net.corda:corda-shell:4.10" } diff --git a/Advanced/negotiation-cordapp/repositories.gradle b/Advanced/negotiation-cordapp/repositories.gradle index 7dc03179..9797c0ea 100644 --- a/Advanced/negotiation-cordapp/repositories.gradle +++ b/Advanced/negotiation-cordapp/repositories.gradle @@ -2,6 +2,6 @@ repositories { mavenLocal() mavenCentral() maven { url 'https://jitpack.io' } - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'https://repo.gradle.org/gradle/libs-releases' } } diff --git a/Advanced/obligation-cordapp/README.md b/Advanced/obligation-cordapp/README.md index 87830236..952c7f9a 100644 --- a/Advanced/obligation-cordapp/README.md +++ b/Advanced/obligation-cordapp/README.md @@ -1,6 +1,6 @@ # Obligation Cordap -This Cordapp is the complete implementation of our signature IOU (I-owe-you) demonstration. +This CorDapp is the complete implementation of our signature IOU (I-owe-you) demonstration. ## Concepts @@ -9,12 +9,12 @@ An IOU is someone who has cash that is paying it back to someone they owe it to. ### Flows -The first flows are the ones that issue the original cash and assets. You can find that the cash flow at `SelfIssueCashFlow.java` and the IOU issurance in `IOUIssueFlow.java`. +The first flows are the ones that issue the original cash and assets. You can find that the cash flow at `SelfIssueCashFlow.java` and the IOU issuance in `IOUIssueFlow.java`. The next flow is the one that transfers ownership of that asset over to another party. That can be found in `IOUTransferFlow.java`. -Finally, once we have the ability to transfer assets, we just need to settle up. That functiionality can be found here in `IOUSettleFlow.java` +Finally, once we have the ability to transfer assets, we just need to settle up. That functionality can be found here in `IOUSettleFlow.java` diff --git a/Advanced/obligation-cordapp/build.gradle b/Advanced/obligation-cordapp/build.gradle index e45c7b1a..15bd2c09 100644 --- a/Advanced/obligation-cordapp/build.gradle +++ b/Advanced/obligation-cordapp/build.gradle @@ -23,7 +23,7 @@ buildscript { mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda-releases' } + maven { url 'https://download.corda.net/maven/corda-releases' } } dependencies { @@ -41,9 +41,8 @@ allprojects { repositories { mavenLocal() - mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'https://jitpack.io' } } @@ -92,7 +91,7 @@ dependencies { cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" - cordaDriver "net.corda:corda-shell:4.9" + cordaDriver "net.corda:corda-shell:4.10" } diff --git a/Advanced/obligation-cordapp/clients/build.gradle b/Advanced/obligation-cordapp/clients/build.gradle index 26b485b1..6bf3c08f 100644 --- a/Advanced/obligation-cordapp/clients/build.gradle +++ b/Advanced/obligation-cordapp/clients/build.gradle @@ -26,6 +26,12 @@ dependencyManagement { } } +configurations { + all { + exclude group: 'ch.qos.logback', module: 'logback-classic' + } +} + dependencies { // CorDapp dependencies. compile project(":contracts") diff --git a/Advanced/obligation-cordapp/contracts/build.gradle b/Advanced/obligation-cordapp/contracts/build.gradle index 71bf133b..ae474abf 100644 --- a/Advanced/obligation-cordapp/contracts/build.gradle +++ b/Advanced/obligation-cordapp/contracts/build.gradle @@ -33,7 +33,6 @@ dependencies { cordaRuntime "$corda_release_group:corda:$corda_release_version" cordaCompile "$corda_release_group:corda-finance-contracts:$corda_release_version" cordaCompile "$corda_release_group:corda-finance-workflows:$corda_release_version" - compileOnly "$corda_release_group:corda-testserver-impl:$corda_release_version" testCompile "$corda_release_group:corda-node-driver:$corda_release_version" cordapp "$corda_release_group:corda-finance-contracts:$corda_release_version" cordapp "$corda_release_group:corda-finance-workflows:$corda_release_version" diff --git a/Advanced/obligation-cordapp/repositories.gradle b/Advanced/obligation-cordapp/repositories.gradle index 3198e5c6..8be7b630 100644 --- a/Advanced/obligation-cordapp/repositories.gradle +++ b/Advanced/obligation-cordapp/repositories.gradle @@ -3,6 +3,6 @@ repositories { mavenCentral() maven { url 'https://jitpack.io' } - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'https://repo.gradle.org/gradle/libs-releases' } } diff --git a/Advanced/secretsanta-cordapp/build.gradle b/Advanced/secretsanta-cordapp/build.gradle index fbf27d68..622a2636 100644 --- a/Advanced/secretsanta-cordapp/build.gradle +++ b/Advanced/secretsanta-cordapp/build.gradle @@ -31,7 +31,7 @@ buildscript { //properties that you need to build the project maven { url 'https://jitpack.io' } maven { url 'https://repo.gradle.org/gradle/libs-releases' } maven { url 'http://software.r3.com/artifactory/corda-lib' } - maven { url 'https://software.r3.com/artifactory/corda-releases' } + maven { url 'https://download.corda.net/maven/corda-releases' } } dependencies { @@ -55,7 +55,7 @@ allprojects {//Properties that you need to compile your project (The application mavenCentral() maven { url 'https://jitpack.io' } - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } } tasks.withType(JavaCompile) { @@ -105,7 +105,7 @@ dependencies { cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" - cordaDriver "net.corda:corda-shell:4.9" + cordaDriver "net.corda:corda-shell:4.10" } diff --git a/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CheckAssignedSantaFlowTests.java b/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CheckAssignedSantaFlowTests.java index b6a45245..8102b6e6 100644 --- a/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CheckAssignedSantaFlowTests.java +++ b/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CheckAssignedSantaFlowTests.java @@ -18,7 +18,7 @@ import java.time.Instant; import java.util.*; -import static org.jgroups.util.Util.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; public class CheckAssignedSantaFlowTests { diff --git a/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CreateSantaSessionFlowTests.java b/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CreateSantaSessionFlowTests.java index e218806e..b617bca2 100644 --- a/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CreateSantaSessionFlowTests.java +++ b/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CreateSantaSessionFlowTests.java @@ -20,8 +20,8 @@ import java.util.Arrays; import java.util.LinkedHashMap; -import static org.jgroups.util.Util.assertEquals; -import static org.jgroups.util.Util.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertNull; public class CreateSantaSessionFlowTests { diff --git a/Advanced/snakesandladders-cordapp/README.md b/Advanced/snakesandladders-cordapp/README.md index ae80630b..2e5f5b9a 100644 --- a/Advanced/snakesandladders-cordapp/README.md +++ b/Advanced/snakesandladders-cordapp/README.md @@ -2,13 +2,13 @@ This sample implements a simple Snakes And Ladder Game on Corda. -Its a simple game which has a board with numbers from 1 to 100. Each player starts at 1. -Players takes turn to roll a dice and move as many places as they rolled. If a player lands on a number -with a ladder thay climb up using the ladder or if they land in a number with a snake they move down on the board. +It's a simple game which has a board with numbers from 1 to 100. Each player starts at 1. +Players take turn to roll a dice and move as many places as they rolled. If a player lands on a number +with a ladder they climb up using the ladder or if they land in a number with a snake they move down on the board. The player who reach 100 first wins. -The cordapp runs a network having 4 nodes, -1. Classis Games +The CorDapp runs a network having 4 nodes, +1. Classic Games 2. Mega Games 3. Oracle 4. Notary diff --git a/Advanced/snakesandladders-cordapp/build.gradle b/Advanced/snakesandladders-cordapp/build.gradle index ecf1a8f4..f30e7f56 100644 --- a/Advanced/snakesandladders-cordapp/build.gradle +++ b/Advanced/snakesandladders-cordapp/build.gradle @@ -29,7 +29,7 @@ buildscript { mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda-releases' } + maven { url 'https://download.corda.net/maven/corda-releases' } } dependencies { @@ -48,10 +48,10 @@ allprojects { mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } 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' } } @@ -98,7 +98,7 @@ dependencies { cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" - cordaDriver "net.corda:corda-shell:4.9" + cordaDriver "net.corda:corda-shell:4.10" //accounts diff --git a/Advanced/snakesandladders-cordapp/client/build.gradle b/Advanced/snakesandladders-cordapp/client/build.gradle index 79ce3545..82103fec 100644 --- a/Advanced/snakesandladders-cordapp/client/build.gradle +++ b/Advanced/snakesandladders-cordapp/client/build.gradle @@ -1,5 +1,11 @@ apply plugin: 'org.springframework.boot' +configurations { + all { + exclude group: 'ch.qos.logback', module: 'logback-classic' + } +} + dependencies { // Corda dependencies. compile "$corda_release_group:corda-rpc:$corda_release_version" diff --git a/Advanced/snakesandladders-cordapp/repositories.gradle b/Advanced/snakesandladders-cordapp/repositories.gradle index 3198e5c6..8be7b630 100644 --- a/Advanced/snakesandladders-cordapp/repositories.gradle +++ b/Advanced/snakesandladders-cordapp/repositories.gradle @@ -3,6 +3,6 @@ repositories { mavenCentral() maven { url 'https://jitpack.io' } - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'https://repo.gradle.org/gradle/libs-releases' } } diff --git a/Advanced/syndicated-lending/README.md b/Advanced/syndicated-lending/README.md index 4996aa98..77b8b6c9 100644 --- a/Advanced/syndicated-lending/README.md +++ b/Advanced/syndicated-lending/README.md @@ -15,7 +15,7 @@ and agreeing on loan terms. See https://docs.corda.net/getting-set-up.html. # Usage - + ## Running the CorDapp Open a terminal and go to the project root directory and type: (to deploy the nodes using bootstrapper) diff --git a/Advanced/syndicated-lending/build.gradle b/Advanced/syndicated-lending/build.gradle index 17f3c973..68ca4762 100644 --- a/Advanced/syndicated-lending/build.gradle +++ b/Advanced/syndicated-lending/build.gradle @@ -23,7 +23,8 @@ buildscript {//properties that you need to build the project mavenLocal() mavenCentral() - maven { url 'https://software.r3.com/artifactory/corda-releases' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } + maven { url 'https://download.corda.net/maven/corda-releases' } } dependencies { @@ -42,7 +43,8 @@ allprojects {//Properties that you need to compile your project (The application mavenLocal() mavenCentral() - 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://jitpack.io' } } @@ -83,7 +85,7 @@ dependencies { cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" - cordaDriver "net.corda:corda-shell:4.9" + cordaDriver "net.corda:corda-shell:4.10" } diff --git a/Advanced/syndicated-lending/repositories.gradle b/Advanced/syndicated-lending/repositories.gradle index 3198e5c6..8be7b630 100644 --- a/Advanced/syndicated-lending/repositories.gradle +++ b/Advanced/syndicated-lending/repositories.gradle @@ -3,6 +3,6 @@ repositories { mavenCentral() maven { url 'https://jitpack.io' } - maven { url 'https://software.r3.com/artifactory/corda' } + maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'https://repo.gradle.org/gradle/libs-releases' } } diff --git a/Basic/constants.properties b/Basic/constants.properties index 5a20bdc4..eb9e0ed4 100644 --- a/Basic/constants.properties +++ b/Basic/constants.properties @@ -1,7 +1,7 @@ cordaReleaseGroup=net.corda cordaCoreReleaseGroup=net.corda -cordaVersion=4.9 -cordaCoreVersion=4.9 +cordaVersion=4.10 +cordaCoreVersion=4.10 gradlePluginsVersion=5.0.12 kotlinVersion=1.2.71 junitVersion=4.12 diff --git a/Basic/cordapp-example/.idea/jarRepositories.xml b/Basic/cordapp-example/.idea/jarRepositories.xml index 580d46d3..554006bf 100644 --- a/Basic/cordapp-example/.idea/jarRepositories.xml +++ b/Basic/cordapp-example/.idea/jarRepositories.xml @@ -26,11 +26,6 @@