Merge pull request #7721 from corda/adel/ENT-11802

ENT-11802: Resolved messages regarding execution optimisations have been disabled.
corda · May 3, 2024 · 691f84d · 691f84d
2 parents feb522a + ba71b86
commit 691f84d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 0 deletions.
diff --git a/common/logging/build.gradle b/common/logging/build.gradle
@@ -31,6 +31,8 @@ task generateSource(type: Copy) {
     into 'src/main'
 }
 compileKotlin.dependsOn generateSource
+processResources.dependsOn generateSource
+sourcesJar.dependsOn generateSource
 
 jar {
     baseName 'corda-common-logging'

diff --git a/node/capsule/build.gradle b/node/capsule/build.gradle
@@ -88,6 +88,11 @@ tasks.whenTaskAdded { task ->
     }
 }
 
+javadoc.dependsOn ':testing:testserver:testcapsule:buildWebserverJar'
+javadoc.dependsOn buildCordaJAR
+compileTestJava.dependsOn ':testing:testserver:testcapsule:buildWebserverJar'
+compileTestJava.dependsOn buildCordaJAR
+
 artifacts {
     runtimeArtifacts buildCordaJAR
 }

diff --git a/samples/simm-valuation-demo/contracts-states/build.gradle b/samples/simm-valuation-demo/contracts-states/build.gradle
@@ -78,6 +78,7 @@ tasks.register('generateDependencies') {
     }
 }
 processResources.finalizedBy generateDependencies
+jar.dependsOn generateDependencies
 
 jar {
     // Test CorDapp filters out *-tests.jar. We only want the shrinked jar not this one.

diff --git a/testing/testserver/build.gradle b/testing/testserver/build.gradle
@@ -83,6 +83,9 @@ jar {
     baseName 'corda-testserver-impl'
 }
 
+compileJava.dependsOn ':node:capsule:buildCordaJAR'
+javadoc.dependsOn ':testing:testserver:testcapsule:buildWebserverJar'
+
 publishing {
     publications {
         maven(MavenPublication) {

diff --git a/tools/bootstrapper/build.gradle b/tools/bootstrapper/build.gradle
@@ -49,6 +49,8 @@ jar {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
+jar.dependsOn ':testing:testserver:testcapsule:buildWebserverJar'
+
 publishing {
     publications {
         maven(MavenPublication) {

diff --git a/tools/explorer/build.gradle b/tools/explorer/build.gradle
@@ -70,6 +70,10 @@ dependencies {
     implementation "com.github.ben-manes.caffeine:caffeine:$caffeine_version"
 }
 
+compileJava.dependsOn ':testing:testserver:testcapsule:buildWebserverJar'
+startScripts.dependsOn ':testing:testserver:testcapsule:buildWebserverJar'
+startScripts.dependsOn ':node:capsule:buildCordaJAR'
+
 tasks.withType(JavaCompile).configureEach {
     // Resolves a Gradle warning about not scanning for pre-processors.
     options.compilerArgs << '-proc:none'