From f73a0da8cbed4c39c4a6c6a6a4aa703aa419b166 Mon Sep 17 00:00:00 2001 From: ballerina-bot Date: Mon, 11 Dec 2023 05:58:09 +0000 Subject: [PATCH 1/3] [Gradle Release Plugin] - pre tag commit: 'v0.7.0'. --- ballerina/Ballerina.toml | 106 ++++++++++++++++++------------------ ballerina/Dependencies.toml | 23 ++++++-- gradle.properties | 2 +- 3 files changed, 71 insertions(+), 60 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index fa15787..ed6d458 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -17,165 +17,165 @@ [package] org = "ballerinax" name = "newrelic" -version = "@toml.version@" +version = "0.7.0" distribution = "2201.8.2" [platform.java17] graalvmCompatible = true [[platform.java17.dependency]] -path = "../native/build/libs/newrelic-extension-native-@project.version@.jar" +path = "../native/build/libs/newrelic-extension-native-0.7.0.jar" groupId = "ballerina" artifactId = "newrelic-extension-native" -version = "@project.version@" +version = "0.7.0" [[platform.java17.dependency]] -path = "./lib/telemetry-all-@newrelic.telemetry.version@.jar" +path = "./lib/telemetry-all-0.16.0.jar" groupId = "com.newrelic.telemetry" artifactId = "telemetry-all" -version = "@newrelic.telemetry.version@" +version = "0.16.0" [[platform.java17.dependency]] -path = "./lib/telemetry-http-okhttp-@newrelic.telemetry.version@.jar" +path = "./lib/telemetry-http-okhttp-0.16.0.jar" groupId = "com.newrelic.telemetry" artifactId = "telemetry-http-okhttp" -version = "@newrelic.telemetry.version@" +version = "0.16.0" [[platform.java17.dependency]] -path = "./lib/okio-jvm-@okio.version@.jar" +path = "./lib/okio-jvm-3.5.0.jar" groupId = "com.squareup.okio" artifactId = "okio" -version = "@okio.version@" +version = "3.5.0" [[platform.java17.dependency]] -path = "./lib/okhttp-@okhttp.version@.jar" +path = "./lib/okhttp-4.11.0.jar" groupId = "com.squareup.okhttp3" artifactId = "okhttp" -version = "@okhttp.version@" +version = "4.11.0" [[platform.java17.dependency]] -path = "./lib/kotlin-runtime-@kotlin.version@.jar" +path = "./lib/kotlin-runtime-1.2.71.jar" groupId = "org.jetbrains.kotlin" artifactId = "kotlin-runtime" -version = "@kotlin.version@" +version = "1.2.71" [[platform.java17.dependency]] -path = "./lib/kotlin-stdlib-@kotlinStdlib.version@.jar" +path = "./lib/kotlin-stdlib-1.8.22.jar" groupId = "org.jetbrains.kotlin" artifactId = "kotlin-stdlib" -version = "@kotlinStdlib.version@" +version = "1.8.22" [[platform.java17.dependency]] -path = "./lib/opentelemetry-api-@opentelemetry.version@.jar" +path = "./lib/opentelemetry-api-1.0.0.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-api" -version = "@opentelemetry.version@" +version = "1.0.0" [[platform.java17.dependency]] -path = "./lib/opentelemetry-api-metrics-@openTelemetryAlpha.version@.jar" +path = "./lib/opentelemetry-api-metrics-1.0.0-alpha.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-api-metrics" -version = "@openTelemetryAlpha.version@" +version = "1.0.0-alpha" [[platform.java17.dependency]] -path = "./lib/opentelemetry-sdk-trace-@opentelemetry.version@.jar" +path = "./lib/opentelemetry-sdk-trace-1.0.0.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-sdk-trace" -version = "@opentelemetry.version@" +version = "1.0.0" [[platform.java17.dependency]] -path = "./lib/opentelemetry-sdk-common-@opentelemetry.version@.jar" +path = "./lib/opentelemetry-sdk-common-1.0.0.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-sdk-common" -version = "@opentelemetry.version@" +version = "1.0.0" [[platform.java17.dependency]] -path = "./lib/opentelemetry-semconv-@openTelemetryAlpha.version@.jar" +path = "./lib/opentelemetry-semconv-1.0.0-alpha.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-semconv" -version = "@openTelemetryAlpha.version@" +version = "1.0.0-alpha" [[platform.java17.dependency]] -path = "./lib/opentelemetry-proto-@openTelemetryAlpha.version@.jar" +path = "./lib/opentelemetry-proto-1.0.0-alpha.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-proto" -version = "@openTelemetryAlpha.version@" +version = "1.0.0-alpha" [[platform.java17.dependency]] -path = "./lib/opentelemetry-exporter-otlp-trace-@opentelemetry.version@.jar" +path = "./lib/opentelemetry-exporter-otlp-trace-1.0.0.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-exporter-otlp-trace" -version = "@opentelemetry.version@" +version = "1.0.0" [[platform.java17.dependency]] -path = "./lib/opentelemetry-exporter-otlp-common-@opentelemetry.version@.jar" +path = "./lib/opentelemetry-exporter-otlp-common-1.0.0.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-exporter-otlp-common" -version = "@opentelemetry.version@" +version = "1.0.0" [[platform.java17.dependency]] -path = "./lib/opentelemetry-extension-trace-propagators-@opentelemetry.version@.jar" +path = "./lib/opentelemetry-extension-trace-propagators-1.0.0.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-extension-trace-propagators" -version = "@opentelemetry.version@" +version = "1.0.0" [[platform.java17.dependency]] -path = "./lib/guava-@guava.version@.jar" +path = "./lib/guava-32.1.2-jre.jar" groupId = "com.google.guava" artifactId = "guava" -version = "@guava.version@" +version = "32.1.2-jre" [[platform.java17.dependency]] -path = "./lib/failureaccess-@failureAccess.version@.jar" +path = "./lib/failureaccess-1.0.1.jar" groupId = "com.google.guava" artifactId = "failureaccess" -version = "@failureAccess.version@" +version = "1.0.1" [[platform.java17.dependency]] -path = "./lib/grpc-api-@grpc.version@.jar" +path = "./lib/grpc-api-1.60.0.jar" groupId = "io.grpc" artifactId = "grpc-api" -version = "@grpc.version@" +version = "1.60.0" [[platform.java17.dependency]] -path = "./lib/grpc-context-@grpc.version@.jar" +path = "./lib/grpc-context-1.60.0.jar" groupId = "io.grpc" artifactId = "grpc-context" -version = "@grpc.version@" +version = "1.60.0" [[platform.java17.dependency]] -path = "./lib/grpc-core-@grpc.version@.jar" +path = "./lib/grpc-core-1.60.0.jar" groupId = "io.grpc" artifactId = "grpc-core" -version = "@grpc.version@" +version = "1.60.0" [[platform.java17.dependency]] -path = "./lib/grpc-stub-@grpc.version@.jar" +path = "./lib/grpc-stub-1.60.0.jar" groupId = "io.grpc" artifactId = "grpc-stub" -version = "@grpc.version@" +version = "1.60.0" [[platform.java17.dependency]] -path = "./lib/grpc-protobuf-@grpc.version@.jar" +path = "./lib/grpc-protobuf-1.60.0.jar" groupId = "io.grpc" artifactId = "grpc-protobuf" -version = "@grpc.version@" +version = "1.60.0" [[platform.java17.dependency]] -path = "./lib/grpc-protobuf-lite-@grpc.version@.jar" +path = "./lib/grpc-protobuf-lite-1.60.0.jar" groupId = "io.grpc" artifactId = "grpc-protobuf-lite" -version = "@grpc.version@" +version = "1.60.0" [[platform.java17.dependency]] -path = "./lib/grpc-netty-shaded-@grpc.version@.jar" +path = "./lib/grpc-netty-shaded-1.60.0.jar" groupId = "io.grpc" artifactId = "grpc-netty-shaded" -version = "@grpc.version@" +version = "1.60.0" [[platform.java17.dependency]] -path = "./lib/perfmark-api-@perfmark.version@.jar" +path = "./lib/perfmark-api-0.23.0.jar" groupId = "io.perfmark" artifactId = "perfmark-api" -version = "@perfmark.version@" +version = "0.23.0" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 5955a7f..c1bd84a 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.3" +distribution-version = "2201.8.4" [[package]] org = "ballerina" @@ -15,9 +15,6 @@ dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} ] -modules = [ - {org = "ballerina", packageName = "io", moduleName = "io"} -] [[package]] org = "ballerina" @@ -35,6 +32,20 @@ dependencies = [ {org = "ballerina", name = "jballerina.java"} ] +[[package]] +org = "ballerina" +name = "log" +version = "2.9.0" +dependencies = [ + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.value"}, + {org = "ballerina", name = "observe"} +] +modules = [ + {org = "ballerina", packageName = "log", moduleName = "log"} +] + [[package]] org = "ballerina" name = "observe" @@ -50,10 +61,10 @@ modules = [ [[package]] org = "ballerinax" name = "newrelic" -version = "0.8.2" +version = "0.7.0" dependencies = [ - {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "log"}, {org = "ballerina", name = "observe"} ] modules = [ diff --git a/gradle.properties b/gradle.properties index 26bd12c..b9b75e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ # under the License. group=org.ballerinalang -version=0.7.0-SNAPSHOT +version=0.7.0 ballerinaLangVersion=2201.8.2 org.gradle.caching=true org.gradle.parallel=true From c55b8f9442019c416c07e4ebd959fc8e8f386b10 Mon Sep 17 00:00:00 2001 From: ballerina-bot Date: Mon, 11 Dec 2023 05:58:11 +0000 Subject: [PATCH 2/3] [Gradle Release Plugin] - new version commit: 'v0.7.1-SNAPSHOT'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b9b75e1..65039e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ # under the License. group=org.ballerinalang -version=0.7.0 +version=0.7.1-SNAPSHOT ballerinaLangVersion=2201.8.2 org.gradle.caching=true org.gradle.parallel=true From 3bb5199e768630517c74c91d42c75ae46266bbf1 Mon Sep 17 00:00:00 2001 From: Nipuna Madhushan <51471998+NipunaMadhushan@users.noreply.github.com> Date: Mon, 11 Dec 2023 12:11:43 +0530 Subject: [PATCH 3/3] Update Ballerina.toml --- ballerina/Ballerina.toml | 107 +++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 54 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index ed6d458..f671760 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -17,165 +17,164 @@ [package] org = "ballerinax" name = "newrelic" -version = "0.7.0" +version = "@toml.version@" distribution = "2201.8.2" [platform.java17] graalvmCompatible = true [[platform.java17.dependency]] -path = "../native/build/libs/newrelic-extension-native-0.7.0.jar" +path = "../native/build/libs/newrelic-extension-native-@project.version@.jar" groupId = "ballerina" artifactId = "newrelic-extension-native" -version = "0.7.0" +version = "@project.version@" [[platform.java17.dependency]] -path = "./lib/telemetry-all-0.16.0.jar" +path = "./lib/telemetry-all-@newrelic.telemetry.version@.jar" groupId = "com.newrelic.telemetry" artifactId = "telemetry-all" -version = "0.16.0" +version = "@newrelic.telemetry.version@" [[platform.java17.dependency]] -path = "./lib/telemetry-http-okhttp-0.16.0.jar" +path = "./lib/telemetry-http-okhttp-@newrelic.telemetry.version@.jar" groupId = "com.newrelic.telemetry" artifactId = "telemetry-http-okhttp" -version = "0.16.0" +version = "@newrelic.telemetry.version@" [[platform.java17.dependency]] -path = "./lib/okio-jvm-3.5.0.jar" +path = "./lib/okio-jvm-@okio.version@.jar" groupId = "com.squareup.okio" artifactId = "okio" -version = "3.5.0" +version = "@okio.version@" [[platform.java17.dependency]] -path = "./lib/okhttp-4.11.0.jar" +path = "./lib/okhttp-@okhttp.version@.jar" groupId = "com.squareup.okhttp3" artifactId = "okhttp" -version = "4.11.0" +version = "@okhttp.version@" [[platform.java17.dependency]] -path = "./lib/kotlin-runtime-1.2.71.jar" +path = "./lib/kotlin-runtime-@kotlin.version@.jar" groupId = "org.jetbrains.kotlin" artifactId = "kotlin-runtime" -version = "1.2.71" +version = "@kotlin.version@" [[platform.java17.dependency]] -path = "./lib/kotlin-stdlib-1.8.22.jar" +path = "./lib/kotlin-stdlib-@kotlinStdlib.version@.jar" groupId = "org.jetbrains.kotlin" artifactId = "kotlin-stdlib" -version = "1.8.22" +version = "@kotlinStdlib.version@" [[platform.java17.dependency]] -path = "./lib/opentelemetry-api-1.0.0.jar" +path = "./lib/opentelemetry-api-@opentelemetry.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-api" -version = "1.0.0" +version = "@opentelemetry.version@" [[platform.java17.dependency]] -path = "./lib/opentelemetry-api-metrics-1.0.0-alpha.jar" +path = "./lib/opentelemetry-api-metrics-@openTelemetryAlpha.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-api-metrics" -version = "1.0.0-alpha" +version = "@openTelemetryAlpha.version@" [[platform.java17.dependency]] -path = "./lib/opentelemetry-sdk-trace-1.0.0.jar" +path = "./lib/opentelemetry-sdk-trace-@opentelemetry.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-sdk-trace" -version = "1.0.0" +version = "@opentelemetry.version@" [[platform.java17.dependency]] -path = "./lib/opentelemetry-sdk-common-1.0.0.jar" +path = "./lib/opentelemetry-sdk-common-@opentelemetry.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-sdk-common" -version = "1.0.0" +version = "@opentelemetry.version@" [[platform.java17.dependency]] -path = "./lib/opentelemetry-semconv-1.0.0-alpha.jar" +path = "./lib/opentelemetry-semconv-@openTelemetryAlpha.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-semconv" -version = "1.0.0-alpha" +version = "@openTelemetryAlpha.version@" [[platform.java17.dependency]] -path = "./lib/opentelemetry-proto-1.0.0-alpha.jar" +path = "./lib/opentelemetry-proto-@openTelemetryAlpha.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-proto" -version = "1.0.0-alpha" +version = "@openTelemetryAlpha.version@" [[platform.java17.dependency]] -path = "./lib/opentelemetry-exporter-otlp-trace-1.0.0.jar" +path = "./lib/opentelemetry-exporter-otlp-trace-@opentelemetry.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-exporter-otlp-trace" -version = "1.0.0" +version = "@opentelemetry.version@" [[platform.java17.dependency]] -path = "./lib/opentelemetry-exporter-otlp-common-1.0.0.jar" +path = "./lib/opentelemetry-exporter-otlp-common-@opentelemetry.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-exporter-otlp-common" -version = "1.0.0" +version = "@opentelemetry.version@" [[platform.java17.dependency]] -path = "./lib/opentelemetry-extension-trace-propagators-1.0.0.jar" +path = "./lib/opentelemetry-extension-trace-propagators-@opentelemetry.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-extension-trace-propagators" -version = "1.0.0" +version = "@opentelemetry.version@" [[platform.java17.dependency]] -path = "./lib/guava-32.1.2-jre.jar" +path = "./lib/guava-@guava.version@.jar" groupId = "com.google.guava" artifactId = "guava" -version = "32.1.2-jre" +version = "@guava.version@" [[platform.java17.dependency]] -path = "./lib/failureaccess-1.0.1.jar" +path = "./lib/failureaccess-@failureAccess.version@.jar" groupId = "com.google.guava" artifactId = "failureaccess" -version = "1.0.1" +version = "@failureAccess.version@" [[platform.java17.dependency]] -path = "./lib/grpc-api-1.60.0.jar" +path = "./lib/grpc-api-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-api" -version = "1.60.0" +version = "@grpc.version@" [[platform.java17.dependency]] -path = "./lib/grpc-context-1.60.0.jar" +path = "./lib/grpc-context-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-context" -version = "1.60.0" +version = "@grpc.version@" [[platform.java17.dependency]] -path = "./lib/grpc-core-1.60.0.jar" +path = "./lib/grpc-core-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-core" -version = "1.60.0" +version = "@grpc.version@" [[platform.java17.dependency]] -path = "./lib/grpc-stub-1.60.0.jar" +path = "./lib/grpc-stub-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-stub" -version = "1.60.0" +version = "@grpc.version@" [[platform.java17.dependency]] -path = "./lib/grpc-protobuf-1.60.0.jar" +path = "./lib/grpc-protobuf-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-protobuf" -version = "1.60.0" +version = "@grpc.version@" [[platform.java17.dependency]] -path = "./lib/grpc-protobuf-lite-1.60.0.jar" +path = "./lib/grpc-protobuf-lite-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-protobuf-lite" -version = "1.60.0" +version = "@grpc.version@" [[platform.java17.dependency]] -path = "./lib/grpc-netty-shaded-1.60.0.jar" +path = "./lib/grpc-netty-shaded-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-netty-shaded" -version = "1.60.0" +version = "@grpc.version@" [[platform.java17.dependency]] -path = "./lib/perfmark-api-0.23.0.jar" +path = "./lib/perfmark-api-@perfmark.version@.jar" groupId = "io.perfmark" artifactId = "perfmark-api" -version = "0.23.0" - +version = "@perfmark.version@"