Organize dependency management and fix version mismatches

Author: ThisaruGuruge

gradle.properties

@@ -7,11 +7,100 @@ group=org.ballerinalang
 bootstrappedOn=1.1.0-alpha
 
 # Java Dependencies
+
+# Multi-artifact shared versions
 messageBrokerVersion=0.970.5
 nettyVersion=4.1.129.Final
 boringSslVersion=2.0.65.Final
 apacheAxiomVersion=1.2.22
 openTracingVersion=0.33.0
 swaggerParserVersion=2.1.14
 jacksonVersion=2.15.2
+commonmarkVersion=0.11.0
+jaegerVersion=1.6.0
+mavenPluginVersion=3.6.0
+asmVersion=7.1
+slf4jVersion=1.7.26
+woodstoxVersion=6.5.0
+stax2ApiVersion=4.2.1
+
+# Individual dependency versions
+checkstyleToolVersion=8.18
+commonsBeanutilsVersion=1.11.0
+commonsCodecVersion=1.15
+commonsIoVersion=2.14.0
+commonsLoggingVersion=1.1.1
+h2Version=1.4.199
+hsqldbVersion=2.2.7
+hsqldb2Version=2.4.1
+wixEmbeddedMysqlVersion=4.6.1
+mysqlConnectorVersion=8.0.19
+gcviewerVersion=1.35
+handlebarsVersion=4.3.1
+protobufVersion=3.25.5
+jsr305Version=3.0.2
+gsonVersion=2.8.9
+guavaVersion=32.1.1-jre
+toml4jVersion=0.7.2
+javaxMailVersion=1.6.2
+okhttpVersion=4.11.0
+okioVersion=3.5.0
+hikariCPVersion=3.3.1
+commonsLang3Version=3.18.0
+commonsTextVersion=1.10.0
+apacheDsVersion=2.0.0-M24
+geronimoStaxVersion=1.0.1
+kafkaClientsVersion=3.9.1
+kafkaScalaVersion=3.9.1
+avroVersion=1.9.2
+mime4jVersion=0.8.11
+minaCoreVersion=2.0.16
+zookeeperVersion=3.6.1
+awaitilityVersion=3.1.6
+libthriftVersion=0.14.1
+bcprovVersion=1.78.1
+bcpkixVersion=1.79
+bcutilVersion=1.78.1
+llvmPlatformVersion=6.0.1-1.4.2
+plexusUtilsVersion=3.0.8
+lsp4jVersion=0.8.1
+lsp4jJsonrpcVersion=0.6.0
+hdrHistogramVersion=2.1.11
+javassistVersion=3.24.1-GA
+mimepullVersion=1.9.11
+jakartaActivationVersion=1.2.2
+mockitoVersion=1.10.19
+mvelVersion=2.4.4.Final
+scalaLibraryVersion=2.11.7
+testngVersion=6.14.3
+carbonMessagingVersion=2.3.7
+antlr4RuntimeVersion=4.5.1.wso2v1
+snakeyamlVersion=2.0
+transportHttpVersion=6.3.54
+transportFileVersion=6.0.55
+staxonVersion=1.2.0.wso2v2
+quartzVersion=2.3.2
+picocliVersion=4.0.1
+metricsCoreVersion=4.1.7
+natsStreamingVersion=2.2.1
+jnatsVersion=2.6.0
+swaggerModelsVersion=2.1.11
+progressbarVersion=0.7.4
+jlineVersion=3.11.0
+javaxTransactionVersion=1.3
+javaxWsRsVersion=2.1.1
+junitVersion=4.8.2
 
+# Distribution (javaLibsProject) dependency versions
+# Note: some differ from the constraint versions in javaProject.gradle
+carbonCoreVersion=5.1.0
+securevaultVersion=1.0.0-wso2v2
+geronimoActivationVersion=1.1
+jaxenVersion=1.1.6
+commonsPoolVersion=1.5.6.wso2v1
+carbonMetricsVersion=2.3.7
+amqpClientVersion=5.20.0
+jzlibVersion=1.1.3
+jbossLoggingVersion=3.3.1.Final
+commonsCollectionsVersion=3.2.2
+geronimoJsonVersion=1.0-alpha-1

gradle/javaLibsProject.gradle

@@ -24,80 +24,78 @@ configurations {
 }
 
 dependencies {
-    dist 'com.squareup.okhttp3:okhttp:4.11.0'
-    dist 'com.squareup.okio:okio:3.5.0'
-    dist 'com.squareup.okio:okio-jvm:3.5.0'
-    dist 'io.jaegertracing:jaeger-core:1.6.0'
-    dist 'io.jaegertracing:jaeger-thrift:1.6.0'
-    dist 'com.zaxxer:HikariCP:3.3.1'
-    dist 'io.dropwizard.metrics:metrics-core:3.1.0'
-    dist 'javax.transaction:javax.transaction-api:1.2'
-    dist 'org.apache.thrift:libthrift:0.14.1'
-    dist 'org.jvnet.mimepull:mimepull:1.9.7'
-    dist 'jakarta.activation:jakarta.activation-api:1.2.2'
-    dist 'org.quartz-scheduler:quartz:2.3.2'
-    dist 'org.wso2.carbon:org.wso2.carbon.core:5.1.0'
-    dist 'org.wso2.securevault:org.wso2.securevault:1.0.0-wso2v2'
-    dist 'org.wso2.transport.file:org.wso2.transport.local-file-system:6.0.55'
-    dist 'org.wso2.transport.http:org.wso2.transport.http.netty:6.3.54'
-    dist 'org.bouncycastle:bcprov-jdk18on:1.78.1'
-    dist 'org.bouncycastle:bcpkix-jdk18on:1.79'
-    dist 'org.bouncycastle:bcutil-jdk18on:1.78.1'
+    dist "com.squareup.okhttp3:okhttp:${okhttpVersion}"
+    dist "com.squareup.okio:okio:${okioVersion}"
+    dist "com.squareup.okio:okio-jvm:${okioVersion}"
+    dist "io.jaegertracing:jaeger-core:${jaegerVersion}"
+    dist "io.jaegertracing:jaeger-thrift:${jaegerVersion}"
+    dist "com.zaxxer:HikariCP:${hikariCPVersion}"
+    dist "io.dropwizard.metrics:metrics-core:${metricsCoreVersion}"
+    dist "javax.transaction:javax.transaction-api:${javaxTransactionVersion}"
+    dist "org.apache.thrift:libthrift:${libthriftVersion}"
+    dist "org.jvnet.mimepull:mimepull:${mimepullVersion}"
+    dist "jakarta.activation:jakarta.activation-api:${jakartaActivationVersion}"
+    dist "org.quartz-scheduler:quartz:${quartzVersion}"
+    dist "org.wso2.carbon:org.wso2.carbon.core:${carbonCoreVersion}"
+    dist "org.wso2.securevault:org.wso2.securevault:${securevaultVersion}"
+    dist "org.wso2.transport.file:org.wso2.transport.local-file-system:${transportFileVersion}"
+    dist "org.wso2.transport.http:org.wso2.transport.http.netty:${transportHttpVersion}"
+    dist "org.bouncycastle:bcprov-jdk18on:${bcprovVersion}"
+    dist "org.bouncycastle:bcpkix-jdk18on:${bcpkixVersion}"
+    dist "org.bouncycastle:bcutil-jdk18on:${bcutilVersion}"
 
-    dist 'info.picocli:picocli:4.0.1'
-    dist 'org.apache.kafka:kafka-clients:3.9.1'
-    dist 'org.apache.kafka:kafka_2.13:3.9.1'
-    dist 'io.ballerina.messaging:broker-auth:0.970.0'
-    dist 'io.ballerina.messaging:broker-common:0.970.0'
-    dist 'io.ballerina.messaging:broker-coordination:0.970.0'
-    dist 'io.ballerina.messaging:broker-core:0.970.5'
-    dist 'io.ballerina.messaging:broker-rest-runner:0.970.0'
-    dist 'org.apache.geronimo.specs:geronimo-activation_1.1_spec:1.1'
-    dist 'org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:1.0.1'
-    dist 'com.google.code.gson:gson:2.8.9'
-    dist 'com.google.guava:guava:32.1.1-jre'
-    dist 'com.github.jknack:handlebars:4.3.1'
-    dist 'com.sun.mail:javax.mail:1.6.2'
-    dist 'jaxen:jaxen:1.1.6'
-    dist 'io.netty:netty-buffer:4.1.125.Final'
-    dist 'io.netty:netty-codec-http2:4.1.125.Final'
-    dist 'io.netty:netty-codec-http:4.1.125.Final'
-    dist 'io.netty:netty-codec:4.1.125.Final'
-    dist 'io.netty:netty-common:4.1.125.Final'
-    dist 'io.netty:netty-handler-proxy:4.1.125.Final'
-    dist 'io.netty:netty-handler:4.1.125.Final'
-    dist 'io.netty:netty-resolver:4.1.125.Final'
-    dist 'io.netty:netty-transport-native-unix-common:4.1.125.Final'
-    dist 'io.netty:netty-tcnative-classes:2.0.65.Final'
-    dist 'io.netty:netty-tcnative-boringssl-static:2.0.65.Final'
-    dist 'io.netty:netty-tcnative-boringssl-static:2.0.65.Final:windows-x86_64'
-    dist 'io.netty:netty-tcnative-boringssl-static:2.0.65.Final:linux-aarch_64'
-    dist 'io.netty:netty-tcnative-boringssl-static:2.0.65.Final:linux-x86_64'
-    dist 'io.netty:netty-tcnative-boringssl-static:2.0.65.Final:osx-aarch_64'
-    dist 'io.netty:netty-tcnative-boringssl-static:2.0.65.Final:osx-x86_64'
-    dist 'io.netty:netty-transport:4.1.125.Final'
-    dist 'commons-pool.wso2:commons-pool:1.5.6.wso2v1'
-    dist 'org.wso2.carbon.messaging:org.wso2.carbon.messaging:2.3.7'
-    dist 'org.wso2.carbon.metrics:org.wso2.carbon.metrics.core:2.3.7'
-    dist 'com.google.protobuf:protobuf-java:3.25.5'
-    dist 'com.sun.mail:javax.mail:1.6.2'
-    dist 'org.yaml:snakeyaml:2.0'
-    dist 'org.wso2.staxon:staxon-core:1.2.0.wso2v2'
-    dist 'com.rabbitmq:amqp-client:5.20.0'
-    dist 'com.jcraft:jzlib:1.1.3'
-    dist 'io.nats:java-nats-streaming:2.2.1'
-    dist 'io.nats:jnats:2.6.0'
-    dist 'commons-beanutils:commons-beanutils:1.11.0'
-    dist 'org.jboss.logging:jboss-logging:3.3.1.Final'
-    dist 'commons-collections:commons-collections:3.2.2'
-    dist 'org.apache.geronimo.specs:geronimo-json_1.0_spec:1.0-alpha-1'
-    dist 'io.netty:netty-transport-native-epoll:4.1.125.Final'
-    dist 'io.netty:netty-transport-native-kqueue:4.1.125.Final'
-    dist 'org.apache.ws.commons.axiom:axiom-api:1.2.22'
-    dist 'org.apache.ws.commons.axiom:axiom-impl:1.2.22'
-    dist 'commons-codec:commons-codec:1.15'
-//    dist 'com.fasterxml.woodstox:woodstox-core:6.5.0'
-//    dist 'org.codehaus.woodstox:stax2-api:4.2.1'
+    dist "info.picocli:picocli:${picocliVersion}"
+    dist "org.apache.kafka:kafka-clients:${kafkaClientsVersion}"
+    dist "org.apache.kafka:kafka_2.13:${kafkaScalaVersion}"
+    dist "io.ballerina.messaging:broker-auth:${messageBrokerVersion}"
+    dist "io.ballerina.messaging:broker-common:${messageBrokerVersion}"
+    dist "io.ballerina.messaging:broker-coordination:${messageBrokerVersion}"
+    dist "io.ballerina.messaging:broker-core:${messageBrokerVersion}"
+    dist "io.ballerina.messaging:broker-rest-runner:${messageBrokerVersion}"
+    dist "org.apache.geronimo.specs:geronimo-activation_1.1_spec:${geronimoActivationVersion}"
+    dist "org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:${geronimoStaxVersion}"
+    dist "com.google.code.gson:gson:${gsonVersion}"
+    dist "com.google.guava:guava:${guavaVersion}"
+    dist "com.github.jknack:handlebars:${handlebarsVersion}"
+    dist "com.sun.mail:javax.mail:${javaxMailVersion}"
+    dist "jaxen:jaxen:${jaxenVersion}"
+    dist "io.netty:netty-buffer:${nettyVersion}"
+    dist "io.netty:netty-codec-http2:${nettyVersion}"
+    dist "io.netty:netty-codec-http:${nettyVersion}"
+    dist "io.netty:netty-codec:${nettyVersion}"
+    dist "io.netty:netty-common:${nettyVersion}"
+    dist "io.netty:netty-handler-proxy:${nettyVersion}"
+    dist "io.netty:netty-handler:${nettyVersion}"
+    dist "io.netty:netty-resolver:${nettyVersion}"
+    dist "io.netty:netty-transport-native-unix-common:${nettyVersion}"
+    dist "io.netty:netty-tcnative-classes:${boringSslVersion}"
+    dist "io.netty:netty-tcnative-boringssl-static:${boringSslVersion}"
+    dist "io.netty:netty-tcnative-boringssl-static:${boringSslVersion}:windows-x86_64"
+    dist "io.netty:netty-tcnative-boringssl-static:${boringSslVersion}:linux-aarch_64"
+    dist "io.netty:netty-tcnative-boringssl-static:${boringSslVersion}:linux-x86_64"
+    dist "io.netty:netty-tcnative-boringssl-static:${boringSslVersion}:osx-aarch_64"
+    dist "io.netty:netty-tcnative-boringssl-static:${boringSslVersion}:osx-x86_64"
+    dist "io.netty:netty-transport:${nettyVersion}"
+    dist "commons-pool.wso2:commons-pool:${commonsPoolVersion}"
+    dist "org.wso2.carbon.messaging:org.wso2.carbon.messaging:${carbonMessagingVersion}"
+    dist "org.wso2.carbon.metrics:org.wso2.carbon.metrics.core:${carbonMetricsVersion}"
+    dist "com.google.protobuf:protobuf-java:${protobufVersion}"
+    dist "com.sun.mail:javax.mail:${javaxMailVersion}"
+    dist "org.yaml:snakeyaml:${snakeyamlVersion}"
+    dist "org.wso2.staxon:staxon-core:${staxonVersion}"
+    dist "com.rabbitmq:amqp-client:${amqpClientVersion}"
+    dist "com.jcraft:jzlib:${jzlibVersion}"
+    dist "io.nats:java-nats-streaming:${natsStreamingVersion}"
+    dist "io.nats:jnats:${jnatsVersion}"
+    dist "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}"
+    dist "org.jboss.logging:jboss-logging:${jbossLoggingVersion}"
+    dist "commons-collections:commons-collections:${commonsCollectionsVersion}"
+    dist "org.apache.geronimo.specs:geronimo-json_1.0_spec:${geronimoJsonVersion}"
+    dist "io.netty:netty-transport-native-epoll:${nettyVersion}"
+    dist "io.netty:netty-transport-native-kqueue:${nettyVersion}"
+    dist "org.apache.ws.commons.axiom:axiom-api:${apacheAxiomVersion}"
+    dist "org.apache.ws.commons.axiom:axiom-impl:${apacheAxiomVersion}"
+    dist "commons-codec:commons-codec:${commonsCodecVersion}"
 
     dist project(':ballerina-auth')
     dist project(':ballerina-cli-utils')