ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-20 05:28:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-1741 Build standalone shell JAR distribution - subsequent fix (#3476)

Browse Source
This commit is contained in:
szymonsztuka 2018-06-29 12:03:18 +01:00 committed by Michele Sollecito
parent 8f254a75ca
commit 470921afb9
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -53,7 +53,7 @@ buildscript {
ext.crash_version = 'cadb53544fbb3c0fb901445da614998a6a419488' ext.crash_version = 'cadb53544fbb3c0fb901445da614998a6a419488'
ext.jsr305_version = constants.getProperty("jsr305Version") ext.jsr305_version = constants.getProperty("jsr305Version")
ext.shiro_version = '1.4.0' ext.shiro_version = '1.4.0'
ext.shadow_version = '2.0.2' ext.shadow_version = '2.0.4'
ext.artifactory_plugin_version = constants.getProperty('artifactoryPluginVersion') ext.artifactory_plugin_version = constants.getProperty('artifactoryPluginVersion')
ext.artifactory_contextUrl = 'https://ci-artifactory.corda.r3cev.com/artifactory' ext.artifactory_contextUrl = 'https://ci-artifactory.corda.r3cev.com/artifactory'
ext.snake_yaml_version = constants.getProperty('snakeYamlVersion') ext.snake_yaml_version = constants.getProperty('snakeYamlVersion')

4
tools/shell-cli/README.md
View File

@ -5,8 +5,8 @@ Documentation for shell CLI can be found [here](http://docs.corda.net/website/re
To build this from the command line on Unix or MacOS: To build this from the command line on Unix or MacOS:
Run ``./gradlew tools:shell-cli:buildShellCli`` to create a fat JAR in ``tools/shell-cli/build/`` Run ``./gradlew tools:shell-cli:buildShellCli`` to create a fat JAR in ``tools/shell-cli/build/libs``
To build this from the command line on Windows: To build this from the command line on Windows:
Run ``gradlew tools:shell-cli:buildShellCli`` to create a fat JAR in ``tools/shell-cli/build/`` Run ``gradlew tools:shell-cli:buildShellCli`` to create a fat JAR in ``tools/shell-cli/build/libs``

13
tools/shell-cli/build.gradle
View File

@ -8,7 +8,6 @@ buildscript {
} }
dependencies { dependencies {
classpath "com.github.jengelman.gradle.plugins:shadow:$shadow_version" classpath "com.github.jengelman.gradle.plugins:shadow:$shadow_version"
classpath 'de.sebastianboegl.gradle.plugins:shadow-log4j-transformer:2.1.1'
} }
} }
@ -21,9 +20,11 @@ mainClassName = 'net.corda.tools.shell.StandaloneShellKt'
dependencies { dependencies {
compile project(':tools:shell') compile project(':tools:shell')
compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25' compile group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
testCompile project(':test-utils') testCompile(project(':test-utils')) {
exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
}
} }
processResources { processResources {
@ -31,9 +32,6 @@ processResources {
} }
shadowJar { shadowJar {
//transform(de.sebastianboegl.gradle.plugins.shadow.transformers.Log4j2PluginsFileTransformer)
archiveName = "shell-cli-${version}.jar"
mergeServiceFiles() mergeServiceFiles()
} }
@ -47,9 +45,10 @@ artifacts {
jar { jar {
classifier "ignore" classifier "ignore"
enabled = false
} }
publish { publish {
name 'corda-tools-shell-cli'
disableDefaultJar = true disableDefaultJar = true
name 'corda-tools-shell-cli'
} }

2
tools/shell/build.gradle
View File

@ -60,7 +60,7 @@ dependencies {
// Manifests: for reading stuff from the manifest file. // Manifests: for reading stuff from the manifest file.
compile "com.jcabi:jcabi-manifests:1.1" compile "com.jcabi:jcabi-manifests:1.1"
// For logging. // For logging, required for ANSIProgressRenderer.
compile "org.apache.logging.log4j:log4j-core:${log4j_version}" compile "org.apache.logging.log4j:log4j-core:${log4j_version}"
// Unit testing helpers. // Unit testing helpers.