From f85f2b361b8efd5ef938d0205787399eb1a24cdf Mon Sep 17 00:00:00 2001 From: gabilang Date: Thu, 22 Jun 2023 19:02:07 +0530 Subject: [PATCH 01/18] Migrate to Java 17 --- .github/workflows/build-timestamped-master.yml | 4 ++-- .github/workflows/central-publish.yml | 4 ++-- .github/workflows/publish-release.yml | 4 ++-- .github/workflows/pull-request.yml | 8 ++++---- .github/workflows/trivy-scan.yml | 4 ++-- README.md | 4 ++-- ballerina/Ballerina.toml | 8 ++++---- build-config/checkstyle/build.gradle | 4 ++-- build.gradle | 10 +++++----- gradle.properties | 6 ++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- 12 files changed, 33 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index 0ed9f518..8e2f7e3a 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -15,11 +15,11 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Change to Timestamped Version run: | startTime=$(TZ="Asia/Kolkata" date +'%Y%m%d-%H%M00') diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index a4ff4851..f251d30c 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -18,11 +18,11 @@ jobs: if: github.repository_owner == 'ballerina-platform' steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Build with Gradle env: packageUser: ${{ github.actor }} diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 9d89e48c..1749b97c 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -11,11 +11,11 @@ jobs: if: github.repository_owner == 'ballerina-platform' steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Build with Gradle env: packageUser: ${{ github.actor }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 151b5b3a..86097f30 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -8,11 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Build with Gradle env: packageUser: ${{ github.actor }} @@ -29,11 +29,11 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v1 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Build with Gradle env: packageUser: ${{ github.actor }} diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 3e3b3389..2939fd12 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -11,11 +11,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Build with Gradle env: packageUser: ${{ github.actor }} diff --git a/README.md b/README.md index f5f5b5b5..fcb20cdf 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ This repository only contains the source code for the package. ### Set up the prerequisites -1. Download and install Java SE Development Kit (JDK) version 11 (from one of the following locations). - * [Oracle](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html) +1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations). + * [Oracle](https://www.oracle.com/java/technologies/javase-jdk17-downloads.html) * [OpenJDK](https://adoptium.net/) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 00e0480d..ca39766c 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -9,22 +9,22 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.7.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-native" version = "1.7.0" path = "../native/build/libs/os-native-1.7.0-SNAPSHOT.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "io-native" version = "1.5.0" path = "./lib/io-native-1.5.0-20230620-192100-29cf327.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-test-utils" version = "1.7.0" diff --git a/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle index b89ab41f..1dbe8db0 100644 --- a/build-config/checkstyle/build.gradle +++ b/build-config/checkstyle/build.gradle @@ -23,8 +23,8 @@ apply plugin: 'java' task downloadCheckstyleRuleFiles(type: Download) { src([ - 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/checkstyle.xml', - 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/suppressions.xml' + 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/checkstyle.xml', + 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/suppressions.xml' ]) overwrite false onlyIfNewer true diff --git a/build.gradle b/build.gradle index da2dc5fc..b955a69e 100644 --- a/build.gradle +++ b/build.gradle @@ -17,14 +17,14 @@ */ plugins { - id "com.github.spotbugs" version "4.0.5" - id "com.github.johnrengelman.shadow" version "5.2.0" - id "de.undercouch.download" version "4.0.4" - id "net.researchgate.release" version "2.8.0" + id "com.github.spotbugs" version "${githubSpotBugsVersion}" + id "com.github.johnrengelman.shadow" version "${shadowJarVersion}" + id "de.undercouch.download" version "${undercouchDownloadVersion}" + id "net.researchgate.release" version "${researchgateReleaseVersion}" } ext.ballerinaLangVersion = project.ballerinaLangVersion -ext.puppycrawlCheckstyleVersion = "8.18" +ext.puppycrawlCheckstyleVersion = "${puppycrawlCheckstyleVersion}" ext.slf4jVersion = "1.7.30" ext.apacheCommonsVersion = "3.8.1" diff --git a/gradle.properties b/gradle.properties index e95360b4..a447b975 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,12 @@ group=io.ballerina.stdlib version=1.7.0-SNAPSHOT ballerinaGradlePluginVersion=1.1.0 +githubSpotBugsVersion=5.0.14 +shadowJarVersion=8.1.0 +undercouchDownloadVersion=5.4.0 +researchgateReleaseVersion=2.8.0 +puppycrawlCheckstyleVersion=10.12.0 + ballerinaLangVersion= 2201.7.0-20230622-064700-4a2dc6dd stdlibIoVersion=1.5.0-20230622-110500-8523dfe diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a97150..1f017e4e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 6653083c..86337951 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,7 @@ */ plugins { - id "com.gradle.enterprise" version "3.2" + id "com.gradle.enterprise" version "3.13.2" } rootProject.name = 'os' From 1bb553c8ccdbea153375d78bbb384ea12b82471c Mon Sep 17 00:00:00 2001 From: Waruna Lakshitha Date: Mon, 26 Jun 2023 13:51:43 +0530 Subject: [PATCH 02/18] Update bal gradle version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a447b975..e74c28a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.caching=true group=io.ballerina.stdlib version=1.7.0-SNAPSHOT -ballerinaGradlePluginVersion=1.1.0 +ballerinaGradlePluginVersion=2.0.0 githubSpotBugsVersion=5.0.14 shadowJarVersion=8.1.0 undercouchDownloadVersion=5.4.0 From 21e26dacd64bcb3e895d5140bc069b12df0e1d51 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Mon, 26 Jun 2023 23:40:04 +0530 Subject: [PATCH 03/18] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index ca39766c..a3635086 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -9,22 +9,22 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.7.0" -[platform.java17] +[platform.java11] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-native" version = "1.7.0" path = "../native/build/libs/os-native-1.7.0-SNAPSHOT.jar" -[[platform.java17.dependency]] +[[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "io-native" version = "1.5.0" -path = "./lib/io-native-1.5.0-20230620-192100-29cf327.jar" +path = "./lib/io-native-1.5.0-20230622-110500-8523dfe.jar" -[[platform.java17.dependency]] +[[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-test-utils" version = "1.7.0" From 6bc0385b8e2ce729a97d0fc7ed6890e0e6a0d2f0 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Mon, 26 Jun 2023 23:43:58 +0530 Subject: [PATCH 04/18] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index a3635086..fd3c93df 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -22,7 +22,7 @@ path = "../native/build/libs/os-native-1.7.0-SNAPSHOT.jar" groupId = "io.ballerina.stdlib" artifactId = "io-native" version = "1.5.0" -path = "./lib/io-native-1.5.0-20230622-110500-8523dfe.jar" +path = "./lib/io-native-1.5.0-SNAPSHOT.jar" [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" From 64a6fbfb4ffaef4e1538b9bf5b8a67b64c2ea731 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Mon, 26 Jun 2023 23:47:36 +0530 Subject: [PATCH 05/18] Migrate to Java 17 --- .github/workflows/build-timestamped-master.yml | 4 ++-- .github/workflows/central-publish.yml | 4 ++-- .github/workflows/publish-release.yml | 4 ++-- .github/workflows/pull-request.yml | 4 ++-- .github/workflows/trivy-scan.yml | 4 ++-- .github/workflows/update_specs.yml | 2 +- ballerina/Ballerina.toml | 10 +++++----- build-config/resources/Ballerina.toml | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index 8e2f7e3a..9dcc4ed3 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -14,9 +14,9 @@ jobs: if: github.repository_owner == 'ballerina-platform' steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index f251d30c..e3df5daa 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -17,9 +17,9 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'ballerina-platform' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 1749b97c..0ea78fd5 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -10,9 +10,9 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'ballerina-platform' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 86097f30..8f7b22a0 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -7,9 +7,9 @@ jobs: name: Build on Ubuntu runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 2939fd12..fb502e61 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -10,9 +10,9 @@ jobs: name: Build on Ubuntu runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/update_specs.yml b/.github/workflows/update_specs.yml index 3af6d4a4..7815278d 100644 --- a/.github/workflows/update_specs.yml +++ b/.github/workflows/update_specs.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Get current date id: date diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index fd3c93df..ca39766c 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -9,22 +9,22 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.7.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-native" version = "1.7.0" path = "../native/build/libs/os-native-1.7.0-SNAPSHOT.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "io-native" version = "1.5.0" -path = "./lib/io-native-1.5.0-SNAPSHOT.jar" +path = "./lib/io-native-1.5.0-20230620-192100-29cf327.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-test-utils" version = "1.7.0" diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 16911193..f23eb666 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -9,22 +9,22 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.7.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-native" version = "@toml.version@" path = "../native/build/libs/os-native-@project.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "io-native" version = "@io.version@" path = "./lib/io-native-@io.native.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-test-utils" version = "@toml.version@" From 68c1ac38fd0f70a92adc0d4b5337456e76162139 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Mon, 10 Jul 2023 10:53:18 +0530 Subject: [PATCH 06/18] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 2 +- ballerina/Dependencies.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index ca39766c..7dc11342 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -22,7 +22,7 @@ path = "../native/build/libs/os-native-1.7.0-SNAPSHOT.jar" groupId = "io.ballerina.stdlib" artifactId = "io-native" version = "1.5.0" -path = "./lib/io-native-1.5.0-20230620-192100-29cf327.jar" +path = "./lib/io-native-1.5.0-20230622-110500-8523dfe.jar" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index ef4c7f7c..5056d4f0 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.7.0-20230619-175900-bb4e4544" +distribution-version = "2201.8.0-SNAPSHOT" [[package]] org = "ballerina" From 94ff7215b4354ce683cb70c57003d6dae7cfc25b Mon Sep 17 00:00:00 2001 From: gabilang Date: Mon, 10 Jul 2023 09:56:54 +0530 Subject: [PATCH 07/18] Disable failing tests temporarily --- ballerina/tests/os_test.bal | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ballerina/tests/os_test.bal b/ballerina/tests/os_test.bal index 68843dd5..d903a34e 100644 --- a/ballerina/tests/os_test.bal +++ b/ballerina/tests/os_test.bal @@ -51,6 +51,7 @@ function setEnvDataProvider() returns (string[][]) { } @test:Config { + enable: false, dataProvider: setEnvDataProvider } function testSetEnv(string key, string value) { @@ -91,6 +92,7 @@ function unsetEnvDataProvider() returns (string[][]) { } @test:Config { + enable: false, dataProvider: unsetEnvDataProvider } function testUnsetEnv(string key, string value) { @@ -208,7 +210,9 @@ function testExecWithOutputStdErr() returns error? { test:assertTrue(stdErrString.includes("hello world")); } -@test:Config {} +@test:Config { + enable: false +} function testExecWithEnvironmentVariable() returns error? { Process process = check exec({value: bal_exec_path, arguments: ["run", "tests/resources/hello3.bal"]}, BAL_CONFIG_FILES = "tests/resources/config/Config.toml"); int exitCode = check process.waitForExit(); From 5dbbc29b92544f712b3efd207741f2fa84c2dc98 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Mon, 10 Jul 2023 11:14:04 +0530 Subject: [PATCH 08/18] Disable falling test --- ballerina/tests/os_test.bal | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ballerina/tests/os_test.bal b/ballerina/tests/os_test.bal index d903a34e..179cf79a 100644 --- a/ballerina/tests/os_test.bal +++ b/ballerina/tests/os_test.bal @@ -20,7 +20,9 @@ import ballerina/io; configurable string bal_exec_path = ?; -@test:Config {} +@test:Config { + enable:false +} function testGetEnv() { string expectedValue = getExpectedValidEnv(); test:assertEquals(getEnv("JAVA_HOME"), expectedValue); From 287f951733fcd2daac79cccf46d3370791dbf6c0 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Tue, 11 Jul 2023 23:06:50 +0530 Subject: [PATCH 09/18] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 7dc11342..f278c81f 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -12,6 +12,11 @@ distribution = "2201.7.0" [platform.java17] graalvmCompatible = true +[[platform.java17.dependency]] +groupId = "org.burningwave" +artifactId = "core" +version = "12.62.7" + [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-native" From 589a779631a0bd33328108edea04884feac50ed9 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Tue, 11 Jul 2023 23:07:50 +0530 Subject: [PATCH 10/18] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index f278c81f..1e9673c0 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -16,6 +16,7 @@ graalvmCompatible = true groupId = "org.burningwave" artifactId = "core" version = "12.62.7" +path = "./lib/core-12.62.7.jar" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" From 51cf974589d2f4222b6438f40738adf73ce32d8e Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Tue, 11 Jul 2023 23:12:45 +0530 Subject: [PATCH 11/18] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 1e9673c0..a77cd70b 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -16,7 +16,13 @@ graalvmCompatible = true groupId = "org.burningwave" artifactId = "core" version = "12.62.7" -path = "./lib/core-12.62.7.jar" +path = "./lib/core-@burningwaveVersion@.jar" + +[[platform.java17.dependency]] +groupId = "io.github.toolfactory" +artifactId = "jvm-driver" +version = "9.4.3" +path = "./lib/jvm-driver-@toolfactoryVersion@.jar" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" From 573c2de6054e976ea4cc018921ea349372347806 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Tue, 11 Jul 2023 23:13:52 +0530 Subject: [PATCH 12/18] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index a77cd70b..665791dd 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -16,13 +16,13 @@ graalvmCompatible = true groupId = "org.burningwave" artifactId = "core" version = "12.62.7" -path = "./lib/core-@burningwaveVersion@.jar" +path = "./lib/core-12.62.7.jar" [[platform.java17.dependency]] groupId = "io.github.toolfactory" artifactId = "jvm-driver" version = "9.4.3" -path = "./lib/jvm-driver-@toolfactoryVersion@.jar" +path = "./lib/jvm-driver-9.4.3.jar" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" From afa4b55b5c9123b09d60fb70d2d60dd8e1496a81 Mon Sep 17 00:00:00 2001 From: gabilang Date: Fri, 14 Jul 2023 23:07:53 +0530 Subject: [PATCH 13/18] Fix oracle jdk download link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fcb20cdf..b127c82a 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This repository only contains the source code for the package. ### Set up the prerequisites 1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations). - * [Oracle](https://www.oracle.com/java/technologies/javase-jdk17-downloads.html) + * [Oracle](https://www.oracle.com/java/technologies/downloads/) * [OpenJDK](https://adoptium.net/) From c77bd1b44e7dcb97da5e848f8a9d8b24635c1efd Mon Sep 17 00:00:00 2001 From: gabilang Date: Fri, 14 Jul 2023 23:08:31 +0530 Subject: [PATCH 14/18] Change gradle version --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index e74c28a4..06bc18a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version=1.7.0-SNAPSHOT ballerinaGradlePluginVersion=2.0.0 githubSpotBugsVersion=5.0.14 -shadowJarVersion=8.1.0 +shadowJarVersion=7.1.2 undercouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 puppycrawlCheckstyleVersion=10.12.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1f017e4e..98debb84 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From a36af6565bd3a610a67794f5893b209e32b52903 Mon Sep 17 00:00:00 2001 From: Gabilan Ganeshwaran Date: Wed, 26 Jul 2023 15:24:16 +0530 Subject: [PATCH 15/18] Add git attributes file --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..d13affe3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Ensure all Java files use LF. +*.java eol=lf From 3cec722003cb1eaea6751050c3615f6a56831053 Mon Sep 17 00:00:00 2001 From: Gabilan Ganeshwaran Date: Wed, 26 Jul 2023 15:25:42 +0530 Subject: [PATCH 16/18] Update lang version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 383e9b34..eb050565 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,5 +10,5 @@ researchgateReleaseVersion=2.8.0 puppycrawlCheckstyleVersion=10.12.0 -ballerinaLangVersion= 2201.7.0 +ballerinaLangVersion=2201.8.0-20230726-132400-5c2e50ed stdlibIoVersion=1.5.0 From 1a4ecf96bac946fb0fdf1996a67baeb06ef91d4b Mon Sep 17 00:00:00 2001 From: Gabilan Ganeshwaran Date: Wed, 26 Jul 2023 15:41:49 +0530 Subject: [PATCH 17/18] Update GraalVM build to Java 17 --- .github/workflows/build-with-bal-test-graalvm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index 31a5f3b8..78106c6b 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -6,7 +6,7 @@ on: lang_tag: description: Branch/Release Tag of the Ballerina Lang required: true - default: master + default: java_17_migration lang_version: description: Ballerina Lang Version (If given ballerina lang buid will be skipped) required: false @@ -30,7 +30,7 @@ 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-standard-library/.github/workflows/build-with-bal-test-graalvm-template.yml@main + uses: ballerina-platform/ballerina-standard-library/.github/workflows/build-with-bal-test-graalvm-template.yml@java_17_migration with: lang_tag: ${{ inputs.lang_tag }} lang_version: ${{ inputs.lang_version }} From 4e9041eaaee49e84c12e2e4af83273b94dd25842 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Thu, 27 Jul 2023 21:34:22 +0530 Subject: [PATCH 18/18] Refactor env var handling for Java 17 --- ballerina/Ballerina.toml | 22 ++---- ballerina/Dependencies.toml | 4 +- ballerina/os.bal | 13 +--- ballerina/tests/os_test.bal | 9 +-- ballerina/tests/resources/hello3.bal | 4 +- gradle.properties | 2 +- .../stdlib/os/nativeimpl/GetEnv.java | 64 ++++++++++++++++ .../stdlib/os/nativeimpl/ListEnv.java | 12 ++- .../stdlib/os/nativeimpl/SetEnv.java | 76 ++++++------------- .../stdlib/os/utils/OSConstants.java | 2 + 10 files changed, 113 insertions(+), 95 deletions(-) create mode 100644 native/src/main/java/io/ballerina/stdlib/os/nativeimpl/GetEnv.java diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 37288811..70d32cde 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "os" -version = "1.7.0" +version = "1.7.1" authors = ["Ballerina"] keywords = ["environment"] repository = "https://github.com/ballerina-platform/module-ballerina-os" @@ -12,23 +12,11 @@ distribution = "2201.7.0" [platform.java17] graalvmCompatible = true -[[platform.java17.dependency]] -groupId = "org.burningwave" -artifactId = "core" -version = "12.62.7" -path = "./lib/core-12.62.7.jar" - -[[platform.java17.dependency]] -groupId = "io.github.toolfactory" -artifactId = "jvm-driver" -version = "9.4.3" -path = "./lib/jvm-driver-9.4.3.jar" - [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-native" -version = "1.7.0" -path = "../native/build/libs/os-native-1.7.0.jar" +version = "1.7.1" +path = "../native/build/libs/os-native-1.7.1-SNAPSHOT.jar" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" @@ -39,5 +27,5 @@ path = "./lib/io-native-1.5.0.jar" [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-test-utils" -version = "1.7.0" -path = "../test-utils/build/libs/os-test-utils-1.7.0.jar" +version = "1.7.1" +path = "../test-utils/build/libs/os-test-utils-1.7.1-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 4e25033b..23dfaebe 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.7.0" +distribution-version = "2201.8.0-20230726-145300-b2bdf796" [[package]] org = "ballerina" @@ -47,7 +47,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.7.0" +version = "1.7.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, diff --git a/ballerina/os.bal b/ballerina/os.bal index 3fa601df..86d5f7dc 100644 --- a/ballerina/os.bal +++ b/ballerina/os.bal @@ -34,17 +34,12 @@ public type EnvProperties record {| # + name - Name of the environment variable # + return - Environment variable value if it exists or else, an empty string public isolated function getEnv(string name) returns string { - var value = java:toString(nativeGetEnv(java:fromString(name))); - if value is string { - return value; - } - return ""; + return nativeGetEnv(name); } -isolated function nativeGetEnv(handle key) returns handle = @java:Method { - name: "getenv", - 'class: "java.lang.System", - paramTypes: ["java.lang.String"] +isolated function nativeGetEnv(string key) returns string = @java:Method { + name: "getEnv", + 'class: "io.ballerina.stdlib.os.nativeimpl.GetEnv" } external; # Returns the current user's name. diff --git a/ballerina/tests/os_test.bal b/ballerina/tests/os_test.bal index 179cf79a..a37f337d 100644 --- a/ballerina/tests/os_test.bal +++ b/ballerina/tests/os_test.bal @@ -20,9 +20,6 @@ import ballerina/io; configurable string bal_exec_path = ?; -@test:Config { - enable:false -} function testGetEnv() { string expectedValue = getExpectedValidEnv(); test:assertEquals(getEnv("JAVA_HOME"), expectedValue); @@ -53,7 +50,6 @@ function setEnvDataProvider() returns (string[][]) { } @test:Config { - enable: false, dataProvider: setEnvDataProvider } function testSetEnv(string key, string value) { @@ -94,7 +90,6 @@ function unsetEnvDataProvider() returns (string[][]) { } @test:Config { - enable: false, dataProvider: unsetEnvDataProvider } function testUnsetEnv(string key, string value) { @@ -212,9 +207,7 @@ function testExecWithOutputStdErr() returns error? { test:assertTrue(stdErrString.includes("hello world")); } -@test:Config { - enable: false -} +@test:Config {} function testExecWithEnvironmentVariable() returns error? { Process process = check exec({value: bal_exec_path, arguments: ["run", "tests/resources/hello3.bal"]}, BAL_CONFIG_FILES = "tests/resources/config/Config.toml"); int exitCode = check process.waitForExit(); diff --git a/ballerina/tests/resources/hello3.bal b/ballerina/tests/resources/hello3.bal index 01fe2529..e3070802 100644 --- a/ballerina/tests/resources/hello3.bal +++ b/ballerina/tests/resources/hello3.bal @@ -14,8 +14,8 @@ // specific language governing permissions and limitations // under the License. -import ballerina/log; +import ballerina/io; public function main() { - log:printDebug("debug message"); + io:println("debug message"); } diff --git a/gradle.properties b/gradle.properties index eb050565..f351ae78 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,5 +10,5 @@ researchgateReleaseVersion=2.8.0 puppycrawlCheckstyleVersion=10.12.0 -ballerinaLangVersion=2201.8.0-20230726-132400-5c2e50ed +ballerinaLangVersion=2201.8.0-20230726-145300-b2bdf796 stdlibIoVersion=1.5.0 diff --git a/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/GetEnv.java b/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/GetEnv.java new file mode 100644 index 00000000..adcc70fb --- /dev/null +++ b/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/GetEnv.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package io.ballerina.stdlib.os.nativeimpl; + +import io.ballerina.runtime.api.Environment; +import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.creators.TypeCreator; +import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.utils.StringUtils; +import io.ballerina.runtime.api.values.BMap; +import io.ballerina.runtime.api.values.BString; + +import java.util.Map; + +import static io.ballerina.stdlib.os.utils.OSConstants.ENV_VAR_KEY; + +/** + * Extern function of ballerina.os:getEnv. + * + * @since 1.5.1 + */ +public class GetEnv { + + private GetEnv() { + + } + + public static BString getEnv(Environment env, BString key) { + Object envVarMap = env.getStrandLocal(ENV_VAR_KEY); + BMap envMap; + if (envVarMap == null) { + MapType mapType = TypeCreator.createMapType(PredefinedTypes.TYPE_STRING); + envMap = ValueCreator.createMapValue(mapType); + Map jEnvMap = System.getenv(); + for (Map.Entry entry : jEnvMap.entrySet()) { + envMap.put(StringUtils.fromString(entry.getKey()), StringUtils.fromString(entry.getValue())); + } + env.setStrandLocal(ENV_VAR_KEY, envMap); + } else { + envMap = (BMap) envVarMap; + } + Object value = envMap.get(key); + if (value == null) { + return StringUtils.fromString(""); + } + return (BString) value; + } +} diff --git a/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/ListEnv.java b/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/ListEnv.java index 601206db..3f013c84 100644 --- a/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/ListEnv.java +++ b/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/ListEnv.java @@ -17,6 +17,7 @@ */ package io.ballerina.stdlib.os.nativeimpl; +import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; @@ -27,6 +28,8 @@ import java.util.Map; +import static io.ballerina.stdlib.os.utils.OSConstants.ENV_VAR_KEY; + /** * Extern function of ballerina.os:listEnv. * @@ -38,13 +41,18 @@ private ListEnv() { } - public static BMap listEnv() { + public static BMap listEnv(Environment env) { + Object envVarMap = env.getStrandLocal(ENV_VAR_KEY); + if (envVarMap != null) { + return (BMap) envVarMap; + } MapType mapType = TypeCreator.createMapType(PredefinedTypes.TYPE_STRING); - BMap envMap = ValueCreator.createMapValue(mapType); + BMap envMap = ValueCreator.createMapValue(mapType); Map jEnvMap = System.getenv(); for (Map.Entry entry : jEnvMap.entrySet()) { envMap.put(StringUtils.fromString(entry.getKey()), StringUtils.fromString(entry.getValue())); } + env.setStrandLocal(ENV_VAR_KEY, envMap); return envMap; } } diff --git a/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/SetEnv.java b/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/SetEnv.java index 67dfacab..b809cf2f 100644 --- a/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/SetEnv.java +++ b/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/SetEnv.java @@ -17,14 +17,19 @@ */ package io.ballerina.stdlib.os.nativeimpl; +import io.ballerina.runtime.api.Environment; +import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.creators.TypeCreator; +import io.ballerina.runtime.api.creators.ValueCreator; +import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.utils.StringUtils; +import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BString; -import sun.misc.Unsafe; -import java.lang.reflect.Field; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.util.Map; +import static io.ballerina.stdlib.os.utils.OSConstants.ENV_VAR_KEY; + /** * Extern function of ballerina.os:setEnv. * @@ -32,66 +37,29 @@ */ public class SetEnv { - private static final String JAVA_LANG_PROCESS_ENVIRONMENT = "java.lang.ProcessEnvironment"; - private static final String CASE_INSENSITIVE_ENV = "theCaseInsensitiveEnvironment"; - private SetEnv() { } - @SuppressWarnings("unchecked") - public static Object setEnv(BString key, Object value) { - Map env = null; - Map writableEnv; - Field field; - if (System.getProperty("os.name").startsWith("Windows")) { - try { - field = Class.forName(JAVA_LANG_PROCESS_ENVIRONMENT).getDeclaredField(CASE_INSENSITIVE_ENV); - } catch (NoSuchFieldException | ClassNotFoundException e) { - return ErrorGenerator.createError("Error while accessing the environment variable map" , e); + public static Object setEnv(Environment env, BString key, Object value) { + Object envVarMap = env.getStrandLocal(ENV_VAR_KEY); + BMap envMap; + if (envVarMap == null) { + MapType mapType = TypeCreator.createMapType(PredefinedTypes.TYPE_STRING); + envMap = ValueCreator.createMapValue(mapType); + Map jEnvMap = System.getenv(); + for (Map.Entry entry : jEnvMap.entrySet()) { + envMap.put(StringUtils.fromString(entry.getKey()), StringUtils.fromString(entry.getValue())); } + env.setStrandLocal(ENV_VAR_KEY, envMap); } else { - env = System.getenv(); - try { - field = env.getClass().getDeclaredField("m"); - } catch (NoSuchFieldException e) { - return ErrorGenerator.createError("Error while accessing the environment variable map", e); - } - } - try { - disableAccessWarning(); - } catch (Exception e) { - return ErrorGenerator.createError("Error disabling illegal access warnings", e); - } - Field finalField = field; - AccessController.doPrivileged((PrivilegedAction) () -> { - finalField.setAccessible(true); - return null; - }); - try { - writableEnv = (Map) field.get(env); - } catch (IllegalAccessException e) { - return ErrorGenerator.createError("Access denied when trying to modify the environment variable map", e); + envMap = (BMap) envVarMap; } if (value == null) { - writableEnv.remove(key.toString()); + envMap.remove(key); } else { - writableEnv.put(key.toString(), value.toString()); + envMap.put(key, value); } return null; } - - @SuppressWarnings("unchecked") - private static void disableAccessWarning() throws Exception { - Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe"); - AccessController.doPrivileged((PrivilegedAction) () -> { - theUnsafe.setAccessible(true); - return null; - }); - Unsafe u = (Unsafe) theUnsafe.get(null); - - Class cls = Class.forName("jdk.internal.module.IllegalAccessLogger"); - Field logger = cls.getDeclaredField("logger"); - u.putObjectVolatile(cls, u.staticFieldOffset(logger), null); - } } diff --git a/native/src/main/java/io/ballerina/stdlib/os/utils/OSConstants.java b/native/src/main/java/io/ballerina/stdlib/os/utils/OSConstants.java index 38b74ec7..8a469cfa 100644 --- a/native/src/main/java/io/ballerina/stdlib/os/utils/OSConstants.java +++ b/native/src/main/java/io/ballerina/stdlib/os/utils/OSConstants.java @@ -29,6 +29,8 @@ public class OSConstants { static final String PROCESS_FIELD = "ProcessField"; + public static final String ENV_VAR_KEY = "io.ballerina.stdlib.os.environment.variables"; + private OSConstants() { } }