Merge pull request #4 from Nuvindu/dependencies

Fix applying dependency versions

ballerina/Ballerina.toml

@@ -13,40 +13,40 @@ distribution = "2201.8.2"
 graalvmCompatible = true
 
 [[platform.java17.dependency]]
-path = "../native/build/libs/confluent.cregistry-native-0.1.0-SNAPSHOT.jar"
 groupId = "io.ballerina.lib"
 artifactId = "schema-registry-native"
 version = "0.1.0"
+path = "../native/build/libs/confluent.cregistry-native-0.1.0-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
-path = "./lib/kafka-schema-registry-client-5.3.2.jar"
 groupId = "io.confluent"
 artifactId = "kafka-schema-registry-client"
 version = "5.3.2"
+path = "./lib/kafka-schema-registry-client-5.3.2.jar"
 
 [[platform.java17.dependency]]
-path = "./lib/common-config-4.1.0.jar"
 groupId = "io.confluent"
 artifactId = "common-config"
 version = "4.1.0"
+path = "./lib/common-config-4.1.0.jar"
 
 [[platform.java17.dependency]]
-path = "./lib/common-utils-5.3.0.jar"
 groupId = "io.confluent"
 artifactId = "common-utils"
 version = "5.3.0"
+path = "./lib/common-utils-5.3.0.jar"
 
 [[platform.java17.dependency]]
-path = "./lib/kafka-clients-0.11.0.1.jar"
 groupId = "org.apache.kafka"
 artifactId = "kafka-clients"
-version = "0.11.0.1"
+version = "3.7.0"
+path = "./lib/kafka-clients-3.7.0.jar"
 
 [[platform.java17.dependency]]
-path = "./lib/avro-1.11.3.jar"
 groupId = "org.apache.avro"
 artifactId = "avro"
 version = "1.11.3"
+path = "./lib/avro-1.11.3.jar"
 
 [[platform.java17.dependency]]
 groupId = "com.fasterxml.jackson.core"

ballerina/build.gradle

@@ -63,13 +63,13 @@ dependencies {
     jbalTools("org.ballerinalang:jballerina-tools:${ballerinaLangVersion}") {
         transitive = false
     }
-    externalJars(group: 'io.confluent', name: 'kafka-schema-registry-client', version: '5.3.2') {
+    externalJars(group: 'io.confluent', name: 'kafka-schema-registry-client', version: "${kafkaSchemaRegistryVersion}") {
         transitive = false
     }
-    externalJars(group: 'io.confluent', name: 'common-config', version: '4.1.0') {
+    externalJars(group: 'io.confluent', name: 'common-config', version: "${commonConfigVersion}") {
         transitive = false
     }
-    externalJars(group: 'io.confluent', name: 'common-utils', version: '5.3.0') {
+    externalJars(group: 'io.confluent', name: 'common-utils', version: "${commonUtilsVersion}") {
         transitive = false
     }
     externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jacksonVersion}") {
@@ -78,13 +78,13 @@ dependencies {
     externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "${jacksonVersion}") {
         transitive = false
     }
-    externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.17.0') {
+    externalJars(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonVersion}") {
         transitive = false
     }
-    externalJars(group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.1') {
+    externalJars(group: 'org.apache.kafka', name: 'kafka-clients', version: "${kafkaClientVersion}") {
         transitive = false
     }
-    externalJars(group: 'org.apache.avro', name: 'avro', version: '1.11.3') {
+    externalJars(group: 'org.apache.avro', name: 'avro', version: "${avroVersion}") {
         transitive = false
     }
 }
@@ -93,7 +93,13 @@ task updateTomlFiles {
     doLast {
         def newBallerinaToml = ballerinaTomlFilePlaceHolder.text.replace("@project.version@", project.version)
         newBallerinaToml = newBallerinaToml.replace("@toml.version@", tomlVersion)
+        newBallerinaToml = newBallerinaToml.replace("@avro.version@", avroVersion)
         newBallerinaToml = newBallerinaToml.replace("@jackson.version@", jacksonVersion)
+        newBallerinaToml = newBallerinaToml.replace("@kafka.schema.registry.version@", kafkaSchemaRegistryVersion)
+        newBallerinaToml = newBallerinaToml.replace("@commons.version@", commonConfigVersion)
+        newBallerinaToml = newBallerinaToml.replace("@common.config.version@", commonConfigVersion)
+        newBallerinaToml = newBallerinaToml.replace("@common.utils.version@", commonUtilsVersion)
+        newBallerinaToml = newBallerinaToml.replace("@kafka.clients.version@", kafkaClientVersion)
         ballerinaTomlFile.text = newBallerinaToml
     }
 }

build-config/resources/Ballerina.toml

@@ -13,55 +13,55 @@ distribution = "2201.8.2"
 graalvmCompatible = true
 
 [[platform.java17.dependency]]
-path = "../native/build/libs/confluent.cregistry-native-0.1.0-SNAPSHOT.jar"
 groupId = "io.ballerina.lib"
 artifactId = "schema-registry-native"
-version = "0.1.0"
+version = "@toml.version@"
+path = "../native/build/libs/confluent.cregistry-native-@project.version@.jar"
 
 [[platform.java17.dependency]]
-path = "./lib/kafka-schema-registry-client-5.3.2.jar"
 groupId = "io.confluent"
 artifactId = "kafka-schema-registry-client"
-version = "5.3.2"
+version = "@kafka.schema.registry.version@"
+path = "./lib/kafka-schema-registry-client-@kafka.schema.registry.version@.jar"
 
 [[platform.java17.dependency]]
-path = "./lib/common-config-4.1.0.jar"
 groupId = "io.confluent"
 artifactId = "common-config"
-version = "4.1.0"
+version = "@common.config.version@"
+path = "./lib/common-config-@common.config.version@.jar"
 
 [[platform.java17.dependency]]
-path = "./lib/common-utils-5.3.0.jar"
 groupId = "io.confluent"
 artifactId = "common-utils"
-version = "5.3.0"
+version = "@common.utils.version@"
+path = "./lib/common-utils-@common.utils.version@.jar"
 
 [[platform.java17.dependency]]
-path = "./lib/kafka-clients-0.11.0.1.jar"
 groupId = "org.apache.kafka"
 artifactId = "kafka-clients"
-version = "0.11.0.1"
+version = "@kafka.clients.version@"
+path = "./lib/kafka-clients-@kafka.clients.version@.jar"
 
 [[platform.java17.dependency]]
-path = "./lib/avro-1.11.3.jar"
 groupId = "org.apache.avro"
 artifactId = "avro"
-version = "1.11.3"
+version = "@avro.version@"
+path = "./lib/avro-@avro.version@.jar"
 
 [[platform.java17.dependency]]
 groupId = "com.fasterxml.jackson.core"
 artifactId = "jackson-core"
-version = "2.17.0"
-path = "./lib/jackson-core-2.17.0.jar"
+version = "@jackson.version@"
+path = "./lib/jackson-core-@jackson.version@.jar"
 
 [[platform.java11.dependency]]
 groupId = "com.fasterxml.jackson.core"
 artifactId = "jackson-annotations"
-version = "2.17.0"
-path = "./lib/jackson-annotations-2.17.0.jar"
+version = "@jackson.version@"
+path = "./lib/jackson-annotations-@jackson.version@.jar"
 
 [[platform.java11.dependency]]
 groupId = "com.fasterxml.jackson.core"
 artifactId = "jackson-databind"
-version = "2.17.0"
-path = "./lib/jackson-databind-2.17.0.jar"
+version = "@jackson.version@"
+path = "./lib/jackson-databind-@jackson.version@.jar"

settings.gradle

@@ -42,7 +42,7 @@ plugins {
 }
 
 def projectName = 'confluent.cregistry'
-rootProject.name = "ballerina ${projectName}"
+rootProject.name = "ballerinax-${projectName}"
 
 include ":checkstyle"
 include ":${projectName}-native"