mirror of
https://github.com/corda/corda.git
synced 2024-12-23 23:02:29 +00:00
Renamec capsule module to corda.
This commit is contained in:
parent
b24c628e34
commit
1463cd2b37
@ -92,7 +92,7 @@ repositories {
|
|||||||
dependencies {
|
dependencies {
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
compile "com.google.guava:guava:19.0"
|
compile "com.google.guava:guava:19.0"
|
||||||
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
||||||
}
|
}
|
||||||
|
|
||||||
task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
|
task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
|
||||||
@ -162,7 +162,7 @@ bintrayConfig {
|
|||||||
projectUrl = 'https://github.com/corda/corda'
|
projectUrl = 'https://github.com/corda/corda'
|
||||||
gpgSign = true
|
gpgSign = true
|
||||||
gpgPassphrase = System.getenv('CORDA_BINTRAY_GPG_PASSPHRASE')
|
gpgPassphrase = System.getenv('CORDA_BINTRAY_GPG_PASSPHRASE')
|
||||||
publications = ['client', 'core', 'finance', 'node', 'test-utils']
|
publications = ['client', 'core', 'corda', 'finance', 'node', 'test-utils']
|
||||||
license {
|
license {
|
||||||
name = 'Apache-2.0'
|
name = 'Apache-2.0'
|
||||||
url = 'https://www.apache.org/licenses/LICENSE-2.0'
|
url = 'https://www.apache.org/licenses/LICENSE-2.0'
|
||||||
|
@ -36,7 +36,7 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
compileTestJava.dependsOn tasks.getByPath(':node:capsule:buildCordaJAR')
|
compileTestJava.dependsOn tasks.getByPath(':node:corda:buildCordaJAR')
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
@ -48,7 +48,7 @@ dependencies {
|
|||||||
exclude group: "bouncycastle"
|
exclude group: "bouncycastle"
|
||||||
}
|
}
|
||||||
|
|
||||||
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
||||||
}
|
}
|
||||||
|
|
||||||
mainClassName = "net.corda.docs.ClientRpcTutorialKt"
|
mainClassName = "net.corda.docs.ClientRpcTutorialKt"
|
||||||
|
@ -16,7 +16,6 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'maven-publish'
|
|
||||||
apply plugin: 'net.corda.plugins.publish-utils'
|
apply plugin: 'net.corda.plugins.publish-utils'
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
@ -24,10 +23,6 @@ allprojects {
|
|||||||
group 'net.corda.plugins'
|
group 'net.corda.plugins'
|
||||||
}
|
}
|
||||||
|
|
||||||
subprojects {
|
|
||||||
task(install, dependsOn: 'publishToMavenLocal')
|
|
||||||
}
|
|
||||||
|
|
||||||
bintrayConfig {
|
bintrayConfig {
|
||||||
user = System.getenv('CORDA_BINTRAY_USER')
|
user = System.getenv('CORDA_BINTRAY_USER')
|
||||||
key = System.getenv('CORDA_BINTRAY_KEY')
|
key = System.getenv('CORDA_BINTRAY_KEY')
|
||||||
@ -50,7 +45,3 @@ bintrayConfig {
|
|||||||
email = 'dev@corda.net'
|
email = 'dev@corda.net'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Aliasing the publishToMavenLocal for simplicity.
|
|
||||||
task(install, dependsOn: 'publishToMavenLocal')
|
|
||||||
|
|
||||||
|
@ -81,3 +81,6 @@ publishing {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Aliasing the publishToMavenLocal for simplicity.
|
||||||
|
task(install, dependsOn: 'publishToMavenLocal')
|
||||||
|
@ -24,6 +24,7 @@ class PublishTasks implements Plugin<Project> {
|
|||||||
|
|
||||||
createTasks()
|
createTasks()
|
||||||
createExtensions()
|
createExtensions()
|
||||||
|
createConfigurations()
|
||||||
checkAndConfigurePublishing()
|
checkAndConfigurePublishing()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,6 +54,11 @@ class PublishTasks implements Plugin<Project> {
|
|||||||
artifact project.tasks.sourceJar
|
artifact project.tasks.sourceJar
|
||||||
artifact project.tasks.javadocJar
|
artifact project.tasks.javadocJar
|
||||||
|
|
||||||
|
project.configurations.publish.artifacts.each {
|
||||||
|
println("Adding artifact: $it")
|
||||||
|
delegate.artifact it
|
||||||
|
}
|
||||||
|
|
||||||
extendPomForMavenCentral(pom, bintrayConfig)
|
extendPomForMavenCentral(pom, bintrayConfig)
|
||||||
}
|
}
|
||||||
project.task("install", dependsOn: "publishToMavenLocal")
|
project.task("install", dependsOn: "publishToMavenLocal")
|
||||||
@ -125,4 +131,8 @@ class PublishTasks implements Plugin<Project> {
|
|||||||
project.extensions.create("bintrayConfig", BintrayConfigExtension)
|
project.extensions.create("bintrayConfig", BintrayConfigExtension)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void createConfigurations() {
|
||||||
|
project.configurations.create("publish")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,9 +5,7 @@
|
|||||||
apply plugin: 'net.corda.plugins.publish-utils'
|
apply plugin: 'net.corda.plugins.publish-utils'
|
||||||
apply plugin: 'us.kirchmeier.capsule'
|
apply plugin: 'us.kirchmeier.capsule'
|
||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
apply plugin: 'com.jfrog.bintray'
|
|
||||||
|
|
||||||
//name 'corda'
|
|
||||||
description 'Corda standalone node'
|
description 'Corda standalone node'
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@ -37,12 +35,12 @@ targetCompatibility = 1.6
|
|||||||
sourceSets {
|
sourceSets {
|
||||||
test {
|
test {
|
||||||
resources {
|
resources {
|
||||||
srcDir "../config/test"
|
srcDir "../../config/test"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
main {
|
main {
|
||||||
resources {
|
resources {
|
||||||
srcDir "../config/dev"
|
srcDir "../../config/dev"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -75,4 +73,7 @@ task buildCertSigningRequestUtilityJAR(type: FatCapsule, dependsOn: project.jar)
|
|||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
runtimeArtifacts buildCordaJAR
|
runtimeArtifacts buildCordaJAR
|
||||||
|
publish buildCordaJAR {
|
||||||
|
classifier ""
|
||||||
|
}
|
||||||
}
|
}
|
@ -45,7 +45,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
@ -48,7 +48,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
@ -21,7 +21,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
@ -45,7 +45,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
@ -41,7 +41,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
@ -45,7 +45,7 @@ dependencies {
|
|||||||
testCompile group: 'junit', name: 'junit', version: '4.11'
|
testCompile group: 'junit', name: 'junit', version: '4.11'
|
||||||
|
|
||||||
// Corda integration dependencies
|
// Corda integration dependencies
|
||||||
runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
|
||||||
compile project(':core')
|
compile project(':core')
|
||||||
compile project(':client')
|
compile project(':client')
|
||||||
compile project(':node')
|
compile project(':node')
|
||||||
|
@ -5,7 +5,7 @@ include 'finance'
|
|||||||
include 'finance:isolated'
|
include 'finance:isolated'
|
||||||
include 'core'
|
include 'core'
|
||||||
include 'node'
|
include 'node'
|
||||||
include 'node:capsule'
|
include 'node:corda'
|
||||||
include 'client'
|
include 'client'
|
||||||
include 'experimental'
|
include 'experimental'
|
||||||
include 'experimental:sandbox'
|
include 'experimental:sandbox'
|
||||||
|
Loading…
Reference in New Issue
Block a user