Merge pull request #504 from ballerina-platform/java_17_migration

Sync Java 17 migration branch with master

.gitattributes

@@ -0,0 +1,2 @@
+# Ensure all Java files use LF.
+*.java eol=lf

.github/workflows/build-timestamped-master.yml

@@ -14,12 +14,12 @@ jobs:
     if: github.repository_owner == 'ballerina-platform'
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         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')

.github/workflows/central-publish.yml

@@ -17,12 +17,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'ballerina-platform'
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}

.github/workflows/publish-release.yml

@@ -10,12 +10,12 @@ jobs:
         runs-on: ubuntu-latest
         if: github.repository_owner == 'ballerina-platform'
         steps:
-            - uses: actions/checkout@v2
-            - name: Set up JDK 11
-              uses: actions/setup-java@v2
+            - uses: actions/checkout@v3
+            - name: Set up JDK 17
+              uses: actions/setup-java@v3
               with:
                   distribution: 'temurin'
-                  java-version: 11
+                  java-version: 17
             - name: Build with Gradle
               env:
                 packageUser: ${{ github.actor }}

.github/workflows/pull-request.yml

@@ -7,12 +7,12 @@ jobs:
     name: Build on Ubuntu
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         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 }}

.github/workflows/trivy-scan.yml

@@ -10,12 +10,12 @@ jobs:
     name: Build on Ubuntu
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         env:
           packageUser: ${{ github.actor }}

.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

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/downloads/)
 
    * [OpenJDK](https://adoptium.net/)
 

ballerina/Ballerina.toml

@@ -1,31 +1,31 @@
 [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"
 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.jar"
+version = "1.7.1"
+path = "../native/build/libs/os-native-1.7.1-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.jar"
 
-[[platform.java11.dependency]]
+[[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"

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"},

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.

ballerina/tests/os_test.bal

@@ -20,7 +20,6 @@ import ballerina/io;
 
 configurable string bal_exec_path = ?;
 
-@test:Config {}
 function testGetEnv() {
     string expectedValue = getExpectedValidEnv();
     test:assertEquals(getEnv("JAVA_HOME"), expectedValue);
@@ -208,7 +207,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();

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");
 }

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

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@"

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"
 

gradle.properties

@@ -2,7 +2,13 @@ org.gradle.caching=true
 group=io.ballerina.stdlib
 version=1.7.1-SNAPSHOT
 
-ballerinaGradlePluginVersion=1.1.0
+ballerinaGradlePluginVersion=2.0.1-SNAPSHOT
+githubSpotBugsVersion=5.0.14
+shadowJarVersion=7.1.2
+undercouchDownloadVersion=5.4.0
+researchgateReleaseVersion=2.8.0
+puppycrawlCheckstyleVersion=10.12.0
 
-ballerinaLangVersion= 2201.7.0
+
+ballerinaLangVersion=2201.8.0-20230726-145300-b2bdf796
 stdlibIoVersion=1.5.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 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.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists