Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17.0.7
java-version: 21.0.3
- name: Set up Ballerina
if: github.event_name == 'workflow_dispatch'
uses: ballerina-platform/setup-ballerina@v1.1.0
uses: ballerina-platform/setup-ballerina@v1.1.3
with:
version: ${{ github.event.inputs.ballerina_version }}
- name: Set up Ballerina
if: github.event_name == 'push'
uses: ballerina-platform/setup-ballerina@v1.1.0
uses: ballerina-platform/setup-ballerina@vv1.1.3
with:
version: ${{ env.BALLERINA_DISTRIBUTION_VERSION }}
- name: Change to Timestamped Version
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/central-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
if: github.repository_owner == 'ballerina-platform'
steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17.0.7
java-version: 21.0.3
- name: Set up Ballerina
uses: ballerina-platform/setup-ballerina@v1.1.0
uses: ballerina-platform/setup-ballerina@v1.1.3
with:
version: ${{ github.event.inputs.ballerina_version }}
- name: Build with Gradle
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/daily-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17.0.7
java-version: 21.0.3
- name: Set up Ballerina
if: github.event_name == 'workflow_dispatch'
uses: ballerina-platform/setup-ballerina@v1.1.0
uses: ballerina-platform/setup-ballerina@v1.1.3
with:
version: ${{ github.event.inputs.ballerina_version }}
- name: Set up Ballerina
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/graalvm-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: graalvm/setup-graalvm@v1
with:
version: 'latest'
java-version: '17.0.7'
java-version: '21.0.3'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Check GraalVM installation
Expand All @@ -33,7 +33,7 @@ jobs:
native-image --version
- name: Set up Ballerina
if: github.event_name == 'workflow_dispatch'
uses: ballerina-platform/setup-ballerina@v1.1.0
uses: ballerina-platform/setup-ballerina@v1.1.3
with:
version: ${{ github.event.inputs.ballerina_version }}
- name: Set up Ballerina
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17.0.7
java-version: 21.0.3
- name: Set up Ballerina
uses: ballerina-platform/setup-ballerina@v1.1.0
uses: ballerina-platform/setup-ballerina@v1.1.3
with:
version: ${{ github.event.inputs.ballerina_version }}
- name: Set version env variable
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ name: Validate Pull Request
on: pull_request

env:
BALLERINA_DISTRIBUTION_VERSION: 2201.10.3 # Update this with the latest Ballerina version
BALLERINA_DISTRIBUTION_VERSION: nightly-2201.11.x # Update this with the latest Ballerina version

jobs:
ubuntu-build:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 17.0.7
distribution: 'temurin'
java-version: 21.0.3
- name: Set up Ballerina
uses: ballerina-platform/setup-ballerina@v1.1.0
uses: ballerina-platform/setup-ballerina@v1.1.3
with:
version: ${{ env.BALLERINA_DISTRIBUTION_VERSION }}
- name: Grant execute permission for gradlew
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

### Setting Up the Prerequisites

1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations).
1. Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations).

* [Oracle](https://www.oracle.com/java/technologies/downloads/)

Expand Down
52 changes: 26 additions & 26 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,150 +18,150 @@
org = "ballerinax"
name = "newrelic"
version = "@toml.version@"
distribution = "2201.10.0"
distribution = "2201.11.0"

[platform.java17]
[platform.java21]
graalvmCompatible = true

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "../native/build/libs/newrelic-extension-native-@project.version@.jar"
groupId = "ballerina"
artifactId = "newrelic-extension-native"
version = "@project.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/telemetry-all-@newrelic.telemetry.version@.jar"
groupId = "com.newrelic.telemetry"
artifactId = "telemetry-all"
version = "@newrelic.telemetry.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/telemetry-http-okhttp-@newrelic.telemetry.version@.jar"
groupId = "com.newrelic.telemetry"
artifactId = "telemetry-http-okhttp"
version = "@newrelic.telemetry.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/okio-jvm-@okio.version@.jar"
groupId = "com.squareup.okio"
artifactId = "okio"
version = "@okio.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/okhttp-@okhttp.version@.jar"
groupId = "com.squareup.okhttp3"
artifactId = "okhttp"
version = "@okhttp.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/kotlin-runtime-@kotlin.version@.jar"
groupId = "org.jetbrains.kotlin"
artifactId = "kotlin-runtime"
version = "@kotlin.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/kotlin-stdlib-@kotlinStdlib.version@.jar"
groupId = "org.jetbrains.kotlin"
artifactId = "kotlin-stdlib"
version = "@kotlinStdlib.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/opentelemetry-sdk-trace-@opentelemetrySDK.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-sdk-trace"
version = "@opentelemetrySDK.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/opentelemetry-sdk-common-@opentelemetrySDK.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-sdk-common"
version = "@opentelemetrySDK.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/opentelemetry-semconv-@opentelemetrySemconv.version@.jar"
groupId = "io.opentelemetry.semconv"
artifactId = "opentelemetry-semconv"
version = "@opentelemetrySemconv.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/opentelemetry-proto-@opentelemetryProto.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-proto"
version = "@opentelemetryProto.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/opentelemetry-exporter-otlp-trace-@opentelemetryExporter.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-exporter-otlp-trace"
version = "@opentelemetryExporter.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/opentelemetry-exporter-otlp-common-@opentelemetryExporter.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-exporter-otlp-common"
version = "@opentelemetryExporter.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/opentelemetry-extension-trace-propagators-@opentelemetry.version@.jar"
groupId = "io.opentelemetry"
artifactId = "opentelemetry-extension-trace-propagators"
version = "@opentelemetry.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/guava-@guava.version@.jar"
groupId = "com.google.guava"
artifactId = "guava"
version = "@guava.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/failureaccess-@failureAccess.version@.jar"
groupId = "com.google.guava"
artifactId = "failureaccess"
version = "@failureAccess.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/grpc-api-@grpc.version@.jar"
groupId = "io.grpc"
artifactId = "grpc-api"
version = "@grpc.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/grpc-context-@grpc.version@.jar"
groupId = "io.grpc"
artifactId = "grpc-context"
version = "@grpc.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/grpc-core-@grpc.version@.jar"
groupId = "io.grpc"
artifactId = "grpc-core"
version = "@grpc.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/grpc-stub-@grpc.version@.jar"
groupId = "io.grpc"
artifactId = "grpc-stub"
version = "@grpc.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/grpc-protobuf-@grpc.version@.jar"
groupId = "io.grpc"
artifactId = "grpc-protobuf"
version = "@grpc.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/grpc-protobuf-lite-@grpc.version@.jar"
groupId = "io.grpc"
artifactId = "grpc-protobuf-lite"
version = "@grpc.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/grpc-netty-shaded-@grpc.version@.jar"
groupId = "io.grpc"
artifactId = "grpc-netty-shaded"
version = "@grpc.version@"

[[platform.java17.dependency]]
[[platform.java21.dependency]]
path = "./lib/perfmark-api-@perfmark.version@.jar"
groupId = "io.perfmark"
artifactId = "perfmark-api"
Expand Down
12 changes: 6 additions & 6 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.10.0"
distribution-version = "2201.11.0-20241218-101200-109f6cc7"

[[package]]
org = "ballerina"
name = "io"
version = "1.6.3"
version = "1.7.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.value"}
Expand All @@ -35,7 +35,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "log"
version = "2.10.0"
version = "2.11.0"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
Expand All @@ -49,7 +49,7 @@ modules = [
[[package]]
org = "ballerina"
name = "observe"
version = "1.3.0"
version = "1.4.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand All @@ -61,7 +61,7 @@ modules = [
[[package]]
org = "ballerina"
name = "os"
version = "1.8.0"
version = "1.9.0"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"}
Expand All @@ -73,7 +73,7 @@ modules = [
[[package]]
org = "ballerinax"
name = "newrelic"
version = "0.8.0"
version = "1.0.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "log"},
Expand Down
4 changes: 2 additions & 2 deletions ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ def snapshotVersion = "-SNAPSHOT"
def tomlVersion = stripBallerinaExtensionVersion("${project.version}")
def ballerinaCentralAccessToken = System.getenv('BALLERINA_CENTRAL_ACCESS_TOKEN')
def originalConfig = ballerinaConfigFile.text
def artifactJar = file("$project.projectDir/target/cache/${packageOrg}/${packageName}/${tomlVersion}/java17/")
def platform = "java17"
def artifactJar = file("$project.projectDir/target/cache/${packageOrg}/${packageName}/${tomlVersion}/java21/")
def platform = "java21"
def skipTests = false

def stripBallerinaExtensionVersion(String extVersion) {
Expand Down
Loading
Loading