Merge pull request #10 from ayeshLK/main

Pack `time-native` dependency to the bala
ballerina-platform · Dec 20, 2024 · 0f6964a · 0f6964a
2 parents a6da1ab + 010f411
commit 0f6964a
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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"},

diff --git 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
@@ -17,3 +17,9 @@ groupId = "io.ballerina.lib"
 artifactId = "aws.marketplace.mpe-native"
 version = "@project.version@"
 path = "../native/build/libs/[email protected]@.jar"
+
+[[platform.java17.dependency]]
+groupId = "io.ballerina.stdlib"
+artifactId = "time-native"
+version = "@time.native.version@"
+path = "./lib/[email protected]@.jar"