Publish checkpoint agent jar and allow for inclusion of version id in jar upon run-time execution. (#5553)

This commit is contained in:
josecoll 2019-10-04 14:28:42 +01:00 committed by GitHub
parent dfa6291b2f
commit 42e104ca4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions

View File

@ -245,7 +245,7 @@ allprojects {
jacoco {
// JDK11 official support (https://github.com/jacoco/jacoco/releases/tag/v0.8.3)
toolVersion = "0.8.3"
toolVersion = "0.8.3"
}
tasks.withType(JavaCompile) {
@ -496,7 +496,8 @@ bintrayConfig {
'corda-common-configuration-parsing',
'corda-common-validation',
'corda-common-logging',
'corda-tools-network-builder'
'corda-tools-network-builder',
'corda-tools-checkpoint-agent'
]
license {
name = 'Apache-2.0'

View File

@ -151,8 +151,9 @@ class CheckpointDumper(private val checkpointStorage: CheckpointStorage, private
private fun checkpointAgentRunning(): Boolean {
val agentProperties = getJvmAgentProperties(log)
val pattern = "(.+)?checkpoint-agent(-.+)?\\.jar.*".toRegex()
return agentProperties.values.any { value ->
value is String && value.contains("checkpoint-agent.jar")
value is String && value.contains(pattern)
}
}

View File

@ -100,4 +100,3 @@ include 'core-deterministic:testing:verifier'
include 'serialization-deterministic'
include 'tools:checkpoint-agent'
findProject(':tools:checkpoint-agent')?.name = 'checkpoint-agent'

View File

@ -25,6 +25,8 @@ repositories {
apply plugin: 'kotlin'
apply plugin: 'idea'
apply plugin: 'net.corda.plugins.publish-utils'
apply plugin: 'com.jfrog.artifactory'
description 'A javaagent to allow hooking into Kryo checkpoints'
@ -49,7 +51,7 @@ dependencies {
}
jar {
archiveName = "${project.name}.jar"
archiveBaseName = "${project.name}"
manifest {
attributes(
'Premain-Class': 'net.corda.tools.CheckpointAgent',
@ -62,3 +64,7 @@ jar {
}
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
}
publish {
name 'corda-tools-checkpoint-agent'
}