Upgraded various Java/Kotlin and Corda package dependencies to avoid …

…build errors Matched the version numbers with those currently in Hyperledger Cacti. Signed-off-by: VRamakrishna <[email protected]>
hyperledger-labs · Jul 29, 2024 · 00d54c4 · 00d54c4
1 parent e54eaab
commit 00d54c4
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 33 deletions.
diff --git a/common/protos-java-kt/build.gradle b/common/protos-java-kt/build.gradle
@@ -3,7 +3,7 @@ buildscript {
     ext.protobuf_version = "3.11.1"
     ext.grpc_version = "1.29.0" // CURRENT_GRPC_VERSION
     ext.grpc_kotlin_version = "0.1.4" // CURRENT_GRPC_KOTLIN_VERSION
-    ext.kotlin_version = "1.3.72"
+    ext.kotlin_version = "1.4.32"
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

diff --git a/core/drivers/corda-driver/build.gradle b/core/drivers/corda-driver/build.gradle
@@ -1,14 +1,14 @@
 buildscript {
-    ext.kotlin_version = "1.3.61"
+    ext.kotlin_version = "1.4.32"
     ext.coroutines_version = "1.3.3"
     ext.protobuf_version = "3.11.1"
     ext.bcprov_version = "1.53"
     ext.grpc_version = "1.28.1" // CURRENT_GRPC_VERSION
     ext.grpc_kotlin_version = "0.1.3" // CURRENT_GRPC_KOTLIN_VERSION
     ext.corda_release_group = "net.corda"
     ext.corda_core_release_group = "net.corda"
-    ext.corda_version = "4.8"
-    ext.corda_core_version = "4.8"
+    ext.corda_version = "4.8.11"
+    ext.corda_core_version = "4.8.11"
     ext.arrow_version = "0.10.4"
     ext.weaver_version = "1.6.1"
 

diff --git a/core/network/corda-interop-app/constants.properties b/core/network/corda-interop-app/constants.properties
@@ -1,11 +1,11 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8
-cordaCoreVersion=4.8
-gradlePluginsVersion=5.0.12
-kotlinVersion=1.3.72
+cordaVersion=4.8.11
+cordaCoreVersion=4.8.11
+gradlePluginsVersion=5.0.17
+kotlinVersion=1.4.32
 junitVersion=4.12
-log4jVersion=2.16.0
+log4jVersion=2.17.1
 platformVersion=10
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final

diff --git a/samples/corda/corda-simple-application/build.gradle b/samples/corda/corda-simple-application/build.gradle
@@ -14,6 +14,7 @@ buildscript {
         slf4j_version = constants.getProperty("slf4jVersion")
         corda_platform_version = constants.getProperty("platformVersion").toInteger()
         weaver_version = constants.getProperty("weaverVersion")        
+        clikt_version = constants.getProperty("cliktVersion")
     }
 
     repositories {

diff --git a/samples/corda/corda-simple-application/clients/build.gradle b/samples/corda/corda-simple-application/clients/build.gradle
@@ -39,7 +39,7 @@ repositories {
     jcenter()
     mavenCentral()
     mavenLocal()
-    maven { url 'https://software.r3.com/artifactory/corda-lib' }
+    maven { url 'https://download.corda.net/maven/corda-lib' }
     flatDir {
         dirs '../../fungible-house-token/source/contracts/build/libs'
         dirs '../../fungible-house-token/source/workflows/build/libs'
@@ -79,7 +79,7 @@ dependencies {
     // CorDapp dependencies.
     compile project(":contracts-kotlin")
     compile project(":workflows-kotlin")
-    compile "com.github.ajalt:clikt:$clikt_version"
+    implementation "com.github.ajalt.clikt:clikt:$clikt_version"
 
     implementation(group: 'com.fungiblehousetoken', name: 'contracts', version: "1.0")
     implementation(group: 'com.fungiblehousetoken', name: 'workflows', version: "1.0")

diff --git a/samples/corda/corda-simple-application/constants.properties b/samples/corda/corda-simple-application/constants.properties
@@ -1,12 +1,13 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8
-cordaCoreVersion=4.8
-gradlePluginsVersion=5.0.12
-kotlinVersion=1.3.72
+cordaVersion=4.8.11
+cordaCoreVersion=4.8.11
+gradlePluginsVersion=5.0.17
+kotlinVersion=1.4.32
 junitVersion=4.12
-log4jVersion =2.16.0
+log4jVersion=2.17.1
 platformVersion=10
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
 weaverVersion=1.6.1
+cliktVersion=2.7.1
diff --git a/samples/corda/fungible-house-token/build.gradle b/samples/corda/fungible-house-token/build.gradle
@@ -24,8 +24,10 @@ buildscript {
     repositories {
         mavenLocal()
         mavenCentral()
-        jcenter()
+        maven { url 'https://repo1.maven.org/maven2' }
         maven { url 'https://download.corda.net/maven/corda-releases' }
+        maven { url 'https://download.corda.net/maven/corda-dependencies' }
+        maven { url 'https://download.corda.net/maven/corda-lib' }
     }
 
     dependencies {
@@ -43,10 +45,11 @@ allprojects {
 
     repositories {
         mavenLocal()
+        maven { url 'https://repo1.maven.org/maven2' }
         mavenCentral()
         maven { url 'https://jitpack.io' }
         //SDK lib
-        maven { url 'https://download.corda.net/maven/corda-dependencies' }
+        maven { url 'https://download.corda.net/maven/corda' }
         maven { url 'https://download.corda.net/maven/corda-releases' }
         maven { url 'https://download.corda.net/maven/corda-lib' }
         //Gradle Plugins

diff --git a/samples/corda/fungible-house-token/constants.properties b/samples/corda/fungible-house-token/constants.properties
@@ -1,12 +1,12 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8
-cordaCoreVersion=4.8
-gradlePluginsVersion=5.0.12
-kotlinVersion=1.2.71
+cordaVersion=4.8.11
+cordaCoreVersion=4.8.11
+gradlePluginsVersion=5.0.17
+kotlinVersion=1.4.32
 junitVersion=4.12
 quasarVersion=0.7.10
-log4jVersion =2.16.0
+log4jVersion=2.17.1
 platformVersion=10
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final

diff --git a/samples/corda/fungible-house-token/makefile b/samples/corda/fungible-house-token/makefile
@@ -9,7 +9,7 @@ build: source
 	cp extension-flows/*.kt source/workflows/src/main/kotlin/net/corda/samples/tokenizedhouse/flows/
 	cp extension-states/*.kt source/contracts/src/main/kotlin/net/corda/samples/tokenizedhouse/states/
 	cp build.gradle source/build.gradle
-	cd source && ./gradlew clean jar
+	cd source && ./gradlew wrapper --gradle-version 7.5 --distribution-type all && ./gradlew clean jar
 
 .PHONY: clean
 clean:

diff --git a/sdks/corda/build.gradle b/sdks/corda/build.gradle
@@ -1,17 +1,17 @@
 buildscript {
-    ext.kotlin_version = "1.3.61"
+    ext.kotlin_version = "1.4.32"
     ext.coroutines_version = "1.3.3"
     ext.protobuf_version = "3.11.1"
     ext.bcprov_version = "1.53"
     ext.grpc_version = "1.28.1" // CURRENT_GRPC_VERSION
     ext.grpc_kotlin_version = "0.1.3" // CURRENT_GRPC_KOTLIN_VERSION
     ext.corda_release_group = "net.corda"
     ext.corda_core_release_group = "net.corda"
-    ext.corda_version = "4.8"
-    ext.corda_core_version = "4.8"
+    ext.corda_version = "4.8.11"
+    ext.corda_core_version = "4.8.11"
     ext.arrow_version = "0.10.4"
-    ext.corda_gradle_plugins_version = "5.0.12"
-    ext.log4j_version = "2.16.0"
+    ext.corda_gradle_plugins_version = "5.0.17"
+    ext.log4j_version = "2.17.1"
     ext.slf4j_version = "1.7.25"
     ext.weaver_version = "1.6.1"
 

diff --git a/tests/network-setups/corda/dev/Corda_Network/constants.properties b/tests/network-setups/corda/dev/Corda_Network/constants.properties
@@ -2,8 +2,8 @@ cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
 cordaVersion=4.8
 cordaCoreVersion=4.8
-gradlePluginsVersion=5.0.12
-kotlinVersion=1.3.72
+gradlePluginsVersion=5.0.17
+kotlinVersion=1.4.32
 junitVersion=4.12
 log4jVersion =2.11.2
 platformVersion=10

diff --git a/tests/network-setups/corda/dev/Corda_Network2/constants.properties b/tests/network-setups/corda/dev/Corda_Network2/constants.properties
@@ -2,8 +2,8 @@ cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
 cordaVersion=4.8
 cordaCoreVersion=4.8
-gradlePluginsVersion=5.0.12
-kotlinVersion=1.3.72
+gradlePluginsVersion=5.0.17
+kotlinVersion=1.4.32
 junitVersion=4.12
 log4jVersion =2.11.2
 platformVersion=10