Skip to content

Commit ffd7803

Browse files
adelel1adelel1
authored
Merge pull request #114 from corda/jzadroga/ent-11848/fix-secretsanta-cordapp
ENT-11848: Fix runSantaServer task in secret-santa CorDapp
2 parents 8b8c7b2 + 5c84f45 commit ffd7803

6 files changed

Lines changed: 13 additions & 54 deletions

File tree

‎Advanced/constants.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cordaReleaseGroup=net.corda
22
cordaCoreReleaseGroup=net.corda
3-
cordaVersion=4.12-RC01
4-
cordaCoreVersion=4.12-RC01
5-
cordaShellVersion=4.12-RC01
3+
cordaVersion=4.12-RC03
4+
cordaCoreVersion=4.12-RC03
5+
cordaShellVersion=4.12-RC03
66
gradlePluginsVersion=5.1.1
77
kotlinVersion=1.9.20
88
junitVersion=4.12

‎Advanced/secretsanta-cordapp/build.gradle‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,6 @@ buildscript { //properties that you need to build the project
1313
kotlin_version = constants.getProperty("kotlinVersion")
1414
junit_version = constants.getProperty("junitVersion")
1515
quasar_version = constants.getProperty("quasarVersion")
16-
quasar_exclusions = [
17-
'co.paralleluniverse**',
18-
'groovy**',
19-
'com.esotericsoftware.**',
20-
'jdk**',
21-
'junit**',
22-
'kotlin**',
23-
'net.rubygrapefruit.**',
24-
'org.gradle.**',
25-
'org.apache.**',
26-
'org.jacoco.**',
27-
'org.junit**',
28-
'org.slf4j**',
29-
'worker.org.gradle.**',
30-
'org.mockito.kotlin**',
31-
'org.assertj**',
32-
'org.hamcrest**',
33-
'org.mockito**',
34-
'org.opentest4j**',
35-
'org.springframework**'
36-
]
3716
log4j_version = constants.getProperty("log4jVersion")
3817
slf4j_version = constants.getProperty("slf4jVersion")
3918
corda_platform_version = constants.getProperty("platformVersion").toInteger()
@@ -42,11 +21,6 @@ buildscript { //properties that you need to build the project
4221
spring_boot_version = '3.2.5'
4322
spring_boot_gradle_plugin_version = '3.2.5'
4423

45-
accounts_release_version = '1.1-RC01'
46-
accounts_release_group = 'com.r3.corda.lib.accounts'
47-
confidential_id_release_group = "com.r3.corda.lib.ci"
48-
confidential_id_release_version = "1.2-RC01"
49-
5024
testJvmArgs = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
5125
'--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
5226
'--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
@@ -58,7 +32,6 @@ buildscript { //properties that you need to build the project
5832
repositories {
5933
mavenLocal()
6034
mavenCentral()
61-
maven { url 'https://jitpack.io' }
6235
maven { url 'https://download.corda.net/maven/corda-releases' }
6336
}
6437

@@ -67,10 +40,6 @@ buildscript { //properties that you need to build the project
6740
classpath "net.corda.plugins:cordformation:$corda_gradle_plugins_version"
6841
classpath "net.corda.plugins:quasar-utils:$corda_gradle_plugins_version"
6942
classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_gradle_plugin_version"
70-
classpath "net.corda.plugins:cordapp:$corda_gradle_plugins_version"
71-
72-
classpath "com.sendgrid:sendgrid-java:4.7.0"
73-
classpath "com.sendgrid:java-http-client:4.3.6"
7443
}
7544
}
7645

@@ -86,9 +55,9 @@ allprojects {//Properties that you need to compile your project (The application
8655
mavenLocal()
8756

8857
mavenCentral()
89-
maven { url 'https://jitpack.io' }
90-
maven { url 'https://download.corda.net/maven/corda-dependencies' }
9158
maven { url 'https://download.corda.net/maven/corda-releases' }
59+
maven { url 'https://download.corda.net/maven/corda-dependencies' }
60+
maven { url 'https://jitpack.io' }
9261
}
9362

9463
java {
@@ -122,7 +91,6 @@ sourceSets {
12291

12392
//Module dependencies
12493
dependencies {
125-
testImplementation "junit:junit:$junit_version"
12694
// Corda dependencies.
12795
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
12896
cordaBootstrapper ("$corda_release_group:corda-node-api:$corda_release_version") {

‎Advanced/secretsanta-cordapp/clients/build.gradle‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apply plugin: 'org.springframework.boot'
2+
13
buildscript {
24
repositories {
35
maven {
@@ -6,8 +8,6 @@ buildscript {
68
}
79
}
810

9-
apply plugin: 'org.springframework.boot'
10-
1111
sourceSets {
1212
main {
1313
resources {
@@ -17,15 +17,16 @@ sourceSets {
1717
}
1818

1919
dependencies {
20+
implementation 'com.google.code.gson:gson:2.8.5'
21+
2022
// Corda dependencies.
21-
implementation "$corda_release_group:corda-rpc:$corda_release_version"
2223
implementation "$corda_core_release_group:corda-core:$corda_core_release_version"
24+
implementation "$corda_release_group:corda-rpc:$corda_release_version"
2325

2426
// CorDapp dependencies.
2527
implementation project(":contracts")
2628
implementation project(":workflows")
2729

28-
implementation 'com.google.code.gson:gson:2.8.5'
2930
implementation("org.springframework.boot:spring-boot-starter-websocket:$spring_boot_version") {
3031
exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
3132
}
@@ -60,8 +61,4 @@ task runSantaServer(type: JavaExec, dependsOn: assemble) {
6061
classpath = sourceSets.main.runtimeClasspath
6162
main = 'net.corda.samples.secretsanta.webserver.Starter'
6263
args '--server.port=10056', '--config.rpc.host=localhost', '--config.rpc.port=10016', '--config.rpc.username=user1', '--config.rpc.password=test'
63-
}
64-
65-
tasks.withType(Jar) {
66-
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
6764
}

‎Advanced/secretsanta-cordapp/clients/src/main/java/net/corda/samples/secretsanta/webserver/NodeRPCConnection.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import net.corda.core.utilities.NetworkHostAndPort;
77
import org.springframework.beans.factory.annotation.Value;
88
import org.springframework.stereotype.Component;
9-
109
import jakarta.annotation.PostConstruct;
1110
import jakarta.annotation.PreDestroy;
1211

‎Advanced/secretsanta-cordapp/contracts/build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'net.corda.plugins.cordapp'
2-
apply plugin: 'net.corda.plugins.cordformation'
32

43
cordapp {
54
targetPlatformVersion corda_platform_version
@@ -34,12 +33,11 @@ configurations {
3433

3534
dependencies {
3635
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
37-
testImplementation "junit:junit:$junit_version"
3836
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
37+
testImplementation "junit:junit:$junit_version"
38+
3939
// Corda dependencies.
4040
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
41-
cordaProvided "$corda_release_group:corda:$corda_release_version"
42-
cordaProvided "$corda_release_group:corda-testserver:$corda_release_version"
4341
testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
4442
testImplementation "$corda_core_release_group:corda-test-utils:$corda_core_release_version"
4543
testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"

‎Advanced/secretsanta-cordapp/workflows/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'net.corda.plugins.cordapp'
2-
apply plugin: 'net.corda.plugins.cordformation'
32
apply plugin: 'net.corda.plugins.quasar-utils'
43

54
cordapp {
@@ -17,7 +16,6 @@ sourceSets {
1716
main {
1817
java {
1918
srcDir 'src/main/java'
20-
java.outputDir = file('bin/main')
2119
}
2220
resources {
2321
srcDir rootProject.file("config/dev")
@@ -26,7 +24,6 @@ sourceSets {
2624
test {
2725
java {
2826
srcDir 'src/test/java'
29-
java.outputDir = file('bin/main')
3027
}
3128
resources {
3229
srcDir rootProject.file("config/test")
@@ -57,7 +54,7 @@ dependencies {
5754
testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
5855

5956
// SendGrid
60-
implementation 'com.sendgrid:sendgrid-java:4.7.0'
57+
implementation 'com.sendgrid:sendgrid-java:4.10.2'
6158

6259
// CorDapp dependencies.
6360
cordapp project(":contracts")

0 commit comments

Comments
 (0)