From 820a61191a7f9475f23b37909f3f3a176b95dbec Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Fri, 20 Dec 2024 01:42:49 +0530 Subject: [PATCH 1/3] [Automated] Update the toml files --- ballerina/Ballerina.toml | 12 +++++++++--- ballerina/Dependencies.toml | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index d518b25..1a583cf 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -2,7 +2,7 @@ distribution = "2201.9.2" org = "ballerinax" name = "aws.marketplace.mpe" -version = "0.1.0" +version = "0.1.1" license= ["Apache-2.0"] authors = ["Ballerina"] keywords = ["AWS", "Marketplace", "Cloud/Subscriptions", "Entitlement Management"] @@ -15,5 +15,11 @@ graalvmCompatible = true [[platform.java17.dependency]] groupId = "io.ballerina.lib" artifactId = "aws.marketplace.mpe-native" -version = "0.1.0" -path = "../native/build/libs/aws.marketplace.mpe-native-0.1.0.jar" +version = "0.1.1-SNAPSHOT" +path = "../native/build/libs/aws.marketplace.mpe-native-0.1.1-SNAPSHOT.jar" + +[[platform.java17.dependency]] +groupId = "io.ballerina.stdlib" +artifactId = "time-native" +version = "2.4.0" +path = "./lib/time-native-2.4.0.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 1e0f2b5..c2d59b2 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -40,7 +40,7 @@ modules = [ [[package]] org = "ballerinax" name = "aws.marketplace.mpe" -version = "0.1.0" +version = "0.1.1" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, From 1d900ab9506a64347cf4636b7b33e71821e0e724 Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Fri, 20 Dec 2024 01:43:18 +0530 Subject: [PATCH 2/3] Pack time-native dependency to the bala --- ballerina/build.gradle | 9 +++++++++ build-config/resources/Ballerina.toml | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index a0fc28c..7dea5fc 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -52,10 +52,19 @@ ballerina { platform = "java17" } +configurations { + externalJars +} + +dependencies { + externalJars(group: 'io.ballerina.stdlib', name: 'time-native', version: "${stdlibTimeVersion}") +} + task updateTomlFiles { doLast { def newBallerinaToml = ballerinaTomlFilePlaceHolder.text.replace("@project.version@", project.version) newBallerinaToml = newBallerinaToml.replace("@toml.version@", tomlVersion) + newBallerinaToml = newBallerinaToml.replace('@time.native.version@', project.stdlibTimeVersion) ballerinaTomlFile.text = newBallerinaToml } } diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 3ba671b..b6eaa12 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -17,3 +17,9 @@ groupId = "io.ballerina.lib" artifactId = "aws.marketplace.mpe-native" version = "@project.version@" path = "../native/build/libs/aws.marketplace.mpe-native-@project.version@.jar" + +[[platform.java17.dependency]] +groupId = "io.ballerina.stdlib" +artifactId = "time-native" +version = "@time.native.version@" +path = "./lib/time-native-@time.native.version@.jar" From 010f411b097d451039e76b6c9d0bd2e096f69ad8 Mon Sep 17 00:00:00 2001 From: Ayesh Almeida Date: Fri, 20 Dec 2024 01:57:02 +0530 Subject: [PATCH 3/3] Update package workflows to use 2201.10.x branch --- .github/workflows/build-with-bal-test-graalvm.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/daily-build.yml | 2 +- .github/workflows/dev-stg-release.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index 4f69d4d..374d64f 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -13,5 +13,5 @@ jobs: call_stdlib_workflow: name: Run StdLib Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-connector-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-connector-template.yml@2201.10.x secrets: inherit diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 322cad1..0ea126c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: call_workflow: name: Run Connector Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-connector-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/build-connector-template.yml@2201.10.x secrets: inherit with: repo-name: module-ballerinax-aws.marketplace.mpe diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index 23a70b7..e218100 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -8,7 +8,7 @@ jobs: call_workflow: name: Run Daily Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/daily-build-connector-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/daily-build-connector-template.yml@2201.10.x secrets: inherit with: repo-name: module-ballerinax-aws.marketplace.mpe diff --git a/.github/workflows/dev-stg-release.yml b/.github/workflows/dev-stg-release.yml index b85c07c..eb03f9a 100644 --- a/.github/workflows/dev-stg-release.yml +++ b/.github/workflows/dev-stg-release.yml @@ -15,7 +15,7 @@ jobs: call_workflow: name: Run Dev\Stage Central Publish Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/dev-stage-central-publish-connector-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/dev-stage-central-publish-connector-template.yml@2201.10.x secrets: inherit with: environment: ${{ github.event.inputs.environment }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 47662b5..8234a6c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,5 +10,5 @@ jobs: call_workflow: name: Run PR Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/pr-build-connector-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/pr-build-connector-template.yml@2201.10.x secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe8d537..825c318 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: call_workflow: name: Run Release Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/release-package-connector-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/release-package-connector-template.yml@2201.10.x secrets: inherit with: package-name: aws.marketplace.mpe diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index c02c8ff..c29d8f2 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -9,5 +9,5 @@ jobs: call_workflow: name: Run Trivy Scan Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@2201.10.x secrets: inherit