ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-15 23:22:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Gradle fixes for JMeter capsule: (#1077)

Browse Source 
- Consistent Log4J artifacts
- Depends on processResources task
- Include as dependency of assemble task
This commit is contained in:
Chris Rankin 2018-06-26 13:45:32 +01:00 committed by GitHub
parent 2497b0b90a
commit 35e9396ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tools/jmeter/build.gradle
View File

@ -33,28 +33,29 @@ dependencies {
// Log4J: logging framework (with SLF4J bindings) // Log4J: logging framework (with SLF4J bindings)
compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version" compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
compile "org.apache.logging.log4j:log4j-1.2-api:$log4j_version"
compile "org.apache.logging.log4j:log4j-core:$log4j_version" compile "org.apache.logging.log4j:log4j-core:$log4j_version"
// JMeter // JMeter
ext.jmVersion = "3.3" ext.jmVersion = "3.3"
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_components', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_components', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_core', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_core', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_ftp', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_ftp', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_functions', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_functions', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_http', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_http', version: jmVersion
compile group: 'org.apache.jmeter', name: 'ApacheJMeter_java', version: "$jmVersion" // 'compile' because we extend Java sampler. compile group: 'org.apache.jmeter', name: 'ApacheJMeter_java', version: jmVersion // 'compile' because we extend Java sampler.
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_jdbc', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_jdbc', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_jms', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_jms', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_junit', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_junit', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_ldap', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_ldap', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_mail', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_mail', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_mongodb', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_mongodb', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_native', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_native', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_tcp', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_tcp', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_config', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter_config', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'ApacheJMeter', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'ApacheJMeter', version: jmVersion
runtime group: 'org.apache.jmeter', name: 'jorphan', version: "$jmVersion" runtime group: 'org.apache.jmeter', name: 'jorphan', version: jmVersion
//For Azure SQL and SQL Server support in persistence //For Azure SQL and SQL Server support in persistence
runtime group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: '6.2.1.jre8' runtime group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: '6.2.1.jre8'
@ -151,7 +152,7 @@ task buildJMeterJAR(type: FatCapsule) {
archiveName "jmeter-corda-${corda_release_version}.jar" archiveName "jmeter-corda-${corda_release_version}.jar"
applicationSource = jar applicationSource = jar
from 'NOTICE' // Copy CDDL notice from 'NOTICE' // Copy CDDL notice
from("$buildDir/resources/main") { from(processResources) {
include "log4j2.xml" include "log4j2.xml"
include "*.properties" include "*.properties"
} }
@ -166,6 +167,7 @@ task buildJMeterJAR(type: FatCapsule) {
jvmArgs = ['-Xms512m', '-Xmx512m', '-XX:+UseG1GC'] jvmArgs = ['-Xms512m', '-Xmx512m', '-XX:+UseG1GC']
} }
} }
assemble.dependsOn buildJMeterJAR
artifacts { artifacts {
runtimeArtifacts buildJMeterJAR runtimeArtifacts buildJMeterJAR