Skip to content

Commit

Permalink
Merge pull request #43603 from lochana-chathura/nutcracker-sync
Browse files Browse the repository at this point in the history
Sync nutcracker branch for java 21 changes
  • Loading branch information
lochana-chathura authored Nov 19, 2024
2 parents fc1d58c + f205b24 commit 8e3f67a
Show file tree
Hide file tree
Showing 974 changed files with 7,547 additions and 12,976 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/daily_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Initialize sub-modules
run: git submodule update --init
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
java-version: '17.0.7'
java-version: '21.0.3'
distribution: 'graalvm'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -69,11 +69,11 @@ jobs:
with:
fetch-depth: 0

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Initialize sub-modules
run: git submodule update --init
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily_spec_conformance_test_runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
ref: spec-conformance-test-runner

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: "temurin"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly_publish_timestamped_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
with:
ref: ${{ matrix.branch }}

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Initialize Sub Modules
run: git submodule update --init
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/observe_package_push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
fetch-depth: 0
- name: Checkout Tag
run: git checkout ${{ github.event.inputs.repoTag }}
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Build with Gradle
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'
- name: Set version env variable
run: |
echo "VERSION=$(./gradlew properties | grep ^version: | cut -d\ -f2 | sed 's@-SNAPSHOT@@')" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_timestamped_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Checkout To Lang Branch
run: |
Expand Down
27 changes: 16 additions & 11 deletions .github/workflows/pull_request_full_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
branches:
- master
- java21
- nutcracker
jobs:
build-lang:
Expand All @@ -18,11 +19,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Checkout To Lang Branch
run: |
Expand Down Expand Up @@ -65,11 +66,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Setup NodeJs
uses: actions/setup-node@v4
Expand All @@ -92,11 +93,11 @@ jobs:
do git clone https://github.com/ballerina-platform/${module_name}.git; \
done
# - name: Checkout non-default branch
# run: |
# for module_name in $(jq -r '.standard_library| .[] | select(.level==${{ matrix.level }}) | .name' extensions.json); do \
# cd $module_name && git fetch origin && git checkout -t origin/java_17_migration && cd ..; \
# done
- name: Checkout non-default branch
run: |
for module_name in $(jq -r '.standard_library| .[] | select(.level==${{ matrix.level }}) | .name' extensions.json); do \
cd $module_name && git fetch origin && git checkout -t origin/java21 && cd ..; \
done
- name: Update Lang Version in Module
run: |
Expand Down Expand Up @@ -132,11 +133,15 @@ jobs:
with:
repository: 'ballerina-platform/ballerina-distribution'

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Checkout non-default branch
run: |
git fetch origin && git checkout -t origin/java21
- name: Download Ballerina Lang Artifacts
uses: actions/download-artifact@v4
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/pull_request_ubuntu_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- native-build
- revert-client-decl-master
- query-grouping-aggregation
- java21
- nutcracker

jobs:
Expand All @@ -30,11 +31,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Initialize sub-modules
run: git submodule update --init
Expand All @@ -49,7 +50,7 @@ jobs:
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
java-version: '17.0.7'
java-version: '21.0.3'
distribution: 'graalvm'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -88,11 +89,11 @@ jobs:
with:
fetch-depth: 0

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Initialize sub-modules
run: git submodule update --init
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/pull_request_windows_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- native-build
- revert-client-decl-master
- query-grouping-aggregation
- java21
- nutcracker

jobs:
Expand All @@ -30,11 +31,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: configure Pagefile
uses: al-cheb/configure-pagefile-action@v1.4
Expand All @@ -56,7 +57,7 @@ jobs:
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
java-version: '17.0.7'
java-version: '21.0.3'
distribution: 'graalvm'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/push_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Initialize sub-modules
run: git submodule update --init
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
java-version: '17.0.7'
java-version: '21.0.3'
distribution: 'graalvm'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -63,11 +63,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: configure Pagefile
uses: al-cheb/configure-pagefile-action@v1.4
Expand All @@ -89,7 +89,7 @@ jobs:
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
java-version: '17.0.7'
java-version: '21.0.3'
distribution: 'graalvm'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -113,11 +113,11 @@ jobs:
with:
fetch-depth: 0

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Initialize sub-modules
run: git submodule update --init
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trivy-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17.0.7'
java-version: '21.0.3'

- name: Initialize sub-modules
run: git submodule update --init
Expand Down
6 changes: 5 additions & 1 deletion ballerina-shell/modules/shell-cli/spotbugs-exclude.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
</Match>
<Match>
<Class name="io.ballerina.shell.cli.handlers.help.BbeTopicsProvider"/>
<Bug pattern="MS_EXPOSE_REP"/>
<Bug pattern="MS_EXPOSE_REP,CT_CONSTRUCTOR_THROW"/>
</Match>
<Match>
<Class name="io.ballerina.shell.cli.PropertiesLoader"/>
<Bug pattern="CT_CONSTRUCTOR_THROW"/>
</Match>
</FindBugsFilter>
Loading

0 comments on commit 8e3f67a

Please sign in to comment.