Bulid changes to allow testing of simulator SNAPSHOT build
This commit is contained in:
		
							parent
							
								
									8e3185cd9b
								
							
						
					
					
						commit
						bf75f8fa55
					
				
							
								
								
									
										47
									
								
								build.gradle
									
									
									
									
									
								
							
							
						
						
									
										47
									
								
								build.gradle
									
									
									
									
									
								
							@ -87,8 +87,51 @@ tasks.withType(JavaCompile) {
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
repositories {
 | 
			
		||||
    mavenLocal()
 | 
			
		||||
    // All dependencies are held in Maven Central
 | 
			
		||||
    mavenCentral()
 | 
			
		||||
 | 
			
		||||
    // R3 Internal repositories
 | 
			
		||||
    // Repository the provides kotlin-stdlib-jdk8-osgi created by R3.
 | 
			
		||||
    // Final location to be decided.
 | 
			
		||||
    maven {
 | 
			
		||||
        url = "$artifactoryContextUrl/corda-dependencies"
 | 
			
		||||
    }
 | 
			
		||||
    // Repository provides Corda 5 binaries that implement Corda-API.
 | 
			
		||||
    // These will be made publicly available.
 | 
			
		||||
    // Final location to be decided.
 | 
			
		||||
    // Repository subject to change
 | 
			
		||||
    maven {
 | 
			
		||||
        url = "$artifactoryContextUrl/corda-os-maven"
 | 
			
		||||
        credentials {
 | 
			
		||||
            username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
 | 
			
		||||
            password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    // Provides the combined-worker Jars
 | 
			
		||||
    // These will be made publicly available.
 | 
			
		||||
    // Final location to be decided.
 | 
			
		||||
    maven {
 | 
			
		||||
        url = "$artifactoryContextUrl/corda-ent-maven-unstable-local"
 | 
			
		||||
        credentials {
 | 
			
		||||
            username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
 | 
			
		||||
            password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    maven {
 | 
			
		||||
        url = "$artifactoryContextUrl/corda-ent-maven"
 | 
			
		||||
        credentials {
 | 
			
		||||
            username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
 | 
			
		||||
            password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    maven {
 | 
			
		||||
        url = "$artifactoryContextUrl/engineering-tools-maven-unstable"
 | 
			
		||||
        credentials {
 | 
			
		||||
            username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
 | 
			
		||||
            password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Declare dependencies for the modules we will use.
 | 
			
		||||
@ -124,8 +167,8 @@ dependencies {
 | 
			
		||||
    cordaProvided 'org.slf4j:slf4j-api'
 | 
			
		||||
 | 
			
		||||
    // Dependencies Required By Test Tooling
 | 
			
		||||
    testImplementation "net.corda:corda-simulator-api:$combinedWorkerVersion"
 | 
			
		||||
    testRuntimeOnly "net.corda:corda-simulator-runtime:$combinedWorkerVersion"
 | 
			
		||||
    testImplementation "net.corda:corda-simulator-api:$simulatorVersion"
 | 
			
		||||
    testRuntimeOnly "net.corda:corda-simulator-runtime:$simulatorVersion"
 | 
			
		||||
 | 
			
		||||
    // 3rd party libraries
 | 
			
		||||
    // Required
 | 
			
		||||
 | 
			
		||||
@ -2,7 +2,8 @@ kotlin.code.style=official
 | 
			
		||||
 | 
			
		||||
# Specify the version of the Corda-API to use.
 | 
			
		||||
# This needs to match the version supported by the Corda Cluster the CorDapp will run on.
 | 
			
		||||
cordaApiVersion=5.0.0.190-DevPreview-2
 | 
			
		||||
# cordaApiVersion=5.0.0.190-DevPreview-2
 | 
			
		||||
cordaApiVersion=5.0.0.414-beta+
 | 
			
		||||
 | 
			
		||||
# Specify the version of the cordapp-cpb and cordapp-cpk plugins
 | 
			
		||||
cordaPluginsVersion=7.0.0-DevPreview-2
 | 
			
		||||
@ -25,7 +26,8 @@ hamcrestVersion=2.2
 | 
			
		||||
 | 
			
		||||
# Settings For Development Utilities
 | 
			
		||||
testUtilsVersion=5.0.0.0-DevPreview-2
 | 
			
		||||
combinedWorkerVersion=5.0.0.0-DevPreview-2
 | 
			
		||||
#combinedWorkerVersion=5.0.0.0-DevPreview-2
 | 
			
		||||
combinedWorkerVersion=5.0.0.0-beta+
 | 
			
		||||
 | 
			
		||||
cordaClusterURL=https://localhost:8888
 | 
			
		||||
cordaRpcUser=admin
 | 
			
		||||
@ -33,3 +35,6 @@ cordaRpcPasswd=admin
 | 
			
		||||
devEnvWorkspace=workspace
 | 
			
		||||
dbContainerName=CSDEpostgresql
 | 
			
		||||
 | 
			
		||||
# R3 internal repository
 | 
			
		||||
artifactoryContextUrl=https://software.r3.com/artifactory
 | 
			
		||||
simulatorVersion=5.0.0.0-SNAPSHOT
 | 
			
		||||
@ -1,12 +1,41 @@
 | 
			
		||||
pluginManagement {
 | 
			
		||||
    // Declare the repositories where plugins are stored.
 | 
			
		||||
    repositories {
 | 
			
		||||
        mavenLocal()
 | 
			
		||||
        gradlePluginPortal()
 | 
			
		||||
        mavenCentral {
 | 
			
		||||
            content {
 | 
			
		||||
                includeGroupByRegex 'net\\.corda(\\..*)?'
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        // R3 internal repositories
 | 
			
		||||
        maven {
 | 
			
		||||
            url "${artifactoryContextUrl}/corda-dev"
 | 
			
		||||
            content {
 | 
			
		||||
                includeGroupByRegex 'net\\.corda\\.plugins(\\..*)?'
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        maven {
 | 
			
		||||
            url = "$artifactoryContextUrl/corda-os-maven-unstable"
 | 
			
		||||
            credentials {
 | 
			
		||||
                username = settings.ext.find('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
 | 
			
		||||
                password = settings.ext.find('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        maven {
 | 
			
		||||
            url = "$artifactoryContextUrl/corda-os-maven-unstable-local"
 | 
			
		||||
            credentials {
 | 
			
		||||
                username = settings.ext.find('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
 | 
			
		||||
                password = settings.ext.find('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        maven {
 | 
			
		||||
            url = "$artifactoryContextUrl/corda-dev"
 | 
			
		||||
            credentials {
 | 
			
		||||
                username = settings.ext.find('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
 | 
			
		||||
                password = settings.ext.find('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    //  The plugin dependencies with versions of the plugins congruent with the specified CorDapp plugin version,
 | 
			
		||||
 | 
			
		||||
@ -3,8 +3,8 @@ package com.r3.developers.csdetemplate;
 | 
			
		||||
import net.corda.v5.base.annotations.CordaSerializable;
 | 
			
		||||
import net.corda.v5.base.types.MemberX500Name;
 | 
			
		||||
 | 
			
		||||
// // A class which will contain a message, It must be marked with @CordaSerializable for Corda
 | 
			
		||||
//// to be able to send from one virtual node to another.
 | 
			
		||||
// A class which will contain a message, It must be marked with @CordaSerializable for Corda
 | 
			
		||||
// to be able to send from one virtual node to another.
 | 
			
		||||
@CordaSerializable
 | 
			
		||||
public class Message {
 | 
			
		||||
    // public Message() {}
 | 
			
		||||
 | 
			
		||||
@ -2,8 +2,7 @@ package com.r3.developers.csdetemplate;
 | 
			
		||||
 | 
			
		||||
import net.corda.v5.base.types.MemberX500Name;
 | 
			
		||||
 | 
			
		||||
// // A class to hold the arguments required to start the flow
 | 
			
		||||
//class MyFirstFlowStartArgs(val otherMember: MemberX500Name)
 | 
			
		||||
// A class to hold the arguments required to start the flow
 | 
			
		||||
public class MyFirstFlowStartArgs {
 | 
			
		||||
    public MemberX500Name otherMember;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user