From 8631a64c666037da4f386278c586fdaa9d22c657 Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Fri, 21 Oct 2016 14:17:05 +0100 Subject: [PATCH] Moved capsule to node to remove it from src. --- build.gradle | 3 +-- node/build.gradle | 3 +++ {src => node/src}/main/java/CordaCaplet.java | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename {src => node/src}/main/java/CordaCaplet.java (100%) diff --git a/build.gradle b/build.gradle index e583baec51..aed74b732a 100644 --- a/build.gradle +++ b/build.gradle @@ -110,7 +110,6 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" compile "org.jetbrains.kotlinx:kotlinx-support-jdk8:0.2" - compile 'co.paralleluniverse:capsule:1.0.3' // Unit testing helpers. testCompile 'junit:junit:4.12' @@ -193,7 +192,7 @@ applicationDistribution.into("bin") { task buildCordaJAR(type: FatCapsule, dependsOn: ['quasarScan', 'buildCertSigningRequestUtilityJAR']) { applicationClass 'com.r3corda.node.MainKt' archiveName 'corda.jar' - applicationSource = files(project.tasks.findByName('jar'), 'build/classes/main/CordaCaplet.class') + applicationSource = files(project.tasks.findByName('jar'), 'node/build/classes/main/CordaCaplet.class') capsuleManifest { appClassPath = ["jolokia-agent-war-${project.ext.jolokia_version}.war"] diff --git a/node/build.gradle b/node/build.gradle index 3f9755876a..4000aab8a8 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -134,6 +134,9 @@ dependencies { compile "org.hibernate:hibernate-core:5.2.2.Final" compile "org.hibernate:hibernate-java8:5.2.2.Final" + // For using caplet to build fatjar + compile 'co.paralleluniverse:capsule:1.0.3' + // Integration test helpers integrationTestCompile 'junit:junit:4.12' diff --git a/src/main/java/CordaCaplet.java b/node/src/main/java/CordaCaplet.java similarity index 100% rename from src/main/java/CordaCaplet.java rename to node/src/main/java/CordaCaplet.java