fix merge conflicts

daneshk · Sep 4, 2023 · c620dfc · c620dfc
2 parents c4a224b + 8f69e5a
commit c620dfc
Show file tree

Hide file tree

Showing 270 changed files with 5,448 additions and 1,076 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Ensure all Java files use LF.
+*.java eol=lf
diff --git a/.github/workflows/daily-build-2201.3.x.yml b/.github/workflows/daily-build-2201.3.x.yml
@@ -13,11 +13,11 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: 2201.3.x
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -125,7 +125,7 @@ jobs:
         env:
           TEST_MODE_ACTIVE: true
       - name: Checkout docker repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ballerina-platform/module-ballerina-docker
           path: module-ballerina-docker

diff --git a/.github/workflows/daily-build-2201.4.x.yml b/.github/workflows/daily-build-2201.4.x.yml
@@ -13,11 +13,11 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: 2201.4.x
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -125,7 +125,7 @@ jobs:
         env:
           TEST_MODE_ACTIVE: true
       - name: Checkout docker repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ballerina-platform/module-ballerina-docker
           path: module-ballerina-docker
@@ -221,11 +221,11 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: 2201.4.x
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'

diff --git a/.github/workflows/daily-build-2201.5.x.yml b/.github/workflows/daily-build-2201.5.x.yml
@@ -13,11 +13,11 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: 2201.5.x
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'

diff --git a/.github/workflows/daily-build-2201.6.x.yml b/.github/workflows/daily-build-2201.6.x.yml
@@ -13,11 +13,11 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: 2201.6.x
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -130,7 +130,7 @@ jobs:
         env:
           TEST_MODE_ACTIVE: true
       - name: Checkout docker repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ballerina-platform/module-ballerina-docker
           path: module-ballerina-docker