Corrections for bad build:

alch3mistdev · alch3mistdev · commit 4e2e0cf0a301 · 2020-06-03T10:40:43.000+01:00
- flow-http-access, package corrected for MockNetworkParameters
- ping-pong, gradle prop switched to cordaCompile
- spring-webserver, bootJar false for root
- confidentialidentity-whistleblower, stopNodes() temporarily removed in FlowTests
diff --git a/Basic/flow-http-access/workflows-java/src/test/java/net/corda/samples/flowhttp/FlowTests.java b/Basic/flow-http-access/workflows-java/src/test/java/net/corda/samples/flowhttp/FlowTests.java
@@ -26,7 +26,7 @@ public class FlowTests {
     @Before
     public void Setup() {
         network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(
-                Collections.singletonList(TestCordapp.findCordapp("com.flowhttp"))
+                Collections.singletonList(TestCordapp.findCordapp("net.corda.samples.flowhttp"))
         ));
         node = network.createPartyNode(null);
         network.runNetwork();
diff --git a/Basic/ping-pong/client-java/build.gradle b/Basic/ping-pong/client-java/build.gradle
@@ -2,7 +2,7 @@ apply from: '../repositories.gradle'
 
 dependencies {
 
-    compile project(":workflows-java")
+    cordaCompile project(":workflows-java")
     compile "$corda_release_group:corda-rpc:$corda_release_version"
 
     testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
diff --git a/Basic/spring-webserver/README.md b/Basic/spring-webserver/README.md
@@ -55,7 +55,7 @@ You can convert the webserver for Party A into a runnable JAR using:
 
 And run the webserver using:
 
-    java -jar server-<java/kotlin>/build/libs/corda-webserver.jar
+    java -jar server-<java/kotlin>/build/libs/corda-webserver-1.0.jar
 
 ### With IntelliJ
 
diff --git a/Basic/spring-webserver/build.gradle b/Basic/spring-webserver/build.gradle
@@ -51,6 +51,7 @@ allprojects {
         }
     }
 
+
     dependencies {
         compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
         testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
@@ -78,6 +79,9 @@ allprojects {
 
 }
 
+bootJar {
+    enabled = false
+}
 
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
diff --git a/Basic/spring-webserver/server-java/build.gradle b/Basic/spring-webserver/server-java/build.gradle
@@ -4,6 +4,6 @@ task runPartyAServer(type: JavaExec, dependsOn: jar) {
 }
 
 bootJar {
-    baseName = "corda-webserver"
-    version = ""
+    setArchivesBaseName("corda-webserver")
 }
+
diff --git a/Basic/spring-webserver/server-kotlin/build.gradle b/Basic/spring-webserver/server-kotlin/build.gradle
@@ -4,6 +4,5 @@ task runPartyAServer(type: JavaExec, dependsOn: jar) {
 }
 
 bootJar {
-    baseName = "corda-webserver"
-    version = ""
+    setArchivesBaseName("corda-webserver")
 }
diff --git a/Features/confidentialidentity-whistleblower/workflows/build.gradle b/Features/confidentialidentity-whistleblower/workflows/build.gradle
@@ -56,7 +56,7 @@ dependencies {
     cordapp "$corda_release_group:corda-confidential-identities:$corda_release_version"
 
     // CorDapp dependencies.
-    cordapp project(":contracts-java")
+    cordapp project(":contracts")
 }
 
 task integrationTest(type: Test, dependsOn: []) {
@@ -67,7 +67,7 @@ task integrationTest(type: Test, dependsOn: []) {
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
         cordapp "$corda_release_group:corda-confidential-identities:$corda_release_version"
-        cordapp project(':contracts-java')
+        cordapp project(':contracts')
     }
     node {
         name "O=Notary,L=Nakuru,C=KE"
diff --git a/Features/confidentialidentity-whistleblower/workflows/src/test/java/net/corda/examples/whistleblower/FlowTests.java b/Features/confidentialidentity-whistleblower/workflows/src/test/java/net/corda/examples/whistleblower/FlowTests.java
@@ -30,12 +30,12 @@ public FlowTests() {
 
     @Before
     public void setUp() throws Exception {
-        network.runNetwork();
+        network.startNodes();
     }
 
     @After
-    public void tearDown() throws Exception {
-        network.stopNodes();
+    public void tearDown() {
+//        network.stopNodes();
     }
 
     //simple unit test to check the public keys that used in the transaction

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ allprojects {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
	`54`	`+`
`54`	`55`	`dependencies {`
`55`	`56`	`compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"`
`56`	`57`	`testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"`
`@@ -78,6 +79,9 @@ allprojects {`
`78`	`79`
`79`	`80`	`}`
`80`	`81`
	`82`	`+bootJar {`
	`83`	`+ enabled = false`
	`84`	`+}`
`81`	`85`
`82`	`86`	`task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`83`	`87`	`nodeDefaults {`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ task runPartyAServer(type: JavaExec, dependsOn: jar) {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`bootJar {`
`7`		`- baseName = "corda-webserver"`
`8`		`- version = ""`
	`7`	`+ setArchivesBaseName("corda-webserver")`
`9`	`8`	`}`
	`9`	`+`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,5 @@ task runPartyAServer(type: JavaExec, dependsOn: jar) {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`bootJar {`
`7`		`- baseName = "corda-webserver"`
`8`		`- version = ""`
	`7`	`+ setArchivesBaseName("corda-webserver")`
`9`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,12 @@ public FlowTests() {`
`30`	`30`
`31`	`31`	`@Before`
`32`	`32`	`public void setUp() throws Exception {`
`33`		`- network.runNetwork();`
	`33`	`+ network.startNodes();`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@After`
`37`		`- public void tearDown() throws Exception {`
`38`		`- network.stopNodes();`
	`37`	`+ public void tearDown() {`
	`38`	`+// network.stopNodes();`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`//simple unit test to check the public keys that used in the transaction`