Merge pull request #232 from corda/clint-cddl

Capsule fat JAR now contains a CDDL notice.
This commit is contained in:
Clinton 2017-02-09 16:35:01 +00:00 committed by GitHub
commit a61c767505
3 changed files with 15 additions and 17 deletions

View File

@ -1,17 +0,0 @@
#!/usr/bin/env bash
# Creates three nodes. A network map and notary node and two regular nodes that can be extended with cordapps.
set -euo pipefail
trap 'kill $(jobs -p)' SIGINT SIGTERM EXIT
export CAPSULE_CACHE_DIR=cache
pushd nameserver
( java -jar JAR_NAME )&
popd
pushd nodea
( java -jar JAR_NAME )&
popd
pushd nodeb
( java -jar JAR_NAME )&
popd
read -p 'Any key to exit'
kill $(jobs -p)

14
node/capsule/NOTICE Normal file
View File

@ -0,0 +1,14 @@
This JAR contains executable versions of the software listed below, each of which has been developed under an open source project not under the control of R3. All such software is distributed under the terms of its respective license as listed below and R3 makes no representations or warranties of any kind with respect to such software. See the respective licenses for the specific language governing permissions and limitation of use.
Full text of the license and the source code versions of the software are available online from their source projects via the links indicated below.
--------------------
JAX-RS API - Licensed under CDDL-1.0 (https://opensource.org/licenses/cddl1.php)
Source code available at: https://java.net/projects/jax-rs-spec/sources/api/show
Jersey - Dual-licensed under CDDL-1.0 and GPL 2.0 with ClassPath exception (https://jersey.java.net/license.html)
Source code available at: https://maven.java.net/content/repositories/releases/org/glassfish/jersey/
HK2 - Dual-licensed under CDDL-1.0 and GPL 2.0 with ClassPath exception (https://hk2.java.net/2.5.0-b32/license.html)
Source code available at: https://java.net/projects/hk2/sources/git/show

View File

@ -52,6 +52,7 @@ task buildCordaJAR(type: FatCapsule, dependsOn: ['buildCertSigningRequestUtility
applicationClass 'net.corda.node.Corda'
archiveName "corda-${corda_version}.jar"
applicationSource = files(project.tasks.findByName('jar'), '../build/classes/main/CordaCaplet.class', 'config/dev/log4j2.xml')
from 'NOTICE' // Copy CDDL notice
capsuleManifest {
applicationVersion = corda_version