optimize tree implementation

Fixed Timers to be daemon

.github/actions/build-jtreg/action.yml

@@ -0,0 +1,68 @@
+#
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+name: 'Build JTReg'
+description: 'Build JTReg'
+
+runs:
+  using: composite
+  steps:
+    - name: 'Get JTReg version configuration'
+      id: version
+      uses: ./.github/actions/config
+      with:
+        var: JTREG_VERSION
+
+    - name: 'Check cache for already built JTReg'
+      id: get-cached
+      uses: actions/cache@v4
+      with:
+        path: jtreg/installed
+        key: jtreg-${{ steps.version.outputs.value }}
+
+    - name: 'Checkout the JTReg source'
+      uses: actions/checkout@v4
+      with:
+        repository: openjdk/jtreg
+        ref: jtreg-${{ steps.version.outputs.value }}
+        path: jtreg/src
+      if: (steps.get-cached.outputs.cache-hit != 'true')
+
+    - name: 'Build JTReg'
+      run: |
+        # Build JTReg and move files to the proper locations
+        bash make/build.sh --jdk "$JAVA_HOME_17_X64"
+        mkdir ../installed
+        mv build/images/jtreg/* ../installed
+      working-directory: jtreg/src
+      shell: bash
+      if: (steps.get-cached.outputs.cache-hit != 'true')
+
+    - name: 'Upload JTReg artifact'
+      uses: actions/upload-artifact@v4
+      with:
+        name: bundles-jtreg-${{ steps.version.outputs.value }}
+        path: jtreg/installed
+        retention-days: 1

.github/actions/do-build/action.yml

@@ -66,7 +66,7 @@ runs:
       shell: bash
 
     - name: 'Upload build logs'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: failure-logs-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: failure-logs
@@ -74,7 +74,7 @@ runs:
 
       # This is the best way I found to abort the job with an error message
     - name: 'Notify about build failures'
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         script: core.setFailed('Build failed. See summary for details.')
       if: steps.check.outputs.failure == 'true'

.github/actions/get-bootjdk/action.yml

@@ -65,7 +65,7 @@ runs:
 
     - name: 'Check cache for BootJDK'
       id: get-cached-bootjdk
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: bootjdk/jdk
         key: boot-jdk-${{ inputs.platform }}-${{ steps.sha256.outputs.value }}

.github/actions/get-bundles/action.yml

@@ -48,14 +48,14 @@ runs:
   steps:
     - name: 'Download bundles artifact'
       id: download-bundles
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles
       continue-on-error: true
 
     - name: 'Download bundles artifact (retry)'
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles

.github/actions/get-jtreg/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 #
 
 name: 'Get JTReg'
-description: 'Download JTReg from cache or source location'
+description: 'Get JTReg'
 outputs:
   path:
     description: 'Path to the installed JTReg'
@@ -39,30 +39,12 @@ runs:
       with:
         var: JTREG_VERSION
 
-    - name: 'Check cache for JTReg'
-      id: get-cached-jtreg
-      uses: actions/cache@v3
+    - name: 'Download JTReg artifact'
+      id: download-jtreg
+      uses: actions/download-artifact@v4
       with:
+        name: bundles-jtreg-${{ steps.version.outputs.value }}
         path: jtreg/installed
-        key: jtreg-${{ steps.version.outputs.value }}
-
-    - name: 'Checkout the JTReg source'
-      uses: actions/checkout@v4
-      with:
-        repository: openjdk/jtreg
-        ref: jtreg-${{ steps.version.outputs.value }}
-        path: jtreg/src
-      if: steps.get-cached-jtreg.outputs.cache-hit != 'true'
-
-    - name: 'Build JTReg'
-      run: |
-        # Build JTReg and move files to the proper locations
-        bash make/build.sh --jdk "$JAVA_HOME_17_X64"
-        mkdir ../installed
-        mv build/images/jtreg/* ../installed
-      working-directory: jtreg/src
-      shell: bash
-      if: steps.get-cached-jtreg.outputs.cache-hit != 'true'
 
     - name: 'Export path to where JTReg is installed'
       id: path-name

.github/actions/get-msys2/action.yml

@@ -30,8 +30,7 @@ runs:
   using: composite
   steps:
     - name: 'Install MSYS2'
-      # use a specific release of msys2/setup-msys2 to prevent jtreg build failures on newer release
-      uses: msys2/setup-msys2@7efe20baefed56359985e327d329042cde2434ff
+      uses: msys2/setup-msys2@v2.22.0
       with:
         install: 'autoconf tar unzip zip make'
         path-type: minimal

.github/actions/upload-bundles/action.yml

@@ -69,7 +69,7 @@ runs:
       shell: bash
 
     - name: 'Upload bundles artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles

.github/scripts/gen-build-failure-report.sh

@@ -24,12 +24,19 @@
 # questions.
 #
 
+# Import common utils
+. .github/scripts/report-utils.sh
+
 GITHUB_STEP_SUMMARY="$1"
 BUILD_DIR="$(ls -d build/*)"
 
 # Send signal to the do-build action that we failed
 touch "$BUILD_DIR/build-failure"
 
+# Collect hs_errs for build-time crashes, e.g. javac, jmod, jlink, CDS.
+# These usually land in make/
+hs_err_files=$(ls make/hs_err*.log 2> /dev/null || true)
+
 (
   echo '### :boom: Build failure summary'
   echo ''
@@ -46,6 +53,20 @@ touch "$BUILD_DIR/build-failure"
   echo '</details>'
   echo ''
 
+  for hs_err in $hs_err_files; do
+    echo "<details><summary><b>View HotSpot error log: "$hs_err"</b></summary>"
+    echo ''
+    echo '```'
+    echo "$hs_err:"
+    echo ''
+    cat "$hs_err"
+    echo '```'
+    echo '</details>'
+    echo ''
+  done
+
   echo ''
   echo ':arrow_right: To see the entire test log, click the job in the list to the left. To download logs, see the `failure-logs` [artifact above](#artifacts).'
 ) >> $GITHUB_STEP_SUMMARY
+
+truncate_summary

.github/scripts/gen-test-results.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,9 @@
 # questions.
 #
 
+# Import common utils
+. .github/scripts/report-utils.sh
+
 GITHUB_STEP_SUMMARY="$1"
 
 test_suite_name=$(cat build/run-test-prebuilt/test-support/test-last-ids.txt)
@@ -44,8 +47,8 @@ for test in $failures $errors; do
   base_path="$(echo "$test" | tr '#' '_')"
   report_file="$report_dir/$base_path.jtr"
   hs_err_files=$(ls $report_dir/$base_path/hs_err*.log 2> /dev/null || true)
+  replay_files=$(ls $report_dir/$base_path/replay*.log 2> /dev/null || true)
   echo "####  <a id="$anchor">$test"
-
   echo '<details><summary>View test results</summary>'
   echo ''
   echo '```'
@@ -73,20 +76,22 @@ for test in $failures $errors; do
     echo ''
   fi
 
+  if [[ "$replay_files" != "" ]]; then
+    echo '<details><summary>View HotSpot replay file</summary>'
+    echo ''
+    for replay in $replay_files; do
+      echo '```'
+      echo "$replay:"
+      echo ''
+      cat "$replay"
+      echo '```'
+    done
+
+    echo '</details>'
+    echo ''
+  fi
 done >> $GITHUB_STEP_SUMMARY
 
-# With many failures, the summary can easily exceed 1024 kB, the limit set by Github
-# Trim it down if so.
-summary_size=$(wc -c < $GITHUB_STEP_SUMMARY)
-if [[ $summary_size -gt 1000000 ]]; then
-  # Trim to below 1024 kB, and cut off after the last detail group
-  head -c 1000000 $GITHUB_STEP_SUMMARY | tac | sed -n -e '/<\/details>/,$ p' | tac > $GITHUB_STEP_SUMMARY.tmp
-  mv $GITHUB_STEP_SUMMARY.tmp $GITHUB_STEP_SUMMARY
-  (
-    echo ''
-    echo ':x: **WARNING: Summary is too large and has been truncated.**'
-    echo ''
-  )  >> $GITHUB_STEP_SUMMARY
-fi
-
 echo ':arrow_right: To see the entire test log, click the job in the list to the left.'  >> $GITHUB_STEP_SUMMARY
+
+truncate_summary

.github/scripts/gen-test-summary.sh

@@ -42,6 +42,7 @@ error_count=$(echo $errors | wc -w || true)
 
 if [[ "$failures" = "" && "$errors" = "" ]]; then
   # We know something went wrong, but not what
+  echo 'failure=true' >> $GITHUB_OUTPUT
   echo 'error-message=Unspecified test suite failure. Please see log for job for details.' >> $GITHUB_OUTPUT
   exit 0
 fi

.github/scripts/report-utils.sh

@@ -1,10 +1,13 @@
+#!/bin/bash
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
 #
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -21,4 +24,18 @@
 # questions.
 #
 
-exclusiveAccess.dirs=.
+function truncate_summary() {
+  # With large hs_errs, the summary can easily exceed 1024 kB, the limit set by Github
+  # Trim it down if so.
+  summary_size=$(wc -c < $GITHUB_STEP_SUMMARY)
+  if [[ $summary_size -gt 1000000 ]]; then
+    # Trim to below 1024 kB, and cut off after the last detail group
+    head -c 1000000 $GITHUB_STEP_SUMMARY | tac | sed -n -e '/<\/details>/,$ p' | tac > $GITHUB_STEP_SUMMARY.tmp
+    mv $GITHUB_STEP_SUMMARY.tmp $GITHUB_STEP_SUMMARY
+    (
+      echo ''
+      echo ':x: **WARNING: Summary is too large and has been truncated.**'
+      echo ''
+    )  >> $GITHUB_STEP_SUMMARY
+  fi
+}

.github/workflows/build-cross-compile.yml

@@ -61,27 +61,32 @@ jobs:
             debian-arch: arm64
             debian-repository: https://httpredir.debian.org/debian/
             debian-version: bullseye
+            tolerate-sysroot-errors: false
           - target-cpu: arm
             gnu-arch: arm
             debian-arch: armhf
             debian-repository: https://httpredir.debian.org/debian/
             debian-version: bullseye
+            tolerate-sysroot-errors: false
             gnu-abi: eabihf
           - target-cpu: s390x
             gnu-arch: s390x
             debian-arch: s390x
             debian-repository: https://httpredir.debian.org/debian/
             debian-version: bullseye
+            tolerate-sysroot-errors: false
           - target-cpu: ppc64le
             gnu-arch: powerpc64le
             debian-arch: ppc64el
             debian-repository: https://httpredir.debian.org/debian/
             debian-version: bullseye
+            tolerate-sysroot-errors: false
           - target-cpu: riscv64
             gnu-arch: riscv64
             debian-arch: riscv64
             debian-repository: https://httpredir.debian.org/debian/
             debian-version: sid
+            tolerate-sysroot-errors: true
 
     steps:
       - name: 'Checkout the JDK source'
@@ -93,13 +98,6 @@ jobs:
         with:
           platform: linux-x64
 
-        # Use linux-x64 JDK bundle as build JDK
-      - name: 'Get build JDK'
-        id: buildjdk
-        uses: ./.github/actions/get-bundles
-        with:
-          platform: linux-x64
-
       - name: 'Get GTest'
         id: gtest
         uses: ./.github/actions/get-gtest
@@ -120,7 +118,7 @@ jobs:
 
       - name: 'Check cache for sysroot'
         id: get-cached-sysroot
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: sysroot
           key: sysroot-${{ matrix.debian-arch }}-${{ hashFiles('./.github/workflows/build-cross-compile.yml') }}
@@ -130,8 +128,10 @@ jobs:
         if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
 
       - name: 'Create sysroot'
+        id: create-sysroot
         run: >
           sudo debootstrap
+          --no-merged-usr
           --arch=${{ matrix.debian-arch }}
           --verbose
           --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype-dev,libpng-dev
@@ -140,6 +140,7 @@ jobs:
           ${{ matrix.debian-version }}
           sysroot
           ${{ matrix.debian-repository }}
+        continue-on-error: ${{ matrix.tolerate-sysroot-errors }}
         if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
 
       - name: 'Prepare sysroot'
@@ -151,7 +152,15 @@ jobs:
           rm -rf sysroot/usr/{sbin,bin,share}
           rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd}
           rm -rf sysroot/usr/libexec/gcc
-        if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
+          # /{bin,sbin,lib}/ are not symbolic links to /usr/{bin,sbin,lib}/ when debootstrap with --no-merged-usr
+          rm -rf sysroot/{sbin,bin}
+          rm -rf sysroot/lib/{udev,systemd}
+        if: steps.create-sysroot.outcome == 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true'
+
+      - name: 'Remove broken sysroot'
+        run: |
+          sudo rm -rf sysroot/
+        if: steps.create-sysroot.outcome != 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true'
 
       - name: 'Configure'
         run: >
@@ -165,7 +174,6 @@ jobs:
           --disable-precompiled-headers
           --openjdk-target=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}
           --with-sysroot=sysroot
-          --with-build-jdk=${{ steps.buildjdk.outputs.jdk-path }}
           --with-jmod-compress=zip-1
           CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
           CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
@@ -173,6 +181,7 @@ jobs:
           echo "Dumping config.log:" &&
           cat config.log &&
           exit 1)
+        if: steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true'
 
       - name: 'Build'
         id: build
@@ -180,3 +189,4 @@ jobs:
         with:
           make-target: 'hotspot ${{ inputs.make-arguments }}'
           platform: linux-${{ matrix.target-cpu }}
+        if: steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true'

.github/workflows/build-macos.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,9 @@ on:
       platform:
         required: true
         type: string
+      runs-on:
+        required: true
+        type: string
       extra-conf-options:
         required: false
         type: string
@@ -55,7 +58,7 @@ on:
 jobs:
   build-macos:
     name: build
-    runs-on: macos-11
+    runs-on: ${{ inputs.runs-on }}
 
     strategy:
       fail-fast: false
@@ -74,7 +77,7 @@ jobs:
         id: bootjdk
         uses: ./.github/actions/get-bootjdk
         with:
-          platform: macos-x64
+          platform: ${{ inputs.platform }}
 
       - name: 'Get JTReg'
         id: jtreg
@@ -87,7 +90,7 @@ jobs:
       - name: 'Install toolchain and dependencies'
         run: |
           # Run Homebrew installation and xcode-select
-          brew install make
+          brew install autoconf make
           sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
           # This will make GNU make available as 'make' and not only as 'gmake'
           echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH

.github/workflows/main.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@ on:
       platforms:
         description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
         required: true
-        default: 'linux-x64, linux-x86, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
+        default: 'linux-x64, linux-x86-hs, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
       configure-arguments:
         description: 'Additional configure arguments'
         required: false
@@ -49,12 +49,12 @@ jobs:
   ### Determine platforms to include
   ###
 
-  select:
-    name: 'Select platforms'
+  prepare:
+    name: 'Prepare the run'
     runs-on: ubuntu-22.04
     outputs:
       linux-x64: ${{ steps.include.outputs.linux-x64 }}
-      linux-x86: ${{ steps.include.outputs.linux-x86 }}
+      linux-x86-hs: ${{ steps.include.outputs.linux-x86-hs }}
       # additional build options for linux-x64 are disabled
       # linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
       linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
@@ -65,7 +65,19 @@ jobs:
       docs: ${{ steps.include.outputs.docs }}
 
     steps:
-        # This function must be inlined in main.yml, or we'd be forced to checkout the repo
+      - name: 'Checkout the scripts'
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            .github
+            make/conf/github-actions.conf
+
+      - name: 'Build JTReg'
+        id: jtreg
+        uses: ./.github/actions/build-jtreg
+
+      # TODO: Now that we are checking out the repo scripts, we can put the following code
+      # into a separate file
       - name: 'Check what jobs to run'
         id: include
         run: |
@@ -107,7 +119,7 @@ jobs:
           }
 
           echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
-          echo "linux-x86=$(check_platform linux-x86 linux x86)" >> $GITHUB_OUTPUT
+          echo "linux-x86-hs=$(check_platform linux-x86-hs linux x86)" >> $GITHUB_OUTPUT
           echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT
           echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT
           echo "macos-x64=$(check_platform macos-x64 macos x64)" >> $GITHUB_OUTPUT
@@ -122,22 +134,22 @@ jobs:
 
   build-linux-x64:
     name: linux-x64
-    needs: select
+    needs: prepare
     uses: ./.github/workflows/build-linux.yml
     with:
       platform: linux-x64
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    # The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
-    if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
+    if: needs.prepare.outputs.linux-x64 == 'true'
 
-  build-linux-x86:
-    name: linux-x86
-    needs: select
+  build-linux-x86-hs:
+    name: linux-x86-hs
+    needs: prepare
     uses: ./.github/workflows/build-linux.yml
     with:
       platform: linux-x86
+      make-target: 'hotspot'
       gcc-major-version: '10'
       gcc-package-suffix: '-multilib'
       apt-architecture: 'i386'
@@ -147,11 +159,11 @@ jobs:
       extra-conf-options: '--with-target-bits=32'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.linux-x86 == 'true'
+    if: needs.prepare.outputs.linux-x86-hs == 'true'
 
   build-linux-x64-hs-nopch:
     name: linux-x64-hs-nopch
-    needs: select
+    needs: prepare
     uses: ./.github/workflows/build-linux.yml
     with:
       platform: linux-x64
@@ -161,11 +173,11 @@ jobs:
       extra-conf-options: '--disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.linux-x64-variants == 'true'
+    if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-zero:
     name: linux-x64-hs-zero
-    needs: select
+    needs: prepare
     uses: ./.github/workflows/build-linux.yml
     with:
       platform: linux-x64
@@ -175,11 +187,11 @@ jobs:
       extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.linux-x64-variants == 'true'
+    if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-minimal:
     name: linux-x64-hs-minimal
-    needs: select
+    needs: prepare
     uses: ./.github/workflows/build-linux.yml
     with:
       platform: linux-x64
@@ -189,11 +201,11 @@ jobs:
       extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.linux-x64-variants == 'true'
+    if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-optimized:
     name: linux-x64-hs-optimized
-    needs: select
+    needs: prepare
     uses: ./.github/workflows/build-linux.yml
     with:
       platform: linux-x64
@@ -204,46 +216,45 @@ jobs:
       extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.linux-x64-variants == 'true'
+    if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-cross-compile:
     name: linux-cross-compile
-    needs:
-      - select
-      - build-linux-x64
+    needs: prepare
     uses: ./.github/workflows/build-cross-compile.yml
     with:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.linux-cross-compile == 'true'
+    if: needs.prepare.outputs.linux-cross-compile == 'true'
 
   build-macos-x64:
     name: macos-x64
-    needs: select
+    needs: prepare
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-x64
-      xcode-toolset-version: '12.5.1'
+      runs-on: 'macos-13'
+      xcode-toolset-version: '14.3.1'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.macos-x64 == 'true'
+    if: needs.prepare.outputs.macos-x64 == 'true'
 
   build-macos-aarch64:
     name: macos-aarch64
-    needs: select
+    needs: prepare
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-aarch64
-      xcode-toolset-version: '12.5.1'
-      extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
+      runs-on: 'macos-14'
+      xcode-toolset-version: '15.4'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.macos-aarch64 == 'true'
+    if: needs.prepare.outputs.macos-aarch64 == 'true'
 
   build-windows-x64:
     name: windows-x64
-    needs: select
+    needs: prepare
     uses: ./.github/workflows/build-windows.yml
     with:
       platform: windows-x64
@@ -251,11 +262,11 @@ jobs:
       msvc-toolset-architecture: 'x86.x64'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.windows-x64 == 'true'
+    if: needs.prepare.outputs.windows-x64 == 'true'
 
   build-windows-aarch64:
     name: windows-aarch64
-    needs: select
+    needs: prepare
     uses: ./.github/workflows/build-windows.yml
     with:
       platform: windows-aarch64
@@ -265,11 +276,11 @@ jobs:
       extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.windows-aarch64 == 'true'
+    if: needs.prepare.outputs.windows-aarch64 == 'true'
 
   build-docs:
     name: docs
-    needs: select
+    needs: prepare
     uses: ./.github/workflows/build-linux.yml
     with:
       platform: linux-x64
@@ -281,7 +292,7 @@ jobs:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.docs == 'true'
+    if: needs.prepare.outputs.docs == 'true'
 
   ###
   ### Test jobs
@@ -297,16 +308,6 @@ jobs:
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
 
-  test-linux-x86:
-    name: linux-x86
-    needs:
-      - build-linux-x86
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: linux-x86
-      bootjdk-platform: linux-x64
-      runs-on: ubuntu-22.04
-
   test-macos-x64:
     name: macos-x64
     needs:
@@ -315,7 +316,19 @@ jobs:
     with:
       platform: macos-x64
       bootjdk-platform: macos-x64
-      runs-on: macos-11
+      runs-on: macos-13
+      xcode-toolset-version: '14.3.1'
+
+  test-macos-aarch64:
+    name: macos-aarch64
+    needs:
+      - build-macos-aarch64
+    uses: ./.github/workflows/test.yml
+    with:
+      platform: macos-aarch64
+      bootjdk-platform: macos-aarch64
+      runs-on: macos-14
+      xcode-toolset-version: '15.4'
 
   test-windows-x64:
     name: windows-x64
@@ -334,7 +347,7 @@ jobs:
     if: always()
     needs:
       - build-linux-x64
-      - build-linux-x86
+      - build-linux-x86-hs
       - build-linux-x64-hs-nopch
       - build-linux-x64-hs-zero
       - build-linux-x64-hs-minimal
@@ -345,31 +358,28 @@ jobs:
       - build-windows-x64
       - build-windows-aarch64
       - test-linux-x64
-      - test-linux-x86
       - test-macos-x64
+      - test-macos-aarch64
       - test-windows-x64
 
     steps:
-        # Hack to get hold of the api environment variables that are only defined for actions
-      - name: 'Get API configuration'
-        id: api
-        uses: actions/github-script@v6
-        with:
-          script: 'return { url: process.env["ACTIONS_RUNTIME_URL"], token: process.env["ACTIONS_RUNTIME_TOKEN"] }'
-
       - name: 'Remove bundle artifacts'
         run: |
           # Find and remove all bundle artifacts
-          ALL_ARTIFACT_URLS="$(curl -s \
-              -H 'Accept: application/json;api-version=6.0-preview' \
-              -H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
-              '${{ fromJson(steps.api.outputs.result).url }}_apis/pipelines/workflows/${{ github.run_id }}/artifacts?api-version=6.0-preview')"
-          BUNDLE_ARTIFACT_URLS="$(echo "$ALL_ARTIFACT_URLS" | jq -r -c '.value | map(select(.name|startswith("bundles-"))) | .[].url')"
-          for url in $BUNDLE_ARTIFACT_URLS; do
-            echo "Removing $url"
-            curl -s \
-                -H 'Accept: application/json;api-version=6.0-preview' \
-                -H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
-                -X DELETE "$url" \
+          # See: https://docs.github.com/en/rest/actions/artifacts?apiVersion=2022-11-28
+          ALL_ARTIFACT_IDS="$(curl -sL \
+              -H 'Accept: application/vnd.github+json' \
+              -H 'Authorization: Bearer ${{ github.token }}' \
+              -H 'X-GitHub-Api-Version: 2022-11-28' \
+              '${{ github.api_url }}/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts?per_page=100')"
+          BUNDLE_ARTIFACT_IDS="$(echo "$ALL_ARTIFACT_IDS" | jq -r -c '.artifacts | map(select(.name|startswith("bundles-"))) | .[].id')"
+          for id in $BUNDLE_ARTIFACT_IDS; do
+            echo "Removing $id"
+            curl -sL \
+                -X DELETE \
+                -H 'Accept: application/vnd.github+json' \
+                -H 'Authorization: Bearer ${{ github.token }}' \
+                -H 'X-GitHub-Api-Version: 2022-11-28' \
+                "${{ github.api_url }}/repos/${{ github.repository }}/actions/artifacts/$id" \
             || echo "Failed to remove bundle"
           done

.github/workflows/test.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,9 @@ on:
       runs-on:
         required: true
         type: string
+      xcode-toolset-version:
+        required: false
+        type: string
 
 env:
   # These are needed to make the MSYS2 bash work properly
@@ -60,7 +63,10 @@ jobs:
           - 'jdk/tier1 part 3'
           - 'langtools/tier1'
           - 'hs/tier1 common'
-          - 'hs/tier1 compiler'
+          - 'hs/tier1 compiler part 1'
+          - 'hs/tier1 compiler part 2'
+          - 'hs/tier1 compiler part 3'
+          - 'hs/tier1 compiler not-xcomp'
           - 'hs/tier1 gc'
           - 'hs/tier1 runtime'
           - 'hs/tier1 serviceability'
@@ -83,8 +89,20 @@ jobs:
             test-suite: 'test/hotspot/jtreg/:tier1_common'
             debug-suffix: -debug
 
-          - test-name: 'hs/tier1 compiler'
-            test-suite: 'test/hotspot/jtreg/:tier1_compiler'
+          - test-name: 'hs/tier1 compiler part 1'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_1'
+            debug-suffix: -debug
+
+          - test-name: 'hs/tier1 compiler part 2'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_2'
+            debug-suffix: -debug
+
+          - test-name: 'hs/tier1 compiler part 3'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
+            debug-suffix: -debug
+
+          - test-name: 'hs/tier1 compiler not-xcomp'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_not_xcomp'
             debug-suffix: -debug
 
           - test-name: 'hs/tier1 gc'
@@ -132,7 +150,7 @@ jobs:
         run: |
           # On macOS we need to install some dependencies for testing
           brew install make
-          sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer
+          sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
           # This will make GNU make available as 'make' and not only as 'gmake'
           echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
         if: runner.os == 'macOS'
@@ -196,7 +214,7 @@ jobs:
         if: always()
 
       - name: 'Upload test results'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: results
           name: ${{ steps.package.outputs.artifact-name }}
@@ -204,7 +222,7 @@ jobs:
 
         # This is the best way I found to abort the job with an error message
       - name: 'Notify about test failures'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: core.setFailed('${{ steps.run-tests.outputs.error-message }}')
         if: steps.run-tests.outputs.failure == 'true'

.gitignore

@@ -23,3 +23,4 @@ NashornProfile.txt
 /.cproject
 /compile_commands.json
 /.cache
+/jbr-api/

.jcheck/conf

@@ -1,10 +1,11 @@
 [general]
 project=jdk-updates
 jbs=JDK
-version=21.0.2
+version=21.0.8
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
+warning=issuestitle,binary
 
 [repository]
 tags=(?:jdk-(?:[1-9]([0-9]*)(?:\.(?:0|[1-9][0-9]*)){0,4})(?:\+(?:(?:[0-9]+))|(?:-ga)))|(?:jdk[4-9](?:u\d{1,3})?-(?:(?:b\d{2,3})|(?:ga)))|(?:hs\d\d(?:\.\d{1,2})?-b\d\d)

README.md

@@ -39,6 +39,21 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
 | 2021.1      | [11.0.11+9-b1341.60](https://github.com/JetBrains/JetBrainsRuntime/issues/171#issuecomment-1248891540)| 15-Jun-2021   |
 | 2020.3      | [11_0_10-b1145.115](https://github.com/JetBrains/JetBrainsRuntime/issues/171#issuecomment-1249243977) | 21-Jun-2021   |
 
+## Release Flavours
+
+There are many kinds of JBR bundles available on the [Releases page](https://github.com/JetBrains/JetBrainsRuntime/releases):
+
+| Flavour       | Description                                                                                                   |
+|---------------|---------------------------------------------------------------------------------------------------------------|
+| JBR           | Contains the Java Runtime Environment (JRE) suitable to _run_ JVM-based programs.                             |
+| JBRSDK        | Contains the Software Developmet Kit (SDK) suitable to _develop_ and _run_ JVM-based programs.                |
+| JBR with JCEF | Contains both JBR and JCEF; this flavour is bundled by default with all IntelliJ IDEs.                        |
+| vanilla       | Contains just JBR.                                                                                            |
+| fastdebug     | The native binaries in this bundle are less optimized and are easier to debug. They also run much slower.     |
+| FreeType      | The bundle includes the freetype library built from sources; normally, the library is provided by the system. |
+| Vulkan        | The bundle includes experimental Vulkan support.                                                              |                                                              |
+| debug symbols | In addition to the usual contents of the bundle the debug information is also included.                       |
+
 ## Contents
 - [Welcome to JetBrains Runtime](#welcome-to-jetbrains-runtime)
   - [Why Use JetBrains Runtime?](#why-use-jetbrains-runtime)
@@ -108,36 +123,42 @@ coverage of all the details.
 > It would usually have meaningful advice on how to solve the problem.
 
 ### Linux (Docker)
-Create a container:
+Download an image from [Docker Hub](https://hub.docker.com/repository/docker/jetbrains/runtime/general) related to your architecture:
 ```
-$ cd jb/project/docker
-$ docker build .
-...
-Successfully built 942ea9900054
+$ docker pull jetbrains/runtime:oraclelinux8_aarch64
 ```
-Run these commands in the new container:
+or
 ```
-$ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
+$ docker pull jetbrains/runtime:oraclelinux8_x64
+```
+Create and run a new container from the downloaded image
+```
+$ docker run -v $JetBrainsRuntime:/JetBrainsRuntime -it jetbrains/runtime:oraclelinux8_[arch]
+```
+where `$JetBrainsRuntime` is a full path to the directory where the repository was cloned to.
+
+Run these commands in the container:
+```
+# yum install java-21-openjdk-devel
 # cd /JetBrainsRuntime
-# sh ./configure
-# make images CONF=linux-x86_64-normal-server-release
+# BOOT_JDK=/usr/lib/jvm/java-21/ ./jb/project/tools/linux/scripts/mkimages_x64.sh 99 nomod
 ```
 
 ### Ubuntu Linux
 Install the necessary tools, libraries, and headers with:
 ```
-$ sudo apt-get install autoconf make build-essential libwayland-dev libx11-dev libxext-dev libxrender-dev \
-       libxtst-dev libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev libwayland-dev \
-       libxkbcommon-x11-0
+$ sudo wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | tee /etc/apt/trusted.gpg.d/lunarg.asc
+$ sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-noble.list https://packages.lunarg.com/vulkan/lunarg-vulkan-noble.list
+$ sudo apt update
+$ sudo apt-get -y install openjdk-21-jdk file zip unzip autoconf make build-essential libx11-dev libxext-dev libxrender-dev \
+       libxtst-dev libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev libspeechd-dev libwayland-dev \
+       libxkbcommon-x11-0 vulkan-sdk vulkan-utility-libraries-dev
 ```
-Get Java 19 (for instance, [Azul Zulu Builds of OpenJDK 19](https://www.azul.com/downloads/?version=java-19-sts&os=linux&package=jdk)).
 
 Then run the following:
 ```
-$ cd JetBrainsRuntime
-$ git checkout main
-$ sh ./configure
-$ make images
+$ cd /JetBrainsRuntime
+$ BOOT_JDK=/usr/lib/jvm/java-21-openjdk-amd64 ./jb/project/tools/linux/scripts/mkimages_x64.sh 99 nomod
 ```
 This will build the release configuration under `./build/linux-x86_64-server-release/`.
 
@@ -169,6 +190,18 @@ $ make images
 ```
 This will build the release configuration under `./build/windows-x86_64-server-release/`.
 
+#### Enable optional NVDA screen reader support
+If you want to add support of a11y announcing via [NVDA screen reader](https://www.nvaccess.org/about-nvda/),
+you will need to bundle the NVDA Controller Client library.
+You can do it with the following steps:
+1. Download the NVDA Controller Client library. You can find the link in its official README [here](https://github.com/nvaccess/nvda/blob/master/extras/controllerClient/readme.md)
+2. Pass the path to the unpacked package to `configure` via an additional flag `--with-nvdacontrollerclient=<path>`.
+   The build system will search the required library files under `<path>/<target-arch>`.
+
+#### Disable optional JAWS screen reader support
+JBR is built with built-in support of JAWS screen reader.
+If you want to disable it, run `configure` with the additional flag `--disable-jaws-client`.
+
 ### macOS
 Install the following:
 * Xcode command line developer tools and `autoconf` via [Homebrew](https://brew.sh/).

SECURITY.md

@@ -0,0 +1,3 @@
+# JDK Vulnerabilities
+
+Please follow the process outlined in the [OpenJDK Vulnerability Policy](https://openjdk.org/groups/vulnerability/report) to disclose vulnerabilities in the JDK.

doc/building.html

@@ -569,10 +569,9 @@ be accepted by <code>configure</code>.</p>
 <code>--with-toolchain-type=clang</code>.</p>
 <h3 id="apple-xcode">Apple Xcode</h3>
 <p>The oldest supported version of Xcode is 8.</p>
-<p>You will need the Xcode command line developer tools to be able to
-build the JDK. (Actually, <em>only</em> the command line tools are
-needed, not the IDE.) The simplest way to install these is to run:</p>
-<pre><code>xcode-select --install</code></pre>
+<p>You will need to download Xcode either from the App Store or specific
+versions can be easily located via the <a
+href="https://xcodereleases.com">Xcode Releases</a> website.</p>
 <p>When updating Xcode, it is advisable to keep an older version for
 building the JDK. To use a specific version of Xcode you have multiple
 options:</p>

doc/building.md

@@ -366,12 +366,9 @@ To use clang instead of gcc on Linux, use `--with-toolchain-type=clang`.
 
 The oldest supported version of Xcode is 8.
 
-You will need the Xcode command line developer tools to be able to build
-the JDK. (Actually, *only* the command line tools are needed, not the IDE.)
-The simplest way to install these is to run:
-```
-xcode-select --install
-```
+You will need to download Xcode either from the App Store or specific versions
+can be easily located via the [Xcode Releases](https://xcodereleases.com)
+website.
 
 When updating Xcode, it is advisable to keep an older version for building the JDK.
 To use a specific version of Xcode you have multiple options:

doc/testing.html

@@ -72,6 +72,9 @@ id="toc-notes-for-specific-tests">Notes for Specific Tests</a>
 <li><a href="#non-us-locale" id="toc-non-us-locale">Non-US
 locale</a></li>
 <li><a href="#pkcs11-tests" id="toc-pkcs11-tests">PKCS11 Tests</a></li>
+<li><a href="#testing-with-alternative-security-providers"
+id="toc-testing-with-alternative-security-providers">Testing with
+alternative security providers</a></li>
 <li><a href="#client-ui-tests" id="toc-client-ui-tests">Client UI
 Tests</a></li>
 </ul></li>
@@ -179,8 +182,9 @@ more tab-completion friendly. For more complex test runs, the
 <p>The test specifications given in <code>TEST</code> is parsed into
 fully qualified test descriptors, which clearly and unambigously show
 which tests will be run. As an example, <code>:tier1</code> will expand
-to
-<code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1</code>.
+to include all subcomponent test directories that define `tier1`,
+for example:
+<code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 ...</code>.
 You can always submit a list of fully qualified test descriptors in the
 <code>TEST</code> variable if you want to shortcut the parser.</p>
 <h3 id="common-test-groups">Common Test Groups</h3>
@@ -577,14 +581,29 @@ PKCS11 tests. Improper NSS version may lead to unexpected failures which
 are hard to diagnose. For example,
 sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu 18.04
 with the default NSS version in the system. To run these tests
-correctly, the system property <code>test.nss.lib.paths</code> is
-required on Ubuntu 18.04 to specify the alternative NSS lib
-directories.</p>
+correctly, the system property
+<code>jdk.test.lib.artifacts.&lt;NAME&gt;</code> is required on Ubuntu
+18.04 to specify the alternative NSS lib directory. The
+<code>&lt;NAME&gt;</code> component should be replaced with the name
+element of the appropriate <code>@Artifact</code> class. (See
+<code>test/jdk/sun/security/pkcs11/PKCS11Test.java</code>)</p>
 <p>For example:</p>
 <pre><code>$ make test TEST=&quot;jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java&quot; \
-    JTREG=&quot;JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs&quot;</code></pre>
+    JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot;</code></pre>
 <p>For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.</p>
+<h3 id="testing-with-alternative-security-providers">Testing with
+alternative security providers</h3>
+<p>Some security tests use a hardcoded provider for
+<code>KeyFactory</code>, <code>Cipher</code>,
+<code>KeyPairGenerator</code>, <code>KeyGenerator</code>,
+<code>AlgorithmParameterGenerator</code>, <code>KeyAgreement</code>,
+<code>Mac</code>, <code>MessageDigest</code>, <code>SecureRandom</code>,
+<code>Signature</code>, <code>AlgorithmParameters</code>,
+<code>Configuration</code>, <code>Policy</code>, or
+<code>SecretKeyFactory</code> objects. Specify the
+<code>-Dtest.provider.name=NAME</code> property to use a different
+provider for the service(s).</p>
 <h3 id="client-ui-tests">Client UI Tests</h3>
 <h4 id="system-key-shortcuts">System key shortcuts</h4>
 <p>Some Client UI tests use key sequences which may be reserved by the

doc/testing.md

@@ -102,11 +102,11 @@ test runs, the `test TEST="x"` solution needs to be used.
 
 The test specifications given in `TEST` is parsed into fully qualified test
 descriptors, which clearly and unambigously show which tests will be run. As an
-example, `:tier1` will expand to `jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1
-jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1
-jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1`. You can
-always submit a list of fully qualified test descriptors in the `TEST` variable
-if you want to shortcut the parser.
+example, `:tier1` will expand to include all subcomponent test directories
+that define `tier1`, for example: `jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1
+jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 ...`. You
+can always submit a list of fully qualified test descriptors in the `TEST`
+variable if you want to shortcut the parser.
 
 ### Common Test Groups
 
@@ -600,19 +600,30 @@ It is highly recommended to use the latest NSS version when running PKCS11
 tests. Improper NSS version may lead to unexpected failures which are hard to
 diagnose. For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail
 on Ubuntu 18.04 with the default NSS version in the system. To run these tests
-correctly, the system property `test.nss.lib.paths` is required on Ubuntu 18.04
-to specify the alternative NSS lib directories.
+correctly, the system property `jdk.test.lib.artifacts.<NAME>` is required on
+Ubuntu 18.04 to specify the alternative NSS lib directory. The `<NAME>`
+component should be replaced with the name element of the appropriate
+`@Artifact` class. (See `test/jdk/sun/security/pkcs11/PKCS11Test.java`)
 
 For example:
 
 ```
 $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
-    JTREG="JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs"
+    JTREG="JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs"
 ```
 
 For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.
 
+### Testing with alternative security providers
+
+Some security tests use a hardcoded provider for `KeyFactory`, `Cipher`,
+`KeyPairGenerator`, `KeyGenerator`, `AlgorithmParameterGenerator`,
+`KeyAgreement`, `Mac`, `MessageDigest`, `SecureRandom`, `Signature`,
+`AlgorithmParameters`, `Configuration`, `Policy`, or `SecretKeyFactory` objects.
+Specify the `-Dtest.provider.name=NAME` property to use a different provider for
+the service(s).
+
 ### Client UI Tests
 
 #### System key shortcuts

jb/jbr-api.version

@@ -0,0 +1 @@
+1.0.2

jb/project/docker/Dockerfile.aarch64

@@ -1,46 +0,0 @@
-# NOTE: This Dockerfile is meant to be used from the mkdocker_aarch64.sh script.
-
-# Pull a concrete version of Linux that does NOT recieve updates after it's
-# been created.  This is so that the image is as stable as possible to make
-# image creation reproducible.
-# NB: this also means there may be no security-related fixes there, need to
-# move the version to the next manually.
-
-# jetbrains/runtime:jbr17env_aarch64
-FROM arm64v8/centos:7
-
-# Install the necessary build tools
-RUN yum -y update; \
-    yum -y install centos-release-scl; \
-    yum -y install devtoolset-10-10.1-0.el7; \
-    yum -y install \
-        alsa-lib-devel-1.1.8-1.el7.aarch64 \
-        autoconf-2.69-11.el7.noarch \
-        automake-1.13.4-3.el7.noarch \
-        bzip2-1.0.6-13.el7.aarch64 \
-        cups-devel-1.6.3-51.el7.aarch64 \
-        file-5.11-37.el7.aarch64 \
-        fontconfig-devel-2.13.0-4.3.el7.aarch64 \
-        freetype-devel-2.8-14.el7_9.1.aarch64 \
-        giflib-devel-4.1.6-9.el7.aarch64 \
-        git-1.8.3.1-24.el7_9.aarch64 \
-        libtool-2.4.2-22.el7_3.aarch64 \
-        libXi-devel-1.7.9-1.el7.aarch64 \
-        libXrandr-devel-1.5.1-2.el7.aarch64 \
-        libXrender-devel-0.9.10-1.el7.aarch64 \
-        libXt-devel-1.1.5-3.el7.aarch64 \
-        libXtst-devel-1.2.3-1.el7.aarch64 \
-        make-3.82-24.el7.aarch64 \
-        rsync-3.1.2-12.el7_9.aarch64 \
-        tar-1.26-35.el7.aarch64 \
-        unzip-6.0-24.el7_9.aarch64 \
-        wayland-devel-1.15.0-1.el7 \
-        zip-3.0-11.el7.aarch64; \
-   yum -y clean all
-
-ENV PATH="/opt/rh/devtoolset-10/root/usr/bin:${PATH}"
-ENV LD_LIBRARY_PATH="/opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib:/opt/rh/devtoolset-10/root/usr/lib64/dyninst:/opt/rh/devtoolset-10/root/usr/lib/dyninst:/opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib"
-ENV PKG_CONFIG_PATH="/opt/rh/devtoolset-10/root/usr/lib64/pkgconfig"
-
-RUN git config --global user.email "teamcity@jetbrains.com" && \
-    git config --global user.name "builduser"

jb/project/docker/Dockerfile.musl_aarch64

@@ -1,43 +0,0 @@
-# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_aarch64.sh script.
-
-# Pull a concrete version of Linux that does NOT recieve updates after it's
-# been created.  This is so that the image is as stable as possible to make
-# image creation reproducible.
-# NB: this also means there may be no security-related fixes there, need to
-# move the version to the next manually.
-FROM arm64v8/alpine:3.12
-
-# Install the necessary build tools
-RUN apk --no-cache add --update \
-      alsa-lib-dev=1.2.2-r0 \
-      autoconf=2.69-r2 \
-      bash=5.0.17-r0 \
-      build-base=0.5-r2 \
-      bzip2=1.0.8-r1 \
-      cups-dev=2.3.3-r0 \
-      file=5.38-r0 \
-      fontconfig=2.13.1-r2 \
-      fontconfig-dev=2.13.1-r2 \
-      freetype-dev=2.10.4-r2 \
-      git=2.26.3-r1 \
-      grep=3.4-r0 \
-      libx11-dev=1.6.12-r1 \
-      libxext-dev=1.3.4-r0 \
-      libxrandr-dev=1.5.2-r0 \
-      libxrender-dev=0.9.10-r3 \
-      libxt-dev=1.2.0-r0 \
-      libxtst-dev=1.2.3-r3 \
-      linux-headers=5.4.5-r1 \
-      rsync=3.1.3-r3 \
-      tar=1.32-r2 \
-      wayland-dev=1.18.0-r4 \
-      zip=3.0-r8
-
-
-# Set up boot JDK for building
-COPY boot_jdk_musl_aarch64.tar.gz /jdk20/
-RUN cd /jdk20 && tar --strip-components=1 -xzf boot_jdk_musl_aarch64.tar.gz && rm /jdk20/boot_jdk_musl_aarch64.tar.gz
-ENV BOOT_JDK=/jdk20
-
-RUN git config --global user.email "teamcity@jetbrains.com" && \
-    git config --global user.name "builduser"

jb/project/docker/Dockerfile.musl_x64

@@ -1,42 +0,0 @@
-# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_x64.sh script.
-
-# Pull a concrete version of Linux that does NOT recieve updates after it's
-# been created.  This is so that the image is as stable as possible to make
-# image creation reproducible.
-# NB: this also means there may be no security-related fixes there, need to
-# move the version to the next manually.
-FROM alpine:3.14
-
-# Install the necessary build tools
-RUN apk --no-cache add --update \
-      alsa-lib-dev=1.2.5-r2 \
-      autoconf=2.71-r0 \
-      bash=5.1.16-r0 \
-      build-base=0.5-r3 \
-      bzip2=1.0.8-r1 \
-      cups-dev=2.3.3-r3 \
-      file=5.40-r1 \
-      fontconfig=2.13.1-r4 \
-      fontconfig-dev=2.13.1-r4 \
-      freetype-dev=2.10.4-r3 \
-      git=2.32.7-r0 \
-      grep=3.7-r0 \
-      libx11-dev=1.7.3.1-r0 \
-      libxext-dev=1.3.4-r0 \
-      libxrandr-dev=1.5.2-r1 \
-      libxrender-dev=0.9.10-r3 \
-      libxt-dev=1.2.1-r0 \
-      libxtst-dev=1.2.3-r3 \
-      linux-headers=5.10.41-r0 \
-      rsync=3.2.5-r0 \
-      tar=1.34-r1 \
-      wayland-dev=1.19.0-r0 \
-      zip=3.0-r9
-
-# Set up boot JDK for building
-COPY boot_jdk_musl_amd64.tar.gz /jdk20/
-RUN cd /jdk20 && tar --strip-components=1 -xzf boot_jdk_musl_amd64.tar.gz && rm /jdk20/boot_jdk_musl_amd64.tar.gz
-ENV BOOT_JDK=/jdk20
-
-RUN git config --global user.email "teamcity@jetbrains.com" && \
-    git config --global user.name "builduser"

jb/project/docker/Dockerfile.x86

@@ -1,55 +0,0 @@
-# NOTE: This Dockerfile is meant to be used from the mkdocker_x86.sh script.
-
-# Pull a concrete version of Linux that does NOT receive updates after it's
-# been created.  This is so that the image is as stable as possible to make
-# image creation reproducible.
-# NB: this also means there may be no security-related fixes there, need to
-# move the version to the next manually.
-#FROM i386/ubuntu:xenial
-#FROM i386/ubuntu:bionic
-FROM i386/ubuntu:focal
-
-RUN linux32 \
-    apt-get update && apt-get install -y --no-install-recommends apt-utils
-RUN export DEBIAN_FRONTEND=noninteractive \
-    export DEBCONF_NONINTERACTIVE_SEEN=true && \
-    echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections; \
-    echo 'tzdata tzdata/Zones/Etc select UTC' | debconf-set-selections; \
-    linux32 \
-    apt-get -y install \
-        autoconf \
-        build-essential \
-        curl \
-        file \
-        git \
-        libx11-dev \
-        libxext-dev \
-        libxrender-dev \
-        libxrandr-dev \
-        libxtst-dev \
-        libxt-dev \
-        libcups2-dev \
-        libasound2-data \
-#        libpng12-0 \
-        libasound2 \
-        libfreetype6 \
-        libfontconfig1-dev \
-        libasound2-dev \
-        rsync \
-        unzip \
-        zip
-RUN linux32 \
-    apt-get -y install \
-        g++-10 \
-        gcc-10 && \
-    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 && \
-    apt-get clean -qy && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Set up boot JDK for building
-COPY boot_jdk_x86.tar.gz /jdk17/
-RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_x86.tar.gz && rm /jdk17/boot_jdk_x86.tar.gz
-ENV BOOT_JDK=/jdk17
-
-RUN git config --global user.email "teamcity@jetbrains.com" && \
-    git config --global user.name "builduser"

jb/project/docker/Dockerfile.x86_64

@@ -1,73 +0,0 @@
-# jetbrains/runtime:jbr17env_x86_64
-FROM centos:7
-RUN yum -y install centos-release-scl; \
-    yum -y install devtoolset-10-10.1-0.el7; \
-    yum -y install \
-        alsa-lib-devel-1.1.8-1.el7 \
-        autoconf-2.69-11.el7 \
-        automake-1.13.4-3.el7 \
-        bzip2-1.0.6-13.el7 \
-        cups-devel-1.6.3-51.el7 \
-        file-5.11-37.el7 \
-        fontconfig-devel-2.13.0-4.3.el7 \
-        freetype-devel-2.8-14.el7_9.1 \
-        giflib-devel-4.1.6-9.el7 \
-        git-1.8.3.1-24.el7_9 \
-        libtool-2.4.2-22.el7_3 \
-        libXi-devel-1.7.9-1.el7 \
-        libXrandr-devel-1.5.1-2.el7 \
-        libXrender-devel-0.9.10-1.el7 \
-        libXt-devel-1.1.5-3.el7 \
-        libXtst-devel-1.2.3-1.el7 \
-        make-3.82-24.el7 \
-        tar-1.26-35.el7 \
-        unzip-6.0-24.el7_9 \
-        wayland-devel-1.15.0-1.el7 \
-        wget-1.14-18.el7_6.1 \
-        which-2.20-7.el7 \
-        zip-3.0-11.el7 \
-        python3-3.6.8-17.el7
-
-RUN mkdir .git && \
-    git config user.email "teamcity@jetbrains.com" && \
-    git config user.name "builduser"
-
-ENV LD_LIBRARY_PATH="/opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib:/opt/rh/devtoolset-10/root/usr/lib64/dyninst:/opt/rh/devtoolset-10/root/usr/lib/dyninst:/opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib"
-ENV PATH="/opt/rh/devtoolset-10/root/usr/bin::${PATH}"
-ENV PKG_CONFIG_PATH="/opt/rh/devtoolset-10/root/usr/lib64/pkgconfig"
-
-# Build GLSLC
-RUN curl -OL https://github.com/Kitware/CMake/releases/download/v3.27.5/cmake-3.27.5-linux-x86_64.tar.gz \
-  && echo 138c68addae825b16ed78d792dafef5e0960194833f48bd77e7e0429c6bc081c *cmake-3.27.5-linux-x86_64.tar.gz | sha256sum -c - \
-  && tar -xzf cmake-3.27.5-linux-x86_64.tar.gz \
-  && rm cmake-3.27.5-linux-x86_64.tar.gz \
-  && git clone https://github.com/google/shaderc --branch v2023.6 \
-  && cd shaderc \
-  && ./utils/git-sync-deps \
-  && mkdir build \
-  && cd build \
-  && /cmake-3.27.5-linux-x86_64/bin/cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr/local \
-    -DSHADERC_SKIP_TESTS=ON \
-    -DSHADERC_SKIP_EXAMPLES=ON \
-    -DSHADERC_SKIP_COPYRIGHT_CHECK=ON \
-    .. \
-  && make install
-ENV PATH="/cmake-3.27.5-linux-x86_64/bin::${PATH}"
-
-# Checkout Vulkan headers
-RUN mkdir /vulkan \
-  && cd /vulkan \
-  && git init \
-  && git remote add -f origin https://github.com/KhronosGroup/Vulkan-Headers.git \
-  && git fetch origin \
-  && git checkout v1.3.265 -- include \
-  && rm -r .git \
-  && mkdir /vulkan_hpp \
-  && cd /vulkan_hpp \
-  && git init \
-  && git remote add -f origin https://github.com/KhronosGroup/Vulkan-Hpp.git \
-  && git fetch origin \
-  && git checkout v1.3.265 -- vulkan \
-  && rm -r .git

jb/project/docker/mkdocker_aarch64.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# This script creates a Docker image suitable for building AArch64 variant
-# of the JetBrains Runtime "dev" version.
-
-BOOT_JDK_REMOTE_FILE=zulu17.30.15-ca-jdk17.0.1-linux_aarch64.tar.gz
-BOOT_JDK_SHA=4d9c9116eb0cdd2d7fb220d6d27059f4bf1b7e95cc93d5512bd8ce3791af86c7
-BOOT_JDK_LOCAL_FILE=boot_jdk.tar.gz
-
-if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
-    # Obtain "boot JDK" from outside of the container.
-    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
-else
-    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
-fi
-
-# Verify that what we've downloaded can be trusted.
-sha256sum -c - <<EOF
-$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
-EOF
-
-docker build -t jbrdevenv_arm64v8 -f Dockerfile.aarch64 .
-
-# NB: the resulting container can (and should) be used without the network
-# connection (--network none) during build in order to reduce the chance
-# of build contamination.

jb/project/docker/mkdocker_musl_aarch64.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# This script creates a Docker image suitable for building musl AArch64 variant
-# of the JetBrains Runtime version 21.
-
-BOOT_JDK_REMOTE_FILE=zulu20.32.11-ca-jdk20.0.2-linux_musl_aarch64.tar.gz
-BOOT_JDK_SHA=eec57cf744c2438f695221f041d4804de3033ad33b6dba769d3359813ba3f90d
-BOOT_JDK_LOCAL_FILE=boot_jdk_musl_aarch64.tar.gz
-
-if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
-    # Obtain "boot JDK" from outside of the container.
-    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
-else
-    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
-fi
-
-# Verify that what we've downloaded can be trusted.
-sha256sum -c - <<EOF
-$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
-EOF
-
-docker build -t jetbrains/runtime:jbr21env_musl_aarch64 -f Dockerfile.musl_aarch64 .
-
-# NB: the resulting container can (and should) be used without the network
-# connection (--network none) during build in order to reduce the chance
-# of build contamination.

jb/project/docker/mkdocker_musl_x64.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# This script creates a Docker image suitable for building musl-x64 variant
-# of the JetBrains Runtime version 21.
-
-BOOT_JDK_REMOTE_FILE=zulu20.32.11-ca-jdk20.0.2-linux_musl_x64.tar.gz
-BOOT_JDK_SHA=fca5081dd6da847fcd06f5b755e58edae22d6784f21b81bf73da2b538f842c07
-BOOT_JDK_LOCAL_FILE=boot_jdk_musl_amd64.tar.gz
-
-if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
-    # Obtain "boot JDK" from outside of the container.
-    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
-else
-    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
-fi
-
-# Verify that what we've downloaded can be trusted.
-sha256sum -c - <<EOF
-$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
-EOF
-
-docker build -t jetbrains/runtime:jbr21env_musl_x64 -f Dockerfile.musl_x64 .
-
-# NB: the resulting container can (and should) be used without the network
-# connection (--network none) during build in order to reduce the chance
-# of build contamination.

jb/project/docker/mkdocker_x86.sh

@@ -1,26 +0,0 @@
-#!/bin/bash -x
-
-# This script creates a Docker image suitable for building x86 variant
-# of the JetBrains Runtime version 17.
-
-BOOT_JDK_REMOTE_FILE=zulu17.34.19-ca-jdk17.0.3-linux_i686.tar.gz
-BOOT_JDK_SHA=1c35c374ba0001e675d6e80819d5be900c4e141636d5e484992a8c550be14481
-BOOT_JDK_LOCAL_FILE=boot_jdk_x86.tar.gz
-
-if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
-    # Obtain "boot JDK" from outside of the container.
-    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
-else
-    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
-fi
-
-# Verify that what we've downloaded can be trusted.
-sha256sum -c - <<EOF
-$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
-EOF
-
-docker build -t jetbrains/runtime:jbr17env_x86 -f Dockerfile.x86 .
-
-# NB: the resulting container can (and should) be used without the network
-# connection (--network none) during build in order to reduce the chance
-# of build contamination.

jb/project/idea-project-files/jetbrains.api.iml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/src/jetbrains.api">
-      <sourceFolder url="file://$MODULE_DIR$/src/jetbrains.api/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jetbrains.api/templates" isTestSource="false" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="inheritedJdk" />
-  </component>
-</module>
-

jb/project/idea-project-files/modules.xml

@@ -4,7 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/jdk.iml" filepath="$PROJECT_DIR$/.idea/jdk.iml" />
       ###MODULE_IMLS###
-      <module fileurl="file://$PROJECT_DIR$/.idea/jetbrains.api.iml" filepath="$PROJECT_DIR$/.idea/jetbrains.api.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/test.iml" filepath="$PROJECT_DIR$/.idea/test.iml" />
     </modules>
   </component>

jb/project/tools/common/scripts/build-jbr-api.sh

@@ -1,18 +0,0 @@
-#!/bin//bash
-
-set -euo pipefail
-
-# $1 - Boot JDK
-# $2 - JBR part of API version
-
-cd "`dirname "$0"`/../../../../.."
-PWD="`pwd`"
-CONF="$PWD/build/jbr-api.conf"
-./configure --with-debug-level=release --with-boot-jdk=$1 || exit $?
-make jbr-api CONF=release MAKEOVERRIDES= "JBR_API_CONF_FILE=$CONF" JBR_API_JBR_VERSION=$2 || exit $?
-. $CONF || exit $?
-echo "##teamcity[buildNumber '$VERSION']"
-cp "$JAR" ./jbr-api-${VERSION}.jar || exit $?
-cp "$SOURCES_JAR" ./jbr-api-${VERSION}-sources.jar || exit $?
-echo "##teamcity[publishArtifacts '$PWD/jbr-api-${VERSION}.jar']"
-echo "##teamcity[publishArtifacts '$PWD/jbr-api-${VERSION}-sources.jar']"

jb/project/tools/common/scripts/common.sh

@@ -17,9 +17,13 @@ function getVersionProp() {
   grep "^${1}" make/conf/version-numbers.conf | cut -d'=' -f2
 }
 
-while getopts ":i?" o; do
+DISABLE_WARNINGS_AS_ERRORS=""
+CONTINUOUS_INTEGRATION=""
+while getopts ":iwc?" o; do
     case "${o}" in
         i) INC_BUILD=1 ;;
+        w) DISABLE_WARNINGS_AS_ERRORS="--disable-warnings-as-errors" ;;
+        c) CONTINUOUS_INTEGRATION=1 ;;
     esac
 done
 shift $((OPTIND-1))
@@ -36,8 +40,6 @@ architecture=${3:-x64} # aarch64 or x64
 
 check_bundle_type_maketest
 
-tag_prefix="jbr-"
-OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "$tag_prefix" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d ",")
 VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
 VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
 VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")
@@ -45,8 +47,15 @@ VERSION_PATCH=$(getVersionProp "DEFAULT_VERSION_PATCH")
 [[ $VERSION_UPDATE = 0 ]] && JBSDK_VERSION="$VERSION_FEATURE" || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}"
 [[ $VERSION_PATCH = 0 ]] || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}.${VERSION_PATCH}"
 echo "##teamcity[setParameter name='env.JBSDK_VERSION' value='${JBSDK_VERSION}']"
-JDK_BUILD_NUMBER=${JDK_BUILD_NUMBER:=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')}
+tag_prefix="jbr-"
+OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "${tag_prefix}${JBSDK_VERSION}" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -V -f | tail -n 1 | tr -d ",")
+JDK_BUILD_NUMBER=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')
 [ -z $JDK_BUILD_NUMBER ] && JDK_BUILD_NUMBER=1
+re='^[0-9]+$'
+if ! [[ $JDK_BUILD_NUMBER =~ $re ]] ; then
+  echo "error: JDK_BUILD_NUMBER Not a number: $JDK_BUILD_NUMBER"
+  JDK_BUILD_NUMBER=1
+fi
 echo "##teamcity[setParameter name='env.JDK_UPDATE_NUMBER' value='${JDK_BUILD_NUMBER}']"
 
 VENDOR_NAME="JetBrains s.r.o."

jb/project/tools/linux/scripts/mkimages_aarch64.sh

@@ -35,6 +35,8 @@ function do_configure {
     --with-version-opt=b"$build_number" \
     --with-boot-jdk="$BOOT_JDK" \
     --enable-cds=yes \
+    --with-vulkan \
+    $DISABLE_WARNINGS_AS_ERRORS \
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
     $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
@@ -62,7 +64,7 @@ function create_image_bundle {
   __cds_opt=''
 
   if is_musl; then libc_type_suffix='musl-' ; fi
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then __cds_opt="--generate-cds-archive"; fi
+  __cds_opt="--generate-cds-archive"
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix}b${build_number}
@@ -85,6 +87,7 @@ function create_image_bundle {
 
   # jmod does not preserve file permissions (JDK-8173610)
   [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
+  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/cef_server ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/cef_server
 
   echo Creating "$JBR".tar.gz ...
 
@@ -138,7 +141,7 @@ JBRSDK_BUNDLE=jbrsdk
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+if [ "$bundle_type" == "jcef" ]; then
   git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
   update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
   cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
@@ -151,7 +154,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
 
 # create sdk image bundle
 modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
   modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
@@ -160,8 +163,7 @@ if [ $do_maketest -eq 1 ]; then
     JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-aarch64-b${build_number}
     echo Creating "$JBRSDK_TEST" ...
     [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
-    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
-    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    make test-image CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
     tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
     [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
     gzip "$JBRSDK_TEST".tar || do_exit $?

jb/project/tools/linux/scripts/mkimages_x64.sh

@@ -32,6 +32,13 @@ function do_configure {
       --build=x86_64-unknown-linux-gnu \
       --openjdk-target=x86_64-unknown-linux-gnu"
   fi
+
+  if [ -n "${JCEF_BUILD_LEGACY:-}" ]; then
+    WITH_VULKAN=""
+  else
+    WITH_VULKAN="--with-vulkan"
+  fi
+
   sh configure \
     $WITH_DEBUG_LEVEL \
     --with-vendor-name="$VENDOR_NAME" \
@@ -42,7 +49,9 @@ function do_configure {
     --with-version-opt=b"$build_number" \
     --with-boot-jdk="$BOOT_JDK" \
     --enable-cds=yes \
+    $WITH_VULKAN \
     $LINUX_TARGET \
+    $DISABLE_WARNINGS_AS_ERRORS \
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
     $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
@@ -70,7 +79,7 @@ function create_image_bundle {
   __cds_opt=''
 
   if is_musl; then libc_type_suffix='musl-' ; fi
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then __cds_opt="--generate-cds-archive"; fi
+  __cds_opt="--generate-cds-archive"
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix}b${build_number}
@@ -93,6 +102,9 @@ function create_image_bundle {
 
   # jmod does not preserve file permissions (JDK-8173610)
   [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
+  if [ ! -n "${JCEF_BUILD_LEGACY:-}" ]; then
+    [ -f "$IMAGES_DIR"/"$__root_dir"/lib/cef_server ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/cef_server
+  fi
 
   echo Creating "$JBR".tar.gz ...
 
@@ -146,7 +158,7 @@ JBRSDK_BUNDLE=jbrsdk
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+if [ "$bundle_type" == "jcef" ]; then
   git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
   update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
   cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
@@ -159,7 +171,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
 
 # create sdk image bundle
 modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+if [ "$bundle_type" == "jcef" ]|| [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
   modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
@@ -168,8 +180,7 @@ if [ $do_maketest -eq 1 ]; then
     JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x64-b${build_number}
     echo Creating "$JBRSDK_TEST" ...
     [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
-    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
-    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    make test-image CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
     tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
     [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
     gzip "$JBRSDK_TEST".tar || do_exit $?

jb/project/tools/linux/scripts/mkimages_x86.sh

@@ -12,6 +12,7 @@ set -x
 #
 
 source jb/project/tools/common/scripts/common.sh
+ENABLE_CDS="no"
 
 function do_configure {
   linux32 bash configure \
@@ -24,7 +25,8 @@ function do_configure {
     --with-version-opt=b"$build_number" \
     --with-boot-jdk="$BOOT_JDK" \
     $STATIC_CONF_ARGS \
-    --enable-cds=yes \
+    --enable-cds=$ENABLE_CDS \
+    $DISABLE_WARNINGS_AS_ERRORS \
     $REPRODUCIBLE_BUILD_OPTS \
     $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
     || do_exit $?
@@ -50,7 +52,7 @@ function create_image_bundle {
   __cds_opt=''
 
   if is_musl; then libc_type_suffix='musl-' ; fi
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then __cds_opt="--generate-cds-archive"; fi
+  [ "${ENABLE_CDS}" == "yes" ] && __cds_opt="--generate-cds-archive"
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix}b${build_number}
@@ -136,8 +138,7 @@ if [ $do_maketest -eq 1 ]; then
     JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x86-b${build_number}
     echo Creating "$JBRSDK_TEST" ...
     [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
-    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
-    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    make test-image CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
     tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
     [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
     gzip "$JBRSDK_TEST".tar || do_exit $?

jb/project/tools/mac/scripts/codesign.sh

@@ -34,7 +34,23 @@ else
   contentType=$(jetSignContentType "$pathToBeSigned")
   (
     cd "$workDir" || exit 1
-    "$JETSIGN_CLIENT" -log-format text -denoted-content-type "$contentType" -extensions "$jetSignExtensions" "$pathToBeSigned"
+
+    max_attempts=3
+    attempt=1
+    while [ $attempt -le $max_attempts ]; do
+      if "$JETSIGN_CLIENT" -log-format text -max-wait 1m -denoted-content-type "$contentType" -extensions "$jetSignExtensions" "$pathToBeSigned"; then
+        break
+      else
+        if [ $attempt -eq $max_attempts ]; then
+          echo "Failed to sign after $max_attempts attempts"
+          exit 1
+        fi
+        echo "Attempt $attempt failed, retrying in 5 seconds..."
+        sleep 5
+        ((attempt++))
+      fi
+    done
+
     # SRE-1223 (Codesign removes execute bits in executable files) workaround
     chmod "$(stat -f %A "$pathToBeSigned")" "$pathSigned"
     if isMacOsBinary "$pathSigned"; then

jb/project/tools/mac/scripts/entitlements_jcef.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>com.apple.security.cs.allow-jit</key>
+        <true/>
+        <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+        <false/>
+        <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+        <false/>
+        <key>com.apple.security.cs.disable-library-validation</key>
+        <false/>
+        <key>com.apple.security.cs.disable-executable-page-protection</key>
+        <false/>
+    </dict>
+</plist>

jb/project/tools/mac/scripts/mkimages.sh

@@ -24,6 +24,25 @@ source jb/project/tools/common/scripts/common.sh
 
 JCEF_PATH=${JCEF_PATH:=./jcef_mac}
 BOOT_JDK=${BOOT_JDK:=$(/usr/libexec/java_home -v 17)}
+XCODE_PATH=${XCODE_PATH:-}
+if [ -d "$XCODE_PATH" ]; then
+  WITH_XCODE_PATH="--with-xcode-path=$XCODE_PATH"
+else
+  if [ -z "${CONTINUOUS_INTEGRATION:-}" ]; then
+    WITH_XCODE_PATH=""
+    if [ -n "${XCODE_PATH}" ]; then
+      echo "XCode not found in the directory: ${XCODE_PATH}"
+      echo "default XCode will be used"
+    fi
+  else
+    if [ -z "${XCODE_PATH}" ]; then
+      echo "specify XCode via setting XCODE_PATH"
+    else
+      echo "XCode not found in the directory: ${XCODE_PATH}"
+    fi
+    do_exit 1
+  fi
+fi
 
 function do_configure {
   sh configure \
@@ -38,9 +57,11 @@ function do_configure {
     --with-version-opt=b"$build_number" \
     --with-boot-jdk="$BOOT_JDK" \
     --enable-cds=yes \
+    $DISABLE_WARNINGS_AS_ERRORS \
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
     $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
+    $WITH_XCODE_PATH \
     || do_exit $?
 }
 
@@ -52,7 +73,7 @@ function create_image_bundle {
 
   fastdebug_infix=''
   __cds_opt=''
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then __cds_opt="--generate-cds-archive"; fi
+  __cds_opt="--generate-cds-archive"
 
   tmp=.bundle.$$.tmp
   mkdir "$tmp" || do_exit $?
@@ -135,9 +156,11 @@ JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
-  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+  if [ "$bundle_type" == "jcef" ]; then
+    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+    update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+    cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+  fi
 
   jbr_name_postfix="_${bundle_type}"
 else
@@ -150,7 +173,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
 
 # create sdk image bundle
 modules=$(cat "$JSDK"/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
   modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
@@ -159,8 +182,7 @@ if [ $do_maketest -eq 1 ]; then
     JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-osx-test-${architecture}-b${build_number}
     echo Creating "$JBRSDK_TEST" ...
     [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
-    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
-    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    make test-image CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
     [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
     COPYFILE_DISABLE=1 tar -pczf "$JBRSDK_TEST".tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
 fi

jb/project/tools/mac/scripts/notarize.sh

@@ -30,11 +30,34 @@ trap "rm -f \"$PWD/tmp_key\"" INT EXIT RETURN
 echo -n "${APPLE_PRIVATE_KEY}" > tmp_key
 
 log "Notarizing $APP_PATH..."
-xcrun notarytool submit --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" "$APP_PATH" 2>&1 | tee "notarytool.submit.out"
+xcrun notarytool submit --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" "$APP_PATH" 2>&1 --wait| tee "notarytool.submit.out"
 REQUEST_ID="$(grep -e " id: " "notarytool.submit.out" | grep -oE '([0-9a-f-]{36})'| head -n1)"
 
-xcrun notarytool wait "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" --timeout 6h ||:
-xcrun notarytool log  "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" developer_log.json ||:
-xcrun notarytool info "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}"
+waitOutput=$(xcrun notarytool wait "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" --timeout 6h)
+if [ $? -ne 0 ]; then
+  log "Notarizing failed (wait command)"
+  echo "$waitOutput"
+  exit 1
+else
+  echo "$waitOutput"
+fi
+
+logOutout=$(xcrun notarytool log  "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" developer_log.json)
+if [ $? -ne 0 ]; then
+  log "Notarizing failed (log command)"
+  echo "$logOutout"
+  exit 1
+else
+  echo "$logOutout"
+fi
+
+infoOUtput=$(xcrun notarytool info "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}")
+if [ $? -ne 0 ]; then
+  log "Notarizing failed (info command)"
+  echo "$infoOUtput"
+  exit 1
+else
+  echo "$infoOUtput"
+fi
 
 log "Notarizing finished"

jb/project/tools/mac/scripts/sign.sh

@@ -43,18 +43,104 @@ find "$APPLICATION_PATH" -name '*.cstemp' -exec rm '{}' \;
 log "Signing libraries and executables..."
 # -perm +111 searches for executables
 for f in \
-  "Contents/Home/lib" "Contents/MacOS" \
-  "Contents/Home/Frameworks" \
-  "Contents/Frameworks"; do
+  "Contents/Home/lib" "Contents/MacOS"; do
   if [ -d "$APPLICATION_PATH/$f" ]; then
     find "$APPLICATION_PATH/$f" \
       -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -name "*.node" -o -perm +111 \) \
-      -exec "$SIGN_UTILITY" --timestamp \
-      -v -s "$JB_DEVELOPER_CERT" --options=runtime --force \
-      --entitlements "$SCRIPT_DIR/entitlements.xml" {} \;
+      -exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;      
   fi
 done
 
+log "Signing JCEF libraries and executables..."
+if [ -d "$APPLICATION_PATH/Contents/Frameworks" ]; then
+  find "$APPLICATION_PATH/Contents/Frameworks" \
+    -type f \( -name "*.dylib" -o -perm +111 \) \
+    -exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements_jcef.xml" {} \;
+fi
+
+log "Signing jmod files"
+JMODS_DIR="$APPLICATION_PATH/Contents/Home/jmods"
+JMOD_EXE="$BOOT_JDK/bin/jmod"
+if [ -d "$JMODS_DIR" ]; then
+  log "processing jmods"  
+
+  for jmod_file in "$JMODS_DIR"/*.jmod; do
+    log "Processing $jmod_file"
+
+    TMP_DIR="$JMODS_DIR/tmp"
+    rm -rf "$TMP_DIR"
+    mkdir "$TMP_DIR"
+
+    log "Unzipping $jmod_file"
+    $JMOD_EXE extract --dir "$TMP_DIR" "$jmod_file" >/dev/null
+
+    log "Signing dylibs in $TMP_DIR"
+    find "$TMP_DIR" \
+      -type f \( -name "*.dylib" -o -name "*.so" -o -perm +111 -o -name jarsigner -o -name jdeps -o -name jpackageapplauncher -o -name jspawnhelper -o -name jar -o -name javap -o -name jdeprscan -o -name jfr -o -name rmiregistry -o -name java -o -name jhsdb  -o -name jstatd  -o -name jstatd -o -name jpackage -o -name keytool -o -name jmod -o -name jlink -o -name jimage -o -name jstack -o -name jcmd -o -name jps -o -name jmap -o -name jstat -o -name jinfo -o -name jshell -o -name jwebserver -o -name javac -o -name serialver -o -name jrunscript -o -name jdb -o -name jconsole -o -name javadoc \) \
+      -exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
+
+    log "Removing $jmod_file"
+    rm -f "$jmod_file"
+    cmd="$JMOD_EXE create --class-path $TMP_DIR/classes"
+
+    # Check each directory and add to the command if it exists
+    [ -d "$TMP_DIR/bin" ] && cmd="$cmd --cmds $TMP_DIR/bin"
+    [ -d "$TMP_DIR/conf" ] && cmd="$cmd --config $TMP_DIR/conf"
+    [ -d "$TMP_DIR/lib" ] && cmd="$cmd --libs $TMP_DIR/lib"
+    [ -d "$TMP_DIR/include" ] && cmd="$cmd --header-files $TMP_DIR/include"
+    [ -d "$TMP_DIR/legal" ] && cmd="$cmd --legal-notices $TMP_DIR/legal"
+    [ -d "$TMP_DIR/man" ] && cmd="$cmd --man-pages $TMP_DIR/man"
+
+    log "Creating jmod file"
+		log "$cmd"
+    # Add the output file
+    cmd="$cmd $jmod_file"
+
+    # Execute the command
+    eval $cmd
+
+    log "Removing $TMP_DIR"
+    rm -rf "$TMP_DIR"
+  done
+
+  log "Repack java.base.jmod with new hashes of modules"
+  hash_modules=$($JMOD_EXE describe $JMODS_DIR/java.base.jmod | grep hashes | awk '{print $2}' | tr '\n' '|' | sed s/\|$//) || exit $?
+
+  TMP_DIR="$JMODS_DIR/tmp"
+  rm -rf "$TMP_DIR"
+  mkdir "$TMP_DIR"
+
+  jmod_file="$JMODS_DIR/java.base.jmod"
+  log "Unzipping $jmod_file"
+  $JMOD_EXE extract --dir "$TMP_DIR" "$jmod_file" >/dev/null
+
+  log "Removing java.base.jmod"
+  rm -f "$jmod_file"
+
+  cmd="$JMOD_EXE create --class-path $TMP_DIR/classes --hash-modules \"$hash_modules\" --module-path $JMODS_DIR"
+
+  # Check each directory and add to the command if it exists
+  [ -d "$TMP_DIR/bin" ] && cmd="$cmd --cmds $TMP_DIR/bin"
+  [ -d "$TMP_DIR/conf" ] && cmd="$cmd --config $TMP_DIR/conf"
+  [ -d "$TMP_DIR/lib" ] && cmd="$cmd --libs $TMP_DIR/lib"
+  [ -d "$TMP_DIR/include" ] && cmd="$cmd --header-files $TMP_DIR/include"
+  [ -d "$TMP_DIR/legal" ] && cmd="$cmd --legal-notices $TMP_DIR/legal"
+  [ -d "$TMP_DIR/man" ] && cmd="$cmd --man-pages $TMP_DIR/man"
+
+  log "Creating jmod file"
+	log "$cmd"
+  # Add the output file
+  cmd="$cmd $jmod_file"
+
+  # Execute the command
+  eval $cmd
+
+  log "Removing $TMP_DIR"
+  rm -rf "$TMP_DIR"
+else
+  echo "Directory '$JMODS_DIR' does not exist. Skipping signing of jmod files."
+fi
+
 log "Signing libraries in jars in $APPLICATION_PATH"
 
 # todo: add set -euo pipefail; into the inner sh -c
@@ -73,10 +159,7 @@ find "$APPLICATION_PATH" -name '*.jar' \
 
     find jarfolder \
       -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -name "jattach" \) \
-      -exec "$SIGN_UTILITY" --timestamp \
-      --force \
-      -v -s "$JB_DEVELOPER_CERT" --options=runtime \
-      --entitlements "$SCRIPT_DIR/entitlements.xml" {} \;
+      -exec sh -c '"$1" --timestamp --force -v -s "$2" --options=runtime --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
 
     (cd jarfolder; zip -q -r -o -0 ../jar.jar .)
     mv jar.jar "$file"
@@ -91,16 +174,14 @@ for f in \
   if [ -d "$APPLICATION_PATH/$f" ]; then
     find "$APPLICATION_PATH/$f" \
       -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -perm +111 \) \
-      -exec "$SIGN_UTILITY" --timestamp \
-      -v -s "$JB_DEVELOPER_CERT" --options=runtime --force \
-      --entitlements "$SCRIPT_DIR/entitlements.xml" {} \;
+      -exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
   fi
 done
 
 log "Signing whole frameworks..."
 # shellcheck disable=SC2043
 if [ "$JB_SIGN" = true ]; then for f in \
-  "Contents/Frameworks/cef_server.app/Contents/Frameworks" "Contents/Home/Frameworks" "Contents/Frameworks"; do
+  "Contents/Frameworks/cef_server.app/Contents/Frameworks" "Contents/Frameworks"; do
   if [ -d "$APPLICATION_PATH/$f" ]; then
     find "$APPLICATION_PATH/$f" \( -name '*.framework' -o -name '*.app' \) -maxdepth 1 | while read -r line
       do
@@ -109,7 +190,7 @@ if [ "$JB_SIGN" = true ]; then for f in \
         "$SIGN_UTILITY" --timestamp \
             -v -s "$JB_DEVELOPER_CERT" --options=runtime \
             --force \
-            --entitlements "$SCRIPT_DIR/entitlements.xml" tmp-to-sign.tar.gz
+            --entitlements "$SCRIPT_DIR/entitlements_jcef.xml" tmp-to-sign.tar.gz || exit 1
         rm -rf "$line"
         tar -xzf tmp-to-sign.tar.gz --directory "$(dirname "$line")"
         rm -f tmp-to-sign.tar.gz
@@ -118,16 +199,14 @@ if [ "$JB_SIGN" = true ]; then for f in \
 done; fi
 
 log "Checking framework signatures..."
-for f in \
-  "Contents/Home/Frameworks" "Contents/Frameworks"; do
-  if [ -d "$APPLICATION_PATH/$f" ]; then
-    find "$APPLICATION_PATH/$f" -name '*.framework'  -maxdepth 1 | while read -r line
-      do
-        log "Checking '$line':"
-        codesign --verify --deep --strict --verbose=4 "$line"
-      done
-  fi
-done
+
+if [ -d "$APPLICATION_PATH/Contents/Frameworks" ]; then
+  find "$APPLICATION_PATH/Contents/Frameworks" -name '*.framework'  -maxdepth 1 | while read -r line
+    do
+      log "Checking '$line':"
+      codesign --verify --deep --strict --verbose=4 "$line"
+    done
+fi
 
 log "Signing whole app..."
 if [ "$JB_SIGN" = true ]; then
@@ -135,7 +214,7 @@ if [ "$JB_SIGN" = true ]; then
   "$SIGN_UTILITY" --timestamp \
     -v -s "$JB_DEVELOPER_CERT" --options=runtime \
     --force \
-    --entitlements "$SCRIPT_DIR/entitlements.xml" tmp-to-sign.tar.gz
+    --entitlements "$SCRIPT_DIR/entitlements.xml" tmp-to-sign.tar.gz || exit 1
   rm -rf "$APPLICATION_PATH"
   tar -xzf tmp-to-sign.tar.gz --directory "$(dirname "$APPLICATION_PATH")"
   rm -f tmp-to-sign.tar.gz
@@ -143,7 +222,7 @@ else
   "$SIGN_UTILITY" --timestamp \
     -v -s "$JB_DEVELOPER_CERT" --options=runtime \
     --force \
-    --entitlements "$SCRIPT_DIR/entitlements.xml" "$APPLICATION_PATH"
+    --entitlements "$SCRIPT_DIR/entitlements.xml" "$APPLICATION_PATH" || exit 1
 fi
 
 BUILD_NAME="$(basename "$APPLICATION_PATH")"

jb/project/tools/mac/scripts/signapp.sh

@@ -38,9 +38,6 @@ BUILD_NAME="$(ls "$EXPLODED")"
 #sed -i '' s/BNDL/APPL/ $EXPLODED/$BUILD_NAME/Contents/Info.plist
 rm -f $EXPLODED/$BUILD_NAME/Contents/CodeResources
 rm "$INPUT_FILE"
-if test -d $EXPLODED/$BUILD_NAME/Contents/Home/jmods; then
-  mv $EXPLODED/$BUILD_NAME/Contents/Home/jmods $BACKUP_JMODS
-fi
 
 log "$INPUT_FILE extracted and removed"
 
@@ -108,9 +105,37 @@ set -e
 if [ "$NOTARIZE" = "yes" ]; then
   log "Notarizing..."
   "$SCRIPT_DIR/notarize.sh" "$PKG_NAME"
+
   log "Stapling..."
-  xcrun stapler staple "$APPLICATION_PATH" ||:
-  xcrun stapler staple "$PKG_NAME" ||:
+  appStaplerOutput=$(xcrun stapler staple "$APPLICATION_PATH")
+  if [ $? -ne 0 ]; then
+    log "Stapling application failed"
+    echo "$appStaplerOutput"
+    exit 1
+  else
+    echo "$appStaplerOutput"
+  fi
+
+  log "Stapling package..."
+  pkgStaplerOutput=$(xcrun stapler staple "$PKG_NAME")
+  if [ $? -ne 0 ]; then
+    log "Stapling package failed"
+    echo "$pkgStaplerOutput"
+    exit 1
+  else
+    echo "$pkgStaplerOutput"
+  fi
+
+  # Verify stapling
+  log "Verifying stapling..."
+  if ! stapler validate "$APPLICATION_PATH"; then
+    log "Stapling verification failed for application"
+    exit 1
+  fi
+  if ! stapler validate "$PKG_NAME"; then
+    log "Stapling verification failed for package"
+    exit 1
+  fi
 else
   log "Notarization disabled"
   log "Stapling disabled"
@@ -118,11 +143,6 @@ fi
 
 log "Zipping $BUILD_NAME to $INPUT_FILE ..."
 (
-  #cd "$EXPLODED"
-  #ditto -c -k --sequesterRsrc --keepParent "$BUILD_NAME" "../$INPUT_FILE"
-  if test -d $BACKUP_JMODS/jmods; then
-    mv $BACKUP_JMODS/jmods $APPLICATION_PATH/Contents/Home
-  fi
   if [[ "$APPLICATION_PATH" != "$EXPLODED/$BUILD_NAME" ]]; then
     mv $APPLICATION_PATH $EXPLODED/$BUILD_NAME
   else
@@ -133,4 +153,4 @@ log "Zipping $BUILD_NAME to $INPUT_FILE ..."
   log "Finished zipping"
 )
 rm -rf "$EXPLODED"
-log "Done"
+log "Done"

jb/project/tools/perf/j2dbopts_poly250-AA-rand_col.txt

@@ -0,0 +1,267 @@
+prog.verbose=disabled
+prog.printresults=enabled
+global.env.outputwidth=640
+global.env.outputheight=480
+global.env.runcount=5
+global.env.repcount=0
+global.env.testtime=2500
+global.results.workunits=units
+global.results.timeunits=sec
+global.results.ratio=unitspersec
+global.dest.offscreen=disabled
+global.dest.frame.defaultframe=enabled
+global.dest.frame.transframe=disabled
+global.dest.frame.shapedframe=disabled
+global.dest.frame.shapedtransframe=disabled
+global.dest.compatimg.compatimg=disabled
+global.dest.compatimg.opqcompatimg=disabled
+global.dest.compatimg.bmcompatimg=disabled
+global.dest.compatimg.transcompatimg=disabled
+global.dest.volimg.volimg=disabled
+global.dest.volimg.opqvolimg=disabled
+global.dest.volimg.bmvolimg=disabled
+global.dest.volimg.transvolimg=disabled
+global.dest.bufimg.IntXrgb=disabled
+global.dest.bufimg.IntArgb=disabled
+global.dest.bufimg.IntArgbPre=disabled
+global.dest.bufimg.3ByteBgr=disabled
+global.dest.bufimg.ByteIndexed=disabled
+global.dest.bufimg.ByteGray=disabled
+global.dest.bufimg.4ByteAbgr=disabled
+global.dest.bufimg.4ByteAbgrPre=disabled
+global.dest.bufimg.custom=disabled
+graphics.opts.anim=2
+graphics.opts.sizes=250
+graphics.opts.alpharule=SrcOver
+graphics.opts.transform=ident
+graphics.opts.extraalpha=Off
+graphics.opts.xormode=Off
+graphics.opts.clip=Off
+graphics.opts.renderhint=Default
+graphics.render.opts.paint=random
+graphics.render.opts.alphacolor=Off
+graphics.render.opts.antialias=On
+graphics.render.opts.stroke=width1
+graphics.render.tests.drawLine=disabled
+graphics.render.tests.drawLineHoriz=disabled
+graphics.render.tests.drawLineVert=disabled
+graphics.render.tests.fillRect=disabled
+graphics.render.tests.drawRect=disabled
+graphics.render.tests.fillOval=disabled
+graphics.render.tests.drawOval=disabled
+graphics.render.tests.fillPoly=disabled
+graphics.render.tests.drawPoly=enabled
+graphics.render.tests.shape.fillCubic=disabled
+graphics.render.tests.shape.drawCubic=disabled
+graphics.render.tests.shape.fillEllipse2D=disabled
+graphics.render.tests.shape.drawEllipse2D=disabled
+graphics.imaging.src.offscr.opaque=disabled
+graphics.imaging.src.offscr.bitmask=disabled
+graphics.imaging.src.offscr.translucent=disabled
+graphics.imaging.src.opqcompatimg.opaque=disabled
+graphics.imaging.src.opqcompatimg.bitmask=disabled
+graphics.imaging.src.opqcompatimg.translucent=disabled
+graphics.imaging.src.bmcompatimg.opaque=disabled
+graphics.imaging.src.bmcompatimg.bitmask=disabled
+graphics.imaging.src.bmcompatimg.translucent=disabled
+graphics.imaging.src.transcompatimg.opaque=disabled
+graphics.imaging.src.transcompatimg.bitmask=disabled
+graphics.imaging.src.transcompatimg.translucent=disabled
+graphics.imaging.src.opqvolimg.opaque=disabled
+graphics.imaging.src.opqvolimg.bitmask=disabled
+graphics.imaging.src.opqvolimg.translucent=disabled
+graphics.imaging.src.bmvolimg.opaque=disabled
+graphics.imaging.src.bmvolimg.bitmask=disabled
+graphics.imaging.src.bmvolimg.translucent=disabled
+graphics.imaging.src.transvolimg.opaque=disabled
+graphics.imaging.src.transvolimg.bitmask=disabled
+graphics.imaging.src.transvolimg.translucent=disabled
+graphics.imaging.src.bufimg.IntXrgb.opaque=disabled
+graphics.imaging.src.bufimg.IntXrgb.bitmask=disabled
+graphics.imaging.src.bufimg.IntXrgb.translucent=disabled
+graphics.imaging.src.bufimg.IntArgb.opaque=disabled
+graphics.imaging.src.bufimg.IntArgb.bitmask=disabled
+graphics.imaging.src.bufimg.IntArgb.translucent=disabled
+graphics.imaging.src.bufimg.IntArgbPre.opaque=disabled
+graphics.imaging.src.bufimg.IntArgbPre.bitmask=disabled
+graphics.imaging.src.bufimg.IntArgbPre.translucent=disabled
+graphics.imaging.src.bufimg.ByteGray.opaque=disabled
+graphics.imaging.src.bufimg.ByteGray.bitmask=disabled
+graphics.imaging.src.bufimg.ByteGray.translucent=disabled
+graphics.imaging.src.bufimg.3ByteBgr.opaque=disabled
+graphics.imaging.src.bufimg.3ByteBgr.bitmask=disabled
+graphics.imaging.src.bufimg.3ByteBgr.translucent=disabled
+graphics.imaging.src.bufimg.4ByteAbgr.opaque=disabled
+graphics.imaging.src.bufimg.4ByteAbgr.bitmask=disabled
+graphics.imaging.src.bufimg.4ByteAbgr.translucent=disabled
+graphics.imaging.src.bufimg.4ByteAbgrPre.opaque=disabled
+graphics.imaging.src.bufimg.4ByteAbgrPre.bitmask=disabled
+graphics.imaging.src.bufimg.4ByteAbgrPre.translucent=disabled
+graphics.imaging.src.bufimg.ByteIndexedBm.opaque=disabled
+graphics.imaging.src.bufimg.ByteIndexedBm.bitmask=disabled
+graphics.imaging.src.bufimg.ByteIndexedBm.translucent=disabled
+graphics.imaging.src.bufimg.unmanagedIntXrgb.opaque=disabled
+graphics.imaging.src.bufimg.unmanagedIntXrgb.bitmask=disabled
+graphics.imaging.src.bufimg.unmanagedIntXrgb.translucent=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgb.opaque=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgb.bitmask=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgb.translucent=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgbPre.opaque=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgbPre.bitmask=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgbPre.translucent=disabled
+graphics.imaging.src.bufimg.unmanaged3ByteBgr.opaque=disabled
+graphics.imaging.src.bufimg.unmanaged3ByteBgr.bitmask=disabled
+graphics.imaging.src.bufimg.unmanaged3ByteBgr.translucent=disabled
+graphics.imaging.benchmarks.opts.interpolation=Nearest neighbor
+graphics.imaging.benchmarks.opts.touchsrc=Off
+graphics.imaging.benchmarks.tests.drawimage=disabled
+graphics.imaging.benchmarks.tests.drawimagebg=disabled
+graphics.imaging.benchmarks.tests.drawimagescaleup=disabled
+graphics.imaging.benchmarks.tests.drawimagescaledown=disabled
+graphics.imaging.benchmarks.tests.drawimagescalesplit=disabled
+graphics.imaging.benchmarks.tests.drawimagetxform=disabled
+graphics.imaging.imageops.opts.op=convolve3x3zero
+graphics.imaging.imageops.tests.graphics2d.drawimageop=disabled
+graphics.imaging.imageops.tests.bufimgop.filternull=disabled
+graphics.imaging.imageops.tests.bufimgop.filtercached=disabled
+graphics.imaging.imageops.tests.rasterop.filternull=disabled
+graphics.imaging.imageops.tests.rasterop.filtercached=disabled
+graphics.misc.copytests.copyAreaVert=disabled
+graphics.misc.copytests.copyAreaHoriz=disabled
+graphics.misc.copytests.copyAreaDiag=disabled
+pixel.opts.renderto=Off
+pixel.opts.renderfrom=Off
+pixel.src.1BitBinary=disabled
+pixel.src.2BitBinary=disabled
+pixel.src.4BitBinary=disabled
+pixel.src.ByteIndexed=disabled
+pixel.src.ByteGray=disabled
+pixel.src.Short555=disabled
+pixel.src.Short565=disabled
+pixel.src.ShortGray=disabled
+pixel.src.3ByteBgr=disabled
+pixel.src.4ByteAbgr=disabled
+pixel.src.IntXrgb=disabled
+pixel.src.IntXbgr=disabled
+pixel.src.IntArgb=disabled
+pixel.bimgtests.getrgb=disabled
+pixel.bimgtests.setrgb=disabled
+pixel.rastests.getdataelem=disabled
+pixel.rastests.setdataelem=disabled
+pixel.rastests.getpixel=disabled
+pixel.rastests.setpixel=disabled
+pixel.dbtests.getelem=disabled
+pixel.dbtests.setelem=disabled
+text.opts.data.tlength=16
+text.opts.data.tscript=english
+text.opts.font.fname=serif,physical
+text.opts.font.fstyle=0
+text.opts.font.fsize=13.0
+text.opts.font.ftx=Identity
+text.opts.graphics.textaa=Off
+text.opts.graphics.tfm=Off
+text.opts.graphics.gaa=Off
+text.opts.graphics.gtx=Identity
+text.opts.advopts.gvstyle=0
+text.opts.advopts.tlruns=1
+text.opts.advopts.maptype=FONT
+text.Rendering.tests.drawString=disabled
+text.Rendering.tests.drawChars=disabled
+text.Rendering.tests.drawBytes=disabled
+text.Rendering.tests.drawGlyphVectors=disabled
+text.Rendering.tests.drawTextLayout=disabled
+text.Measuring.tests.stringWidth=disabled
+text.Measuring.tests.stringBounds=disabled
+text.Measuring.tests.charsWidth=disabled
+text.Measuring.tests.charsBounds=disabled
+text.Measuring.tests.fontcandisplay=disabled
+text.Measuring.tests.gvWidth=disabled
+text.Measuring.tests.gvLogicalBounds=disabled
+text.Measuring.tests.gvVisualBounds=disabled
+text.Measuring.tests.gvPixelBounds=disabled
+text.Measuring.tests.gvOutline=disabled
+text.Measuring.tests.gvGlyphLogicalBounds=disabled
+text.Measuring.tests.gvGlyphVisualBounds=disabled
+text.Measuring.tests.gvGlyphPixelBounds=disabled
+text.Measuring.tests.gvGlyphOutline=disabled
+text.Measuring.tests.gvGlyphTransform=disabled
+text.Measuring.tests.gvGlyphMetrics=disabled
+text.Measuring.tests.tlAdvance=disabled
+text.Measuring.tests.tlAscent=disabled
+text.Measuring.tests.tlBounds=disabled
+text.Measuring.tests.tlGetCaretInfo=disabled
+text.Measuring.tests.tlGetNextHit=disabled
+text.Measuring.tests.tlGetCaretShape=disabled
+text.Measuring.tests.tlGetLogicalHighlightShape=disabled
+text.Measuring.tests.tlHitTest=disabled
+text.Measuring.tests.tlOutline=disabled
+text.construction.tests.gvfromfontstring=disabled
+text.construction.tests.gvfromfontchars=disabled
+text.construction.tests.gvfromfontci=disabled
+text.construction.tests.gvfromfontglyphs=disabled
+text.construction.tests.gvfromfontlayout=disabled
+text.construction.tests.tlfromfont=disabled
+text.construction.tests.tlfrommap=disabled
+imageio.opts.size=250
+imageio.opts.content=photo
+imageio.input.opts.general.source.file=disabled
+imageio.input.opts.general.source.url=disabled
+imageio.input.opts.general.source.byteArray=disabled
+imageio.input.opts.imageio.useCache=Off
+imageio.input.image.toolkit.opts.format=
+imageio.input.image.toolkit.tests.createImage=disabled
+imageio.input.image.imageio.opts.format=
+imageio.input.image.imageio.tests.imageioRead=disabled
+imageio.input.image.imageio.reader.opts.seekForwardOnly=On
+imageio.input.image.imageio.reader.opts.ignoreMetadata=On
+imageio.input.image.imageio.reader.opts.installListener=Off
+imageio.input.image.imageio.reader.tests.read=disabled
+imageio.input.image.imageio.reader.tests.getImageMetadata=disabled
+imageio.input.stream.tests.construct=disabled
+imageio.input.stream.tests.read=disabled
+imageio.input.stream.tests.readByteArray=disabled
+imageio.input.stream.tests.readFullyByteArray=disabled
+imageio.input.stream.tests.readBit=disabled
+imageio.input.stream.tests.readByte=disabled
+imageio.input.stream.tests.readUnsignedByte=disabled
+imageio.input.stream.tests.readShort=disabled
+imageio.input.stream.tests.readUnsignedShort=disabled
+imageio.input.stream.tests.readInt=disabled
+imageio.input.stream.tests.readUnsignedInt=disabled
+imageio.input.stream.tests.readFloat=disabled
+imageio.input.stream.tests.readLong=disabled
+imageio.input.stream.tests.readDouble=disabled
+imageio.input.stream.tests.skipBytes=disabled
+imageio.output.opts.general.dest.file=disabled
+imageio.output.opts.general.dest.byteArray=disabled
+imageio.output.opts.imageio.useCache=Off
+imageio.output.image.imageio.opts.format=
+imageio.output.image.imageio.tests.imageioWrite=disabled
+imageio.output.image.imageio.writer.opts.installListener=Off
+imageio.output.image.imageio.writer.tests.write=disabled
+imageio.output.stream.tests.construct=disabled
+imageio.output.stream.tests.write=disabled
+imageio.output.stream.tests.writeByteArray=disabled
+imageio.output.stream.tests.writeBit=disabled
+imageio.output.stream.tests.writeByte=disabled
+imageio.output.stream.tests.writeShort=disabled
+imageio.output.stream.tests.writeInt=disabled
+imageio.output.stream.tests.writeFloat=disabled
+imageio.output.stream.tests.writeLong=disabled
+imageio.output.stream.tests.writeDouble=disabled
+cmm.opts.profiles=1001
+cmm.colorconv.data.fromRGB=disabled
+cmm.colorconv.data.toRGB=disabled
+cmm.colorconv.data.fromCIEXYZ=disabled
+cmm.colorconv.data.toCIEXYZ=disabled
+cmm.colorconv.ccop.ccopOptions.size=250
+cmm.colorconv.ccop.ccopOptions.content=photo
+cmm.colorconv.ccop.ccopOptions.srcType=INT_RGB
+cmm.colorconv.ccop.ccopOptions.dstType=INT_RGB
+cmm.colorconv.ccop.op_img=disabled
+cmm.colorconv.ccop.op_rst=disabled
+cmm.colorconv.ccop.op_draw=disabled
+cmm.colorconv.embed.embedOptions.Images=512x512
+cmm.colorconv.embed.embd_img_read=disabled
+cmm.profiles.getHeader=disabled
+cmm.profiles.getNumComponents=disabled

jb/project/tools/perf/j2dbopts_poly250-rand_col.txt

@@ -0,0 +1,267 @@
+prog.verbose=disabled
+prog.printresults=enabled
+global.env.outputwidth=640
+global.env.outputheight=480
+global.env.runcount=5
+global.env.repcount=0
+global.env.testtime=2500
+global.results.workunits=units
+global.results.timeunits=sec
+global.results.ratio=unitspersec
+global.dest.offscreen=disabled
+global.dest.frame.defaultframe=enabled
+global.dest.frame.transframe=disabled
+global.dest.frame.shapedframe=disabled
+global.dest.frame.shapedtransframe=disabled
+global.dest.compatimg.compatimg=disabled
+global.dest.compatimg.opqcompatimg=disabled
+global.dest.compatimg.bmcompatimg=disabled
+global.dest.compatimg.transcompatimg=disabled
+global.dest.volimg.volimg=disabled
+global.dest.volimg.opqvolimg=disabled
+global.dest.volimg.bmvolimg=disabled
+global.dest.volimg.transvolimg=disabled
+global.dest.bufimg.IntXrgb=disabled
+global.dest.bufimg.IntArgb=disabled
+global.dest.bufimg.IntArgbPre=disabled
+global.dest.bufimg.3ByteBgr=disabled
+global.dest.bufimg.ByteIndexed=disabled
+global.dest.bufimg.ByteGray=disabled
+global.dest.bufimg.4ByteAbgr=disabled
+global.dest.bufimg.4ByteAbgrPre=disabled
+global.dest.bufimg.custom=disabled
+graphics.opts.anim=2
+graphics.opts.sizes=250
+graphics.opts.alpharule=SrcOver
+graphics.opts.transform=ident
+graphics.opts.extraalpha=Off
+graphics.opts.xormode=Off
+graphics.opts.clip=Off
+graphics.opts.renderhint=Default
+graphics.render.opts.paint=random
+graphics.render.opts.alphacolor=Off
+graphics.render.opts.antialias=Off
+graphics.render.opts.stroke=width1
+graphics.render.tests.drawLine=disabled
+graphics.render.tests.drawLineHoriz=disabled
+graphics.render.tests.drawLineVert=disabled
+graphics.render.tests.fillRect=disabled
+graphics.render.tests.drawRect=disabled
+graphics.render.tests.fillOval=disabled
+graphics.render.tests.drawOval=disabled
+graphics.render.tests.fillPoly=disabled
+graphics.render.tests.drawPoly=enabled
+graphics.render.tests.shape.fillCubic=disabled
+graphics.render.tests.shape.drawCubic=disabled
+graphics.render.tests.shape.fillEllipse2D=disabled
+graphics.render.tests.shape.drawEllipse2D=disabled
+graphics.imaging.src.offscr.opaque=disabled
+graphics.imaging.src.offscr.bitmask=disabled
+graphics.imaging.src.offscr.translucent=disabled
+graphics.imaging.src.opqcompatimg.opaque=disabled
+graphics.imaging.src.opqcompatimg.bitmask=disabled
+graphics.imaging.src.opqcompatimg.translucent=disabled
+graphics.imaging.src.bmcompatimg.opaque=disabled
+graphics.imaging.src.bmcompatimg.bitmask=disabled
+graphics.imaging.src.bmcompatimg.translucent=disabled
+graphics.imaging.src.transcompatimg.opaque=disabled
+graphics.imaging.src.transcompatimg.bitmask=disabled
+graphics.imaging.src.transcompatimg.translucent=disabled
+graphics.imaging.src.opqvolimg.opaque=disabled
+graphics.imaging.src.opqvolimg.bitmask=disabled
+graphics.imaging.src.opqvolimg.translucent=disabled
+graphics.imaging.src.bmvolimg.opaque=disabled
+graphics.imaging.src.bmvolimg.bitmask=disabled
+graphics.imaging.src.bmvolimg.translucent=disabled
+graphics.imaging.src.transvolimg.opaque=disabled
+graphics.imaging.src.transvolimg.bitmask=disabled
+graphics.imaging.src.transvolimg.translucent=disabled
+graphics.imaging.src.bufimg.IntXrgb.opaque=disabled
+graphics.imaging.src.bufimg.IntXrgb.bitmask=disabled
+graphics.imaging.src.bufimg.IntXrgb.translucent=disabled
+graphics.imaging.src.bufimg.IntArgb.opaque=disabled
+graphics.imaging.src.bufimg.IntArgb.bitmask=disabled
+graphics.imaging.src.bufimg.IntArgb.translucent=disabled
+graphics.imaging.src.bufimg.IntArgbPre.opaque=disabled
+graphics.imaging.src.bufimg.IntArgbPre.bitmask=disabled
+graphics.imaging.src.bufimg.IntArgbPre.translucent=disabled
+graphics.imaging.src.bufimg.ByteGray.opaque=disabled
+graphics.imaging.src.bufimg.ByteGray.bitmask=disabled
+graphics.imaging.src.bufimg.ByteGray.translucent=disabled
+graphics.imaging.src.bufimg.3ByteBgr.opaque=disabled
+graphics.imaging.src.bufimg.3ByteBgr.bitmask=disabled
+graphics.imaging.src.bufimg.3ByteBgr.translucent=disabled
+graphics.imaging.src.bufimg.4ByteAbgr.opaque=disabled
+graphics.imaging.src.bufimg.4ByteAbgr.bitmask=disabled
+graphics.imaging.src.bufimg.4ByteAbgr.translucent=disabled
+graphics.imaging.src.bufimg.4ByteAbgrPre.opaque=disabled
+graphics.imaging.src.bufimg.4ByteAbgrPre.bitmask=disabled
+graphics.imaging.src.bufimg.4ByteAbgrPre.translucent=disabled
+graphics.imaging.src.bufimg.ByteIndexedBm.opaque=disabled
+graphics.imaging.src.bufimg.ByteIndexedBm.bitmask=disabled
+graphics.imaging.src.bufimg.ByteIndexedBm.translucent=disabled
+graphics.imaging.src.bufimg.unmanagedIntXrgb.opaque=disabled
+graphics.imaging.src.bufimg.unmanagedIntXrgb.bitmask=disabled
+graphics.imaging.src.bufimg.unmanagedIntXrgb.translucent=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgb.opaque=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgb.bitmask=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgb.translucent=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgbPre.opaque=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgbPre.bitmask=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgbPre.translucent=disabled
+graphics.imaging.src.bufimg.unmanaged3ByteBgr.opaque=disabled
+graphics.imaging.src.bufimg.unmanaged3ByteBgr.bitmask=disabled
+graphics.imaging.src.bufimg.unmanaged3ByteBgr.translucent=disabled
+graphics.imaging.benchmarks.opts.interpolation=Nearest neighbor
+graphics.imaging.benchmarks.opts.touchsrc=Off
+graphics.imaging.benchmarks.tests.drawimage=disabled
+graphics.imaging.benchmarks.tests.drawimagebg=disabled
+graphics.imaging.benchmarks.tests.drawimagescaleup=disabled
+graphics.imaging.benchmarks.tests.drawimagescaledown=disabled
+graphics.imaging.benchmarks.tests.drawimagescalesplit=disabled
+graphics.imaging.benchmarks.tests.drawimagetxform=disabled
+graphics.imaging.imageops.opts.op=convolve3x3zero
+graphics.imaging.imageops.tests.graphics2d.drawimageop=disabled
+graphics.imaging.imageops.tests.bufimgop.filternull=disabled
+graphics.imaging.imageops.tests.bufimgop.filtercached=disabled
+graphics.imaging.imageops.tests.rasterop.filternull=disabled
+graphics.imaging.imageops.tests.rasterop.filtercached=disabled
+graphics.misc.copytests.copyAreaVert=disabled
+graphics.misc.copytests.copyAreaHoriz=disabled
+graphics.misc.copytests.copyAreaDiag=disabled
+pixel.opts.renderto=Off
+pixel.opts.renderfrom=Off
+pixel.src.1BitBinary=disabled
+pixel.src.2BitBinary=disabled
+pixel.src.4BitBinary=disabled
+pixel.src.ByteIndexed=disabled
+pixel.src.ByteGray=disabled
+pixel.src.Short555=disabled
+pixel.src.Short565=disabled
+pixel.src.ShortGray=disabled
+pixel.src.3ByteBgr=disabled
+pixel.src.4ByteAbgr=disabled
+pixel.src.IntXrgb=disabled
+pixel.src.IntXbgr=disabled
+pixel.src.IntArgb=disabled
+pixel.bimgtests.getrgb=disabled
+pixel.bimgtests.setrgb=disabled
+pixel.rastests.getdataelem=disabled
+pixel.rastests.setdataelem=disabled
+pixel.rastests.getpixel=disabled
+pixel.rastests.setpixel=disabled
+pixel.dbtests.getelem=disabled
+pixel.dbtests.setelem=disabled
+text.opts.data.tlength=16
+text.opts.data.tscript=english
+text.opts.font.fname=serif,physical
+text.opts.font.fstyle=0
+text.opts.font.fsize=13.0
+text.opts.font.ftx=Identity
+text.opts.graphics.textaa=Off
+text.opts.graphics.tfm=Off
+text.opts.graphics.gaa=Off
+text.opts.graphics.gtx=Identity
+text.opts.advopts.gvstyle=0
+text.opts.advopts.tlruns=1
+text.opts.advopts.maptype=FONT
+text.Rendering.tests.drawString=disabled
+text.Rendering.tests.drawChars=disabled
+text.Rendering.tests.drawBytes=disabled
+text.Rendering.tests.drawGlyphVectors=disabled
+text.Rendering.tests.drawTextLayout=disabled
+text.Measuring.tests.stringWidth=disabled
+text.Measuring.tests.stringBounds=disabled
+text.Measuring.tests.charsWidth=disabled
+text.Measuring.tests.charsBounds=disabled
+text.Measuring.tests.fontcandisplay=disabled
+text.Measuring.tests.gvWidth=disabled
+text.Measuring.tests.gvLogicalBounds=disabled
+text.Measuring.tests.gvVisualBounds=disabled
+text.Measuring.tests.gvPixelBounds=disabled
+text.Measuring.tests.gvOutline=disabled
+text.Measuring.tests.gvGlyphLogicalBounds=disabled
+text.Measuring.tests.gvGlyphVisualBounds=disabled
+text.Measuring.tests.gvGlyphPixelBounds=disabled
+text.Measuring.tests.gvGlyphOutline=disabled
+text.Measuring.tests.gvGlyphTransform=disabled
+text.Measuring.tests.gvGlyphMetrics=disabled
+text.Measuring.tests.tlAdvance=disabled
+text.Measuring.tests.tlAscent=disabled
+text.Measuring.tests.tlBounds=disabled
+text.Measuring.tests.tlGetCaretInfo=disabled
+text.Measuring.tests.tlGetNextHit=disabled
+text.Measuring.tests.tlGetCaretShape=disabled
+text.Measuring.tests.tlGetLogicalHighlightShape=disabled
+text.Measuring.tests.tlHitTest=disabled
+text.Measuring.tests.tlOutline=disabled
+text.construction.tests.gvfromfontstring=disabled
+text.construction.tests.gvfromfontchars=disabled
+text.construction.tests.gvfromfontci=disabled
+text.construction.tests.gvfromfontglyphs=disabled
+text.construction.tests.gvfromfontlayout=disabled
+text.construction.tests.tlfromfont=disabled
+text.construction.tests.tlfrommap=disabled
+imageio.opts.size=250
+imageio.opts.content=photo
+imageio.input.opts.general.source.file=disabled
+imageio.input.opts.general.source.url=disabled
+imageio.input.opts.general.source.byteArray=disabled
+imageio.input.opts.imageio.useCache=Off
+imageio.input.image.toolkit.opts.format=
+imageio.input.image.toolkit.tests.createImage=disabled
+imageio.input.image.imageio.opts.format=
+imageio.input.image.imageio.tests.imageioRead=disabled
+imageio.input.image.imageio.reader.opts.seekForwardOnly=On
+imageio.input.image.imageio.reader.opts.ignoreMetadata=On
+imageio.input.image.imageio.reader.opts.installListener=Off
+imageio.input.image.imageio.reader.tests.read=disabled
+imageio.input.image.imageio.reader.tests.getImageMetadata=disabled
+imageio.input.stream.tests.construct=disabled
+imageio.input.stream.tests.read=disabled
+imageio.input.stream.tests.readByteArray=disabled
+imageio.input.stream.tests.readFullyByteArray=disabled
+imageio.input.stream.tests.readBit=disabled
+imageio.input.stream.tests.readByte=disabled
+imageio.input.stream.tests.readUnsignedByte=disabled
+imageio.input.stream.tests.readShort=disabled
+imageio.input.stream.tests.readUnsignedShort=disabled
+imageio.input.stream.tests.readInt=disabled
+imageio.input.stream.tests.readUnsignedInt=disabled
+imageio.input.stream.tests.readFloat=disabled
+imageio.input.stream.tests.readLong=disabled
+imageio.input.stream.tests.readDouble=disabled
+imageio.input.stream.tests.skipBytes=disabled
+imageio.output.opts.general.dest.file=disabled
+imageio.output.opts.general.dest.byteArray=disabled
+imageio.output.opts.imageio.useCache=Off
+imageio.output.image.imageio.opts.format=
+imageio.output.image.imageio.tests.imageioWrite=disabled
+imageio.output.image.imageio.writer.opts.installListener=Off
+imageio.output.image.imageio.writer.tests.write=disabled
+imageio.output.stream.tests.construct=disabled
+imageio.output.stream.tests.write=disabled
+imageio.output.stream.tests.writeByteArray=disabled
+imageio.output.stream.tests.writeBit=disabled
+imageio.output.stream.tests.writeByte=disabled
+imageio.output.stream.tests.writeShort=disabled
+imageio.output.stream.tests.writeInt=disabled
+imageio.output.stream.tests.writeFloat=disabled
+imageio.output.stream.tests.writeLong=disabled
+imageio.output.stream.tests.writeDouble=disabled
+cmm.opts.profiles=1001
+cmm.colorconv.data.fromRGB=disabled
+cmm.colorconv.data.toRGB=disabled
+cmm.colorconv.data.fromCIEXYZ=disabled
+cmm.colorconv.data.toCIEXYZ=disabled
+cmm.colorconv.ccop.ccopOptions.size=250
+cmm.colorconv.ccop.ccopOptions.content=photo
+cmm.colorconv.ccop.ccopOptions.srcType=INT_RGB
+cmm.colorconv.ccop.ccopOptions.dstType=INT_RGB
+cmm.colorconv.ccop.op_img=disabled
+cmm.colorconv.ccop.op_rst=disabled
+cmm.colorconv.ccop.op_draw=disabled
+cmm.colorconv.embed.embedOptions.Images=512x512
+cmm.colorconv.embed.embd_img_read=disabled
+cmm.profiles.getHeader=disabled
+cmm.profiles.getNumComponents=disabled

jb/project/tools/perf/j2dbopts_poly250.txt

@@ -0,0 +1,267 @@
+prog.verbose=disabled
+prog.printresults=enabled
+global.env.outputwidth=640
+global.env.outputheight=480
+global.env.runcount=5
+global.env.repcount=0
+global.env.testtime=2500
+global.results.workunits=units
+global.results.timeunits=sec
+global.results.ratio=unitspersec
+global.dest.offscreen=disabled
+global.dest.frame.defaultframe=enabled
+global.dest.frame.transframe=disabled
+global.dest.frame.shapedframe=disabled
+global.dest.frame.shapedtransframe=disabled
+global.dest.compatimg.compatimg=disabled
+global.dest.compatimg.opqcompatimg=disabled
+global.dest.compatimg.bmcompatimg=disabled
+global.dest.compatimg.transcompatimg=disabled
+global.dest.volimg.volimg=disabled
+global.dest.volimg.opqvolimg=disabled
+global.dest.volimg.bmvolimg=disabled
+global.dest.volimg.transvolimg=disabled
+global.dest.bufimg.IntXrgb=disabled
+global.dest.bufimg.IntArgb=disabled
+global.dest.bufimg.IntArgbPre=disabled
+global.dest.bufimg.3ByteBgr=disabled
+global.dest.bufimg.ByteIndexed=disabled
+global.dest.bufimg.ByteGray=disabled
+global.dest.bufimg.4ByteAbgr=disabled
+global.dest.bufimg.4ByteAbgrPre=disabled
+global.dest.bufimg.custom=disabled
+graphics.opts.anim=2
+graphics.opts.sizes=250
+graphics.opts.alpharule=SrcOver
+graphics.opts.transform=ident
+graphics.opts.extraalpha=Off
+graphics.opts.xormode=Off
+graphics.opts.clip=Off
+graphics.opts.renderhint=Default
+graphics.render.opts.paint=single
+graphics.render.opts.alphacolor=Off
+graphics.render.opts.antialias=Off
+graphics.render.opts.stroke=width1
+graphics.render.tests.drawLine=disabled
+graphics.render.tests.drawLineHoriz=disabled
+graphics.render.tests.drawLineVert=disabled
+graphics.render.tests.fillRect=disabled
+graphics.render.tests.drawRect=disabled
+graphics.render.tests.fillOval=disabled
+graphics.render.tests.drawOval=disabled
+graphics.render.tests.fillPoly=disabled
+graphics.render.tests.drawPoly=enabled
+graphics.render.tests.shape.fillCubic=disabled
+graphics.render.tests.shape.drawCubic=disabled
+graphics.render.tests.shape.fillEllipse2D=disabled
+graphics.render.tests.shape.drawEllipse2D=disabled
+graphics.imaging.src.offscr.opaque=disabled
+graphics.imaging.src.offscr.bitmask=disabled
+graphics.imaging.src.offscr.translucent=disabled
+graphics.imaging.src.opqcompatimg.opaque=disabled
+graphics.imaging.src.opqcompatimg.bitmask=disabled
+graphics.imaging.src.opqcompatimg.translucent=disabled
+graphics.imaging.src.bmcompatimg.opaque=disabled
+graphics.imaging.src.bmcompatimg.bitmask=disabled
+graphics.imaging.src.bmcompatimg.translucent=disabled
+graphics.imaging.src.transcompatimg.opaque=disabled
+graphics.imaging.src.transcompatimg.bitmask=disabled
+graphics.imaging.src.transcompatimg.translucent=disabled
+graphics.imaging.src.opqvolimg.opaque=disabled
+graphics.imaging.src.opqvolimg.bitmask=disabled
+graphics.imaging.src.opqvolimg.translucent=disabled
+graphics.imaging.src.bmvolimg.opaque=disabled
+graphics.imaging.src.bmvolimg.bitmask=disabled
+graphics.imaging.src.bmvolimg.translucent=disabled
+graphics.imaging.src.transvolimg.opaque=disabled
+graphics.imaging.src.transvolimg.bitmask=disabled
+graphics.imaging.src.transvolimg.translucent=disabled
+graphics.imaging.src.bufimg.IntXrgb.opaque=disabled
+graphics.imaging.src.bufimg.IntXrgb.bitmask=disabled
+graphics.imaging.src.bufimg.IntXrgb.translucent=disabled
+graphics.imaging.src.bufimg.IntArgb.opaque=disabled
+graphics.imaging.src.bufimg.IntArgb.bitmask=disabled
+graphics.imaging.src.bufimg.IntArgb.translucent=disabled
+graphics.imaging.src.bufimg.IntArgbPre.opaque=disabled
+graphics.imaging.src.bufimg.IntArgbPre.bitmask=disabled
+graphics.imaging.src.bufimg.IntArgbPre.translucent=disabled
+graphics.imaging.src.bufimg.ByteGray.opaque=disabled
+graphics.imaging.src.bufimg.ByteGray.bitmask=disabled
+graphics.imaging.src.bufimg.ByteGray.translucent=disabled
+graphics.imaging.src.bufimg.3ByteBgr.opaque=disabled
+graphics.imaging.src.bufimg.3ByteBgr.bitmask=disabled
+graphics.imaging.src.bufimg.3ByteBgr.translucent=disabled
+graphics.imaging.src.bufimg.4ByteAbgr.opaque=disabled
+graphics.imaging.src.bufimg.4ByteAbgr.bitmask=disabled
+graphics.imaging.src.bufimg.4ByteAbgr.translucent=disabled
+graphics.imaging.src.bufimg.4ByteAbgrPre.opaque=disabled
+graphics.imaging.src.bufimg.4ByteAbgrPre.bitmask=disabled
+graphics.imaging.src.bufimg.4ByteAbgrPre.translucent=disabled
+graphics.imaging.src.bufimg.ByteIndexedBm.opaque=disabled
+graphics.imaging.src.bufimg.ByteIndexedBm.bitmask=disabled
+graphics.imaging.src.bufimg.ByteIndexedBm.translucent=disabled
+graphics.imaging.src.bufimg.unmanagedIntXrgb.opaque=disabled
+graphics.imaging.src.bufimg.unmanagedIntXrgb.bitmask=disabled
+graphics.imaging.src.bufimg.unmanagedIntXrgb.translucent=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgb.opaque=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgb.bitmask=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgb.translucent=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgbPre.opaque=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgbPre.bitmask=disabled
+graphics.imaging.src.bufimg.unmanagedIntArgbPre.translucent=disabled
+graphics.imaging.src.bufimg.unmanaged3ByteBgr.opaque=disabled
+graphics.imaging.src.bufimg.unmanaged3ByteBgr.bitmask=disabled
+graphics.imaging.src.bufimg.unmanaged3ByteBgr.translucent=disabled
+graphics.imaging.benchmarks.opts.interpolation=Nearest neighbor
+graphics.imaging.benchmarks.opts.touchsrc=Off
+graphics.imaging.benchmarks.tests.drawimage=disabled
+graphics.imaging.benchmarks.tests.drawimagebg=disabled
+graphics.imaging.benchmarks.tests.drawimagescaleup=disabled
+graphics.imaging.benchmarks.tests.drawimagescaledown=disabled
+graphics.imaging.benchmarks.tests.drawimagescalesplit=disabled
+graphics.imaging.benchmarks.tests.drawimagetxform=disabled
+graphics.imaging.imageops.opts.op=convolve3x3zero
+graphics.imaging.imageops.tests.graphics2d.drawimageop=disabled
+graphics.imaging.imageops.tests.bufimgop.filternull=disabled
+graphics.imaging.imageops.tests.bufimgop.filtercached=disabled
+graphics.imaging.imageops.tests.rasterop.filternull=disabled
+graphics.imaging.imageops.tests.rasterop.filtercached=disabled
+graphics.misc.copytests.copyAreaVert=disabled
+graphics.misc.copytests.copyAreaHoriz=disabled
+graphics.misc.copytests.copyAreaDiag=disabled
+pixel.opts.renderto=Off
+pixel.opts.renderfrom=Off
+pixel.src.1BitBinary=disabled
+pixel.src.2BitBinary=disabled
+pixel.src.4BitBinary=disabled
+pixel.src.ByteIndexed=disabled
+pixel.src.ByteGray=disabled
+pixel.src.Short555=disabled
+pixel.src.Short565=disabled
+pixel.src.ShortGray=disabled
+pixel.src.3ByteBgr=disabled
+pixel.src.4ByteAbgr=disabled
+pixel.src.IntXrgb=disabled
+pixel.src.IntXbgr=disabled
+pixel.src.IntArgb=disabled
+pixel.bimgtests.getrgb=disabled
+pixel.bimgtests.setrgb=disabled
+pixel.rastests.getdataelem=disabled
+pixel.rastests.setdataelem=disabled
+pixel.rastests.getpixel=disabled
+pixel.rastests.setpixel=disabled
+pixel.dbtests.getelem=disabled
+pixel.dbtests.setelem=disabled
+text.opts.data.tlength=16
+text.opts.data.tscript=english
+text.opts.font.fname=serif,physical
+text.opts.font.fstyle=0
+text.opts.font.fsize=13.0
+text.opts.font.ftx=Identity
+text.opts.graphics.textaa=Off
+text.opts.graphics.tfm=Off
+text.opts.graphics.gaa=Off
+text.opts.graphics.gtx=Identity
+text.opts.advopts.gvstyle=0
+text.opts.advopts.tlruns=1
+text.opts.advopts.maptype=FONT
+text.Rendering.tests.drawString=disabled
+text.Rendering.tests.drawChars=disabled
+text.Rendering.tests.drawBytes=disabled
+text.Rendering.tests.drawGlyphVectors=disabled
+text.Rendering.tests.drawTextLayout=disabled
+text.Measuring.tests.stringWidth=disabled
+text.Measuring.tests.stringBounds=disabled
+text.Measuring.tests.charsWidth=disabled
+text.Measuring.tests.charsBounds=disabled
+text.Measuring.tests.fontcandisplay=disabled
+text.Measuring.tests.gvWidth=disabled
+text.Measuring.tests.gvLogicalBounds=disabled
+text.Measuring.tests.gvVisualBounds=disabled
+text.Measuring.tests.gvPixelBounds=disabled
+text.Measuring.tests.gvOutline=disabled
+text.Measuring.tests.gvGlyphLogicalBounds=disabled
+text.Measuring.tests.gvGlyphVisualBounds=disabled
+text.Measuring.tests.gvGlyphPixelBounds=disabled
+text.Measuring.tests.gvGlyphOutline=disabled
+text.Measuring.tests.gvGlyphTransform=disabled
+text.Measuring.tests.gvGlyphMetrics=disabled
+text.Measuring.tests.tlAdvance=disabled
+text.Measuring.tests.tlAscent=disabled
+text.Measuring.tests.tlBounds=disabled
+text.Measuring.tests.tlGetCaretInfo=disabled
+text.Measuring.tests.tlGetNextHit=disabled
+text.Measuring.tests.tlGetCaretShape=disabled
+text.Measuring.tests.tlGetLogicalHighlightShape=disabled
+text.Measuring.tests.tlHitTest=disabled
+text.Measuring.tests.tlOutline=disabled
+text.construction.tests.gvfromfontstring=disabled
+text.construction.tests.gvfromfontchars=disabled
+text.construction.tests.gvfromfontci=disabled
+text.construction.tests.gvfromfontglyphs=disabled
+text.construction.tests.gvfromfontlayout=disabled
+text.construction.tests.tlfromfont=disabled
+text.construction.tests.tlfrommap=disabled
+imageio.opts.size=250
+imageio.opts.content=photo
+imageio.input.opts.general.source.file=disabled
+imageio.input.opts.general.source.url=disabled
+imageio.input.opts.general.source.byteArray=disabled
+imageio.input.opts.imageio.useCache=Off
+imageio.input.image.toolkit.opts.format=
+imageio.input.image.toolkit.tests.createImage=disabled
+imageio.input.image.imageio.opts.format=
+imageio.input.image.imageio.tests.imageioRead=disabled
+imageio.input.image.imageio.reader.opts.seekForwardOnly=On
+imageio.input.image.imageio.reader.opts.ignoreMetadata=On
+imageio.input.image.imageio.reader.opts.installListener=Off
+imageio.input.image.imageio.reader.tests.read=disabled
+imageio.input.image.imageio.reader.tests.getImageMetadata=disabled
+imageio.input.stream.tests.construct=disabled
+imageio.input.stream.tests.read=disabled
+imageio.input.stream.tests.readByteArray=disabled
+imageio.input.stream.tests.readFullyByteArray=disabled
+imageio.input.stream.tests.readBit=disabled
+imageio.input.stream.tests.readByte=disabled
+imageio.input.stream.tests.readUnsignedByte=disabled
+imageio.input.stream.tests.readShort=disabled
+imageio.input.stream.tests.readUnsignedShort=disabled
+imageio.input.stream.tests.readInt=disabled
+imageio.input.stream.tests.readUnsignedInt=disabled
+imageio.input.stream.tests.readFloat=disabled
+imageio.input.stream.tests.readLong=disabled
+imageio.input.stream.tests.readDouble=disabled
+imageio.input.stream.tests.skipBytes=disabled
+imageio.output.opts.general.dest.file=disabled
+imageio.output.opts.general.dest.byteArray=disabled
+imageio.output.opts.imageio.useCache=Off
+imageio.output.image.imageio.opts.format=
+imageio.output.image.imageio.tests.imageioWrite=disabled
+imageio.output.image.imageio.writer.opts.installListener=Off
+imageio.output.image.imageio.writer.tests.write=disabled
+imageio.output.stream.tests.construct=disabled
+imageio.output.stream.tests.write=disabled
+imageio.output.stream.tests.writeByteArray=disabled
+imageio.output.stream.tests.writeBit=disabled
+imageio.output.stream.tests.writeByte=disabled
+imageio.output.stream.tests.writeShort=disabled
+imageio.output.stream.tests.writeInt=disabled
+imageio.output.stream.tests.writeFloat=disabled
+imageio.output.stream.tests.writeLong=disabled
+imageio.output.stream.tests.writeDouble=disabled
+cmm.opts.profiles=1001
+cmm.colorconv.data.fromRGB=disabled
+cmm.colorconv.data.toRGB=disabled
+cmm.colorconv.data.fromCIEXYZ=disabled
+cmm.colorconv.data.toCIEXYZ=disabled
+cmm.colorconv.ccop.ccopOptions.size=250
+cmm.colorconv.ccop.ccopOptions.content=photo
+cmm.colorconv.ccop.ccopOptions.srcType=INT_RGB
+cmm.colorconv.ccop.ccopOptions.dstType=INT_RGB
+cmm.colorconv.ccop.op_img=disabled
+cmm.colorconv.ccop.op_rst=disabled
+cmm.colorconv.ccop.op_draw=disabled
+cmm.colorconv.embed.embedOptions.Images=512x512
+cmm.colorconv.embed.embd_img_read=disabled
+cmm.profiles.getHeader=disabled
+cmm.profiles.getNumComponents=disabled

jb/project/tools/perf/run_inc.sh

@@ -0,0 +1,137 @@
+export LC_ALL=C
+ST=1 # sleep between iterations
+
+# number of iterations (jvm spawned)
+N=5
+# number of repeats (within jvm)
+R=3
+
+type datamash 2>&1 > /dev/null ; ec=$?
+if [ $ec -ne 0 ] ; then
+  echo "Missing datamash utility"
+  exit 1
+fi
+
+DATAMASH_CMD="datamash --format=%.2f -H count x min x q1 x median x q3 x max x mad x"
+
+J2D_OPTS=""
+OS=""
+case "$OSTYPE" in
+  linux*)  echo "Linux" 
+      ;;	  
+  darwin*)  echo "OSX" 
+      ;; 
+  *)        echo "unknown: $OSTYPE" 
+      exit 1
+      ;;
+esac
+
+read -r -d '' RENDER_OPS_DOC << EOM
+rendering_options:
+  -opengl # OpenGL pipeline (windows, linux, macOS)
+  -metal  # Metal pipeline (macOS)
+  -vulkan # Vulkan pipeline (WLToolkit)
+  -accelsd # Vulkan full acceleration (WLToolkit, Vulkan)
+  -devnum num # Provide Vulkan device for rendering
+  -tk tk_name # AWT toolkit (linux: WLToolkit|XToolkit)
+  -scale # UI scale
+  -N num # Number of iterations (JVM runs)
+  -R num # Number of repeats in the test
+EOM
+
+while [ $# -ge 1 ] ; do
+  case "$1" in
+    -opengl) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.opengl=true"
+      shift
+        ;;
+    -metal) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.metal=true"
+      shift
+        ;;
+    -vulkan) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.vulkan=true"    
+      shift  
+        ;;
+    -accelsd) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.vulkan.accelsd=true"
+      shift
+        ;;
+    -devnum) shift
+      if [ $# -ge 1 ] ; then
+        J2D_OPTS=$J2D_OPTS" -Dsun.java2d.vulkan.deviceNumber="$1
+         shift
+      else
+         echo "Invalid parameters for -devnum option. Use: -devnum num"
+         exit 1
+      fi
+      ;;
+    -tk) shift
+      if [ $# -ge 1 ] ; then
+        J2D_OPTS=$J2D_OPTS" -Dawt.toolkit.name="$1
+         shift
+      else
+         echo "Invalid parameters for -tk option. Use: -tk tkname"
+         exit 1
+      fi
+      ;;
+    -N) shift
+      if [ $# -ge 1 ] ; then
+         N=$1  
+         shift
+      else
+         echo "Invalid parameters for -N option. Use: -N <number>"
+         exit 1
+      fi
+      ;;
+    -R) shift
+      if [ $# -ge 1 ] ; then
+         R=$1  
+         shift
+      else
+         echo "Invalid parameters for -R option. Use: -R <number>"
+         exit 1
+      fi
+      ;;
+    -scale) shift
+      if [ $# -ge 1 ] ; then
+        J2D_OPTS=$J2D_OPTS" -Dsun.java2d.uiScale="$1
+         shift
+      else
+         echo "Invalid parameters for -scale option. Use: -scale scale"
+         exit 1
+      fi
+      ;;
+    -dSync) shift   
+      if [ $# -ge 1 ] ; then
+        J2D_OPTS=$J2D_OPTS" -Dsun.java2d.metal.displaySync="$1
+         shift
+      else
+         echo "Invalid parameters for -dSync option. Use: -dSync [true|false]"
+         exit 1
+      fi
+        ;;
+    -jdk) shift
+      if [ $# -ge 1 ] ; then
+         JAVA=$1/bin/java
+         shift
+      else
+         echo "Invalid parameters for -jdk option"
+         exit 1
+      fi
+        ;;
+      *) break
+        ;;
+  esac
+done    
+if [ -z "$JAVA" ] ; then
+    BUILD_DIR=`find $BASE_DIR/../../../../build -name '*-release' -type d | head -n 1`
+    JAVA=`find $BUILD_DIR/images/jdk -name java -type f | head -n 1`
+fi
+
+JAVA_HOME=`dirname $JAVA`/../
+"$JAVA" -version
+
+LANG=C
+
+WS_ROOT=$BASE_DIR/../../../..
+
+echo "N: $N"
+echo "R: $R"  
+echo "J2D_OPTS: $J2D_OPTS"

jb/project/tools/perf/run_j2b.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+BASE_DIR=$(dirname "$0")
+source $BASE_DIR/run_inc.sh
+
+J2DBENCH_DIR=$WS_ROOT/src/demo/share/java2d/J2DBench
+
+if [ -z "$J2DBENCH" ]; then
+  if [ ! -f "$J2DBENCH_DIR/dist/J2DBench.jar" ]; then
+    PATH=$JAVA_HOME/bin:$PATH make -C $J2DBENCH_DIR
+  fi
+  if [ ! -f "$J2DBENCH_DIR/dist/J2DBench.jar" ]; then
+    echo "Cannot build J2DBench. You may use J2DBench env variable instead pointing to the J2DBench.jar."
+    exit 1
+  fi
+  J2DBENCH=$J2DBENCH_DIR/dist/J2DBench.jar
+fi
+
+if [ $# -ne 1 ] ; then
+  echo "Usage: run_j2b.sh [rendering_options] bench_name"
+  echo 
+  echo "bench_name: poly250 poly250-rand_col poly250-AA-rand_col"
+  echo ""            
+  echo "$RENDER_OPS_DOC"
+  exit 2
+fi 
+
+if [ ! -f "$BASE_DIR/j2dbopts_$1.txt" ]; then
+  echo "Unknown test: $1"
+  exit 1
+fi
+ 
+
+
+OPTS="j2dbopts_$1.txt"
+#OPTS=j2dbopts_poly250.txt
+#OPTS=j2dbopts_poly250-rand_col.txt
+#OPTS=j2dbopts_poly250-AA-rand_col.txt
+
+echo "OPTS: $OPTS"
+
+for i in `seq $N`; do 
+  if [ $i -eq 1 ]; then
+    echo x
+  fi
+  echo `$JAVA $J2D_OPTS -jar $J2DBENCH \
+  -batch -loadopts $BASE_DIR/$OPTS -saveres pl.res \
+  -title pl -desc pl | awk '/averaged/{print $3}' | head -n1`
+
+  if [ $i -ne $N ]; then
+    sleep $ST
+  fi
+done | $DATAMASH_CMD | expand -t12

jb/project/tools/perf/run_rp.sh

@@ -0,0 +1,88 @@
+#!/bin/bash
+
+#set -euo pipefail
+#set -x
+
+BASE_DIR=$(dirname "$0")
+source $BASE_DIR/run_inc.sh
+
+RENDERPERFTEST_DIR=$WS_ROOT/test/jdk/performance/client/RenderPerfTest
+RENDERPERFTEST=""
+if [ -z "$RENDERPERFTEST" ]; then
+  if [ ! -f "$RENDERPERFTEST_DIR/dist/RenderPerfTest.jar" ]; then
+    PATH=$JAVA_HOME/bin:$PATH make -C $RENDERPERFTEST_DIR
+  fi
+  if [ ! -f "$RENDERPERFTEST_DIR/dist/RenderPerfTest.jar" ]; then
+    echo "Cannot build RenderPerfTest. You may use RENDERPERFTEST env variable instead pointing to the RenderPerfTest.jar."
+    exit 1
+  fi
+  RENDERPERFTEST=$RENDERPERFTEST_DIR/dist/RenderPerfTest.jar
+fi
+
+TRACE=false
+
+# removes leading hyphen
+mode_param="${1/-}"
+MODE="Robot"
+while [ $# -ge 1 ] ; do
+  case "$1" in
+    -onscreen) MODE="Robot"
+      shift
+        ;;
+    -volatile) MODE="Volatile"
+      shift
+        ;;
+    -buffer) MODE="Buffer"
+      shift
+        ;;
+      *) break
+        ;;
+  esac
+done    
+
+if [[ ($# -eq 1 && "$1" == "-help") || ($# -eq 0)  ]] ; then
+  echo "Usage: run_rp.sh [rp_rendering_mode] [rendering_options] bench_name"
+  echo 
+  echo "bench_name: ArgbSurfaceBlitImage ArgbSwBlitImage BgrSurfaceBlitImage BgrSwBlitImage"
+  echo "            Image ImageAA Image_XOR VolImage VolImageAA"
+  echo "            ClipFlatBox ClipFlatBoxAA ClipFlatOval ClipFlatOvalAA"
+  echo "            FlatBox FlatBoxAA FlatOval FlatOvalAA FlatOval_XOR FlatQuad FlatQuadAA"
+  echo "            RotatedBox RotatedBoxAA RotatedBox_XOR RotatedOval RotatedOvalAA" 
+  echo "            WiredBox WiredBoxAA WiredBubbles WiredBubblesAA WiredQuad WiredQuadAA"
+  echo "            Lines LinesAA Lines_XOR"
+  echo "            TextGray TextLCD TextLCD_XOR TextNoAA TextNoAA_XOR"
+  echo "            LargeTextGray LargeTextLCD LargeTextNoAA WhiteTextGray WhiteTextLCD WhiteTextNoAA"
+  echo "            LinGrad3RotatedOval LinGrad3RotatedOvalAA LinGradRotatedOval LinGradRotatedOvalAA"
+  echo "            RadGrad3RotatedOval RadGrad3RotatedOvalAA" 
+  echo ""            
+  echo "rp_rendering_mode: "
+  echo "            -onscreen : rendering to the window and check it using Robot" 
+  echo "            -volatile : rendering to volatile image (default)" 
+  echo "            -buffer   : rendering to buffered image" 
+  echo "$RENDER_OPS_DOC"
+  exit 2
+fi
+
+OPTS=""
+# use time + repeat
+OPTS="$OPTS -t -n=$N  -e$MODE $1"
+
+echo "OPTS: $OPTS"
+
+echo "Unit: Milliseconds (not FPS), lower is better"
+for i in `seq $R` ; do 
+  if [ $i -eq 1 ]; then
+    echo x
+  fi
+
+#  echo "[debug] " + "test run"
+#  $JAVA $J2D_OPTS -DTRACE=$TRACE \
+#  -jar $RENDERPERFTEST $OPTS 2>&1 | awk '/'$1'/{print $3 }' | tee test_run.log
+
+  $JAVA $J2D_OPTS -DTRACE=$TRACE \
+  -jar $RENDERPERFTEST $OPTS -v 2>&1 | tee render_$1_${mode_param}_$i.log | grep -v "^#" | tail -n 1 | \
+  awk '{print $3 }'
+  if [ $i -ne $N ]; then
+    sleep $ST
+  fi
+done | $DATAMASH_CMD | expand -t12 | tee render_$1_${mode_param}.log

jb/project/tools/perf/run_sm.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+BASE_DIR=$(dirname "$0")
+source $BASE_DIR/run_inc.sh
+
+SWINGMARK_DIR=$WS_ROOT/test/jdk/performance/client/SwingMark
+
+if [ -z "$SWINGMARK" ]; then
+  if [ ! -f "$SWINGMARK_DIR/dist/SwingMark.jar" ]; then
+    PATH=$JAVA_HOME/bin:$PATH make -C $SWINGMARK_DIR
+  fi
+  if [ ! -f "$SWINGMARK_DIR/dist/SwingMark.jar" ]; then
+    echo "Cannot build SwingMark. You may use SWINGMARK env variable instead pointing to the SwingMark.jar."
+    exit 1
+  fi
+  SWINGMARK=$SWINGMARK_DIR/dist/SwingMark.jar
+fi
+
+if [ $# -eq 1 -a "$1" == "--help" ] ; then
+  shift	
+  echo "Usage: run_sm [rendering_options]"
+  echo ""            
+  echo "$RENDER_OPS_DOC"
+  exit 0
+fi 
+
+for i in `seq $N` ; do 
+  if [ $i -eq 1 ]; then
+    echo x
+  fi
+ 
+  # SwingMark gives 1 global 'Score: <value>'
+  echo `$JAVA $J2D_OPTS -jar $BASE_DIR/../../../../test/jdk/performance/client/SwingMark/dist/SwingMark.jar \
+  -r $R -q -lf javax.swing.plaf.metal.MetalLookAndFeel | awk '/Score/{print $2}'`
+
+  if [ $i -ne $N ]; then
+    sleep $ST
+  fi
+done | $DATAMASH_CMD | expand -t12

jb/project/tools/windows/scripts/mkimages_aarch64.sh

@@ -49,6 +49,7 @@ function do_configure {
     --with-nvdacontrollerclient=$NVDA_PATH \
     --disable-ccache \
     --enable-cds=yes \
+    $DISABLE_WARNINGS_AS_ERRORS \
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
     || do_exit $?
@@ -103,13 +104,13 @@ esac
 if [ -z "${INC_BUILD:-}" ]; then
   do_configure || do_exit $?
   if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME clean images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+    make LOG=info CONF=$RELEASE_NAME clean images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
   else
     make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
   fi
 else
   if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+    make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
   else
     make LOG=info CONF=$RELEASE_NAME images || do_exit $?
   fi
@@ -126,12 +127,13 @@ if [ $? -eq 0 ]; then
 fi
 
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
-  update_jsdk_mods "$BUILD_JDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
-  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not unchanged
-
+  if [ "$bundle_type" == "jcef" ]; then
+    git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
+    update_jsdk_mods "$BUILD_JDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+    cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not unchanged
+    cat $JCEF_PATH/jcef.version >> $JSDK/release
+  fi
   jbr_name_postfix="_${bundle_type}"
-  cat $JCEF_PATH/jcef.version >> $JSDK/release
 else
   jbr_name_postfix=""
 fi
@@ -143,7 +145,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
 
 # create sdk image bundle
 modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g) || do_exit $?
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
   modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?

jb/project/tools/windows/scripts/mkimages_x64.sh

@@ -40,6 +40,7 @@ function do_configure {
     --with-nvdacontrollerclient=$NVDA_PATH \
     --disable-ccache \
     --enable-cds=yes \
+    $DISABLE_WARNINGS_AS_ERRORS \
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
     || do_exit $?
@@ -53,7 +54,7 @@ function create_image_bundle {
 
   fastdebug_infix=''
   __cds_opt=''
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then __cds_opt="--generate-cds-archive"; fi
+  __cds_opt="--generate-cds-archive"
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
@@ -96,13 +97,13 @@ esac
 if [ -z "${INC_BUILD:-}" ]; then
   do_configure || do_exit $?
   if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME clean images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+    make LOG=info CONF=$RELEASE_NAME clean images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
   else
     make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
   fi
 else
   if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+    make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
   else
     make LOG=info CONF=$RELEASE_NAME images || do_exit $?
   fi
@@ -119,12 +120,13 @@ if [ $? -eq 0 ]; then
 fi
 
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
-  cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
-
+  if [ "$bundle_type" == "jcef" ]; then
+    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+    update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+    cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
+    cat $JCEF_PATH/jcef.version >> $JSDK/release
+  fi
   jbr_name_postfix="_${bundle_type}"
-  cat $JCEF_PATH/jcef.version >> $JSDK/release
 else
   jbr_name_postfix=""
 fi
@@ -136,7 +138,7 @@ create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" ||
 
 # create sdk image bundle
 modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g)
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
   modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?

jb/project/tools/windows/scripts/mkimages_x86.sh

@@ -36,6 +36,7 @@ function do_configure {
     --with-nvdacontrollerclient=$NVDA_PATH \
     --disable-ccache \
     --enable-cds=yes \
+    $DISABLE_WARNINGS_AS_ERRORS \
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
     || do_exit $?
@@ -49,7 +50,7 @@ function create_image_bundle {
 
   fastdebug_infix=''
   __cds_opt=''
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then __cds_opt="--generate-cds-archive"; fi
+  __cds_opt="--generate-cds-archive"
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
@@ -91,13 +92,13 @@ esac
 if [ -z "${INC_BUILD:-}" ]; then
   do_configure || do_exit $?
   if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME clean images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+    make LOG=info CONF=$RELEASE_NAME clean images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
   else
     make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
   fi
 else
   if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+    make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
   else
     make LOG=info CONF=$RELEASE_NAME images || do_exit $?
   fi
@@ -109,9 +110,11 @@ JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
-  cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
+  if [ "$bundle_type" == "jcef" ]; then
+    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+    update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+    cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
+  fi
 
   jbr_name_postfix="_${bundle_type}"
 else

jb/project/tools/windows/scripts/pack_aarch64.sh

@@ -29,8 +29,11 @@ function pack_jbr {
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
 
   echo Creating $JBR.tar.gz ...
-
+  chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
   /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
+
+  echo Creating $JBR.zip ...
+  /usr/bin/zip -r $JBR.zip $__root_dir || do_exit $?
 }
 
 [ "$bundle_type" == "nomod" ] && bundle_type=""
@@ -51,7 +54,6 @@ pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
 
 if [ $do_maketest -eq 1 ]; then
   JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-aarch64-b$build_number
-  cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test" || do_exit $?
   echo Creating $JBRSDK_TEST.tar.gz ...
   /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
 fi

jb/project/tools/windows/scripts/pack_x64.sh

@@ -31,6 +31,9 @@ function pack_jbr {
   echo Creating $JBR.tar.gz ...
   chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
   /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
+
+  echo Creating $JBR.zip ...
+  /usr/bin/zip -r $JBR.zip $__root_dir || do_exit $?
 }
 
 [ "$bundle_type" == "nomod" ] && bundle_type=""
@@ -51,7 +54,6 @@ pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
 
 if [ $do_maketest -eq 1 ]; then
   JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-x64-b$build_number
-  cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test" || do_exit $?
   echo Creating $JBRSDK_TEST.tar.gz ...
   /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
 fi

jb/project/tools/windows/scripts/pack_x86.sh

@@ -27,6 +27,9 @@ function pack_jbr {
   echo Creating $JBR.tar.gz ...
   chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
   /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
+
+  echo Creating $JBR.zip ...
+  /usr/bin/zip -r $JBR.zip $__root_dir || do_exit $?
 }
 
 [ "$bundle_type" == "nomod" ] && bundle_type=""
@@ -47,7 +50,6 @@ pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
 
 if [ $do_maketest -eq 1 ]; then
   JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-x86-b$build_number
-  cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test" || do_exit $?
   echo Creating $JBRSDK_TEST.tar.gz ...
   /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $BASE_DIR --exclude='test/jdk/demos' test || do_exit $?
 fi

make/Bundles.gmk

@@ -242,7 +242,10 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
       )
 
   JDK_SYMBOLS_BUNDLE_FILES := \
-      $(call FindFiles, $(SYMBOLS_IMAGE_DIR))
+      $(filter-out \
+          %.stripped.pdb, \
+          $(call FindFiles, $(SYMBOLS_IMAGE_DIR)) \
+      )
 
   TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \
       $(ALL_JDK_DEMOS_FILES))

make/CompileJavaModules.gmk

@@ -100,6 +100,7 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
     BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
     HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
     CREATE_API_DIGEST := true, \
+    PROCESS_JBR_API := true, \
     CLEAN := $(CLEAN), \
     CLEAN_FILES := $(CLEAN_FILES), \
     COPY := $(COPY), \

make/CompileToolsJdk.gmk

@@ -84,7 +84,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
     TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
     SRC := $(TOPDIR)/make/jdk/src/classes, \
     INCLUDES := build/tools/depend, \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/depend, \
+    BIN := $(BUILDTOOLS_OUTPUTDIR)/plugins, \
     DISABLED_WARNINGS := options, \
     JAVAC_FLAGS := \
         --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
@@ -97,13 +97,21 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
         --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim, \
 ))
 
-DEPEND_SERVICE_PROVIDER := $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services/com.sun.source.util.Plugin
+$(eval $(call SetupJavaCompilation, COMPILE_JBR_API_PLUGIN, \
+    TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
+    SRC := $(TOPDIR)/make/jdk/src/classes, \
+    INCLUDES := build/tools/jbrapi, \
+    BIN := $(BUILDTOOLS_OUTPUTDIR)/plugins, \
+))
 
-$(DEPEND_SERVICE_PROVIDER):
-	$(call MakeDir, $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services)
+PLUGINS_SERVICE_PROVIDER := $(BUILDTOOLS_OUTPUTDIR)/plugins/META-INF/services/com.sun.source.util.Plugin
+
+$(PLUGINS_SERVICE_PROVIDER):
+	$(call MakeDir, $(BUILDTOOLS_OUTPUTDIR)/plugins/META-INF/services)
 	$(ECHO) build.tools.depend.Depend > $@
+	$(ECHO) build.tools.jbrapi.JBRApiPlugin >> $@
 
-TARGETS += $(COMPILE_DEPEND) $(DEPEND_SERVICE_PROVIDER)
+TARGETS += $(COMPILE_DEPEND) $(COMPILE_JBR_API_PLUGIN) $(PLUGINS_SERVICE_PROVIDER)
 
 ################################################################################
 

make/GenerateLinkOptData.gmk

@@ -68,7 +68,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
 	    -Duser.language=en -Duser.country=US \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    build.tools.classlist.HelloClasslist $(LOG_DEBUG)
+	    build.tools.classlist.HelloClasslist jdk/src/classes/build/tools/classlist/clear.classlist $(LOG_DEBUG)
 	$(GREP) -v HelloClasslist $@.raw > $@.interim
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -Xshare:dump \
 	    -XX:SharedClassListFile=$@.interim -XX:SharedArchiveFile=$@.jsa \
@@ -79,7 +79,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	    -Duser.language=en -Duser.country=US \
 	    --module-path $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    build.tools.classlist.HelloClasslist \
+	    build.tools.classlist.HelloClasslist jdk/src/classes/build/tools/classlist/clear.classlist \
 	    2> $(LINK_OPT_DIR)/stderr > $(JLI_TRACE_FILE) \
 	    || ( \
 	        exitcode=$$? ; \

make/JBRApi.gmk

@@ -25,69 +25,49 @@
 
 include $(SPEC)
 include MakeBase.gmk
-include JavaCompilation.gmk
+include Utils.gmk
 
-JBR_API_ROOT_DIR   := $(TOPDIR)/src/jetbrains.api
-JBR_API_TOOLS_DIR  := $(JBR_API_ROOT_DIR)/tools
-JBR_API_SRC_DIR    := $(JBR_API_ROOT_DIR)/src
-JBR_API_OUTPUT_DIR := $(OUTPUTDIR)/jbr-api
-JBR_API_GENSRC_DIR := $(JBR_API_OUTPUT_DIR)/gensrc
-JBR_API_BIN_DIR    := $(JBR_API_OUTPUT_DIR)/bin
-JBR_API_VERSION_PROPERTIES := $(JBR_API_ROOT_DIR)/version.properties
-JBR_API_VERSION_GENSRC     := $(JBR_API_OUTPUT_DIR)/jbr-api.version
-JBR_API_GENSRC_BATCH       := $(JBR_API_VERSION_GENSRC)
+JBR_API_ORIGIN := https://github.com/JetBrains/JetBrainsRuntimeApi.git
+JBR_API_DIR    := $(TOPDIR)/jbr-api
 
-JBR_API_SRC_FILES := $(call FindFiles, $(JBR_API_SRC_DIR))
-JBR_API_GENSRC_FILES := $(foreach f, $(call FindFiles, $(JBR_API_SRC_DIR)), \
-    $(JBR_API_GENSRC_DIR)/$(call RelativePath, $f, $(JBR_API_SRC_DIR)))
-
-ifeq ($(JBR_API_JBR_VERSION),)
-  JBR_API_JBR_VERSION := DEVELOPMENT
-  JBR_API_FAIL_ON_HASH_MISMATCH := false
+ARTIFACT_NAME := jbr-api-SNAPSHOT
+ifeq ($(call isBuildOsEnv, windows.cygwin windows.msys2), true)
+    HOME    := $$USERPROFILE
+    M2_REPO := $(shell $(PATHTOOL) $(HOME))/.m2/repository
+else ifeq ($(call isBuildOsEnv, windows.wsl1 windows.wsl2), true)
+    HOME    := `cmd.exe /C "echo %USERPROFILE%" 2> /dev/null`
+    M2_REPO := $(shell $(PATHTOOL) $(HOME))/.m2/repository
 else
-  .PHONY: $(JBR_API_VERSION_PROPERTIES)
-  JBR_API_FAIL_ON_HASH_MISMATCH := true
+    M2_REPO := $(HOME)/.m2/repository
 endif
+M2_ARTIFACT := $(M2_REPO)/com/jetbrains/jbr-api/SNAPSHOT
+M2_POM_CONTENT := \
+    <?xml version="1.0" encoding="UTF-8"?> \
+    <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" \
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> \
+      <modelVersion>4.0.0</modelVersion> \
+      <groupId>com.jetbrains</groupId> \
+      <artifactId>jbr-api</artifactId> \
+      <version>SNAPSHOT</version> \
+    </project> \
 
-ARCHIVE_BUILD_JBR_API_BIN := $(JBR_API_BIN_DIR)
-$(eval $(call SetupJavaCompilation, BUILD_JBR_API, \
-    SMALL_JAVA := true, \
-    COMPILER := bootjdk, \
-    SRC := $(JBR_API_GENSRC_DIR), \
-    EXTRA_FILES := $(JBR_API_GENSRC_FILES), \
-    BIN := $(JBR_API_BIN_DIR), \
-    JAR := $(JBR_API_OUTPUT_DIR)/jbr-api.jar, \
-))
+jbr-api:
+	if [ -d "$(JBR_API_DIR)" ]; then \
+	    $(GIT) -C "$(JBR_API_DIR)" fetch; \
+	    $(GIT) -C "$(JBR_API_DIR)" merge-base --is-ancestor origin/main HEAD || \
+	        $(ECHO) "!!! Current JBR API revision is outdated, update the branch in $(JBR_API_DIR) !!!"; \
+	else \
+	    $(ECHO) "JBR API directory does not exist. Initializing..."; \
+	    $(GIT) clone "$(JBR_API_ORIGIN)" "$(JBR_API_DIR)" --config core.autocrlf=false; \
+	fi
+	$(BASH) "$(JBR_API_DIR)/tools/build.sh" dev "$(BOOT_JDK)"
+	if [ -d "$(M2_REPO)" ]; then \
+	    $(MKDIR) -p $(M2_ARTIFACT); \
+	    $(ECHO) "$(M2_POM_CONTENT)" > $(M2_ARTIFACT)/$(ARTIFACT_NAME).pom; \
+	    $(CP) "$(JBR_API_DIR)/out/$(ARTIFACT_NAME).jar" "$(M2_ARTIFACT)"; \
+	    $(ECHO) "Installed into local Maven repository as com.jetbrains:jbr-api:SNAPSHOT"; \
+	else \
+	    $(ECHO) "No Maven repository found at $(M2_REPO) - skipping local installation"; \
+	fi
 
-$(eval $(call SetupJarArchive, BUILD_JBR_API_SOURCES_JAR, \
-    DEPENDENCIES := $(JBR_API_GENSRC_FILES), \
-    SRCS := $(JBR_API_GENSRC_DIR), \
-    JAR := $(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar, \
-    SUFFIXES := .java, \
-    BIN := $(JBR_API_BIN_DIR), \
-))
-
-# Grouped targets may not be supported, so hack dependencies: sources -> version file -> generated sources
-$(JBR_API_VERSION_GENSRC): $(JBR_API_SRC_FILES) $(JBR_API_VERSION_PROPERTIES) $(JBR_API_TOOLS_DIR)/Gensrc.java
-	$(ECHO) Generating sources for JBR API
-	$(JAVA_CMD) $(JAVA_FLAGS_SMALL) "$(JBR_API_TOOLS_DIR)/Gensrc.java" \
-	    "$(TOPDIR)/src" "$(JBR_API_OUTPUT_DIR)" "$(JBR_API_JBR_VERSION)"
-$(JBR_API_GENSRC_FILES): $(JBR_API_VERSION_GENSRC)
-	$(TOUCH) $@
-
-jbr-api-check-version: $(JBR_API_GENSRC_FILES) $(JBR_API_VERSION_PROPERTIES)
-	$(JAVA_CMD) $(JAVA_FLAGS_SMALL) "$(JBR_API_TOOLS_DIR)/CheckVersion.java" \
-	    "$(JBR_API_ROOT_DIR)" "$(JBR_API_GENSRC_DIR)" "$(JBR_API_FAIL_ON_HASH_MISMATCH)"
-
-jbr-api: $(BUILD_JBR_API) $(BUILD_JBR_API_SOURCES_JAR) jbr-api-check-version
-
-.PHONY: jbr-api jbr-api-check-version
-
-ifneq ($(JBR_API_CONF_FILE),)
-  $(JBR_API_CONF_FILE): $(JBR_API_GENSRC_FILES)
-	$(ECHO) "VERSION=`$(CAT) $(JBR_API_VERSION_GENSRC)`" > $(JBR_API_CONF_FILE)
-	$(ECHO) "JAR=$(JBR_API_OUTPUT_DIR)/jbr-api.jar" >> $(JBR_API_CONF_FILE)
-	$(ECHO) "SOURCES_JAR=$(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar" >> $(JBR_API_CONF_FILE)
-  jbr-api: $(JBR_API_CONF_FILE)
-  .PHONY: $(JBR_API_CONF_FILE)
-endif
+.PHONY: jbr-api

make/RunTests.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -602,7 +602,7 @@ define SetupRunMicroTestBody
     $1_JMH_JVM_ARGS += $$(MICRO_VM_OPTIONS) $$(MICRO_JAVA_OPTIONS)
   endif
 
-  $1_MICRO_VM_OPTIONS := -jvmArgs $(call ShellQuote,$$($1_JMH_JVM_ARGS))
+  $1_MICRO_VM_OPTIONS := -jvmArgsPrepend $(call ShellQuote,$$($1_JMH_JVM_ARGS))
 
   ifneq ($$(MICRO_ITER), )
     $1_MICRO_ITER := -i $$(MICRO_ITER)
@@ -743,8 +743,6 @@ define SetupRunJtregTestBody
   # we may end up with a lot of JVM's
   $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $(AWK) 'BEGIN { print 25 / $$($1_JTREG_JOBS); }')
 
-  JTREG_TIMEOUT_FACTOR ?= 4
-
   JTREG_VERBOSE ?= fail,error,summary
   JTREG_RETAIN ?= fail,error
   JTREG_TEST_THREAD_FACTORY ?=
@@ -801,8 +799,10 @@ define SetupRunJtregTestBody
   $1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR
   # If running on Windows, propagate the _NT_SYMBOL_PATH to enable
   # symbol lookup in hserr files
+  # The minidumps are disabled by default on client Windows, so enable them
   ifeq ($$(call isTargetOs, windows), true)
     $1_JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH
+    $1_JTREG_BASIC_OPTIONS += -vmoption:-XX:+CreateCoredumpOnCrash
   else ifeq ($$(call isTargetOs, linux), true)
       $1_JTREG_BASIC_OPTIONS += -e:_JVM_DWARF_PATH=$$(SYMBOLS_IMAGE_DIR)
   endif
@@ -830,6 +830,28 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
   endif
 
+  JTREG_ALL_OPTIONS := $$(JTREG_JAVA_OPTIONS) $$(JTREG_VM_OPTIONS)
+
+  JTREG_AUTO_PROBLEM_LISTS :=
+  JTREG_AUTO_TIMEOUT_FACTOR := 4
+
+  ifneq ($$(findstring -Xcomp, $$(JTREG_ALL_OPTIONS)), )
+    JTREG_AUTO_PROBLEM_LISTS += ProblemList-Xcomp.txt
+    JTREG_AUTO_TIMEOUT_FACTOR := 10
+  endif
+
+  ifneq ($$(findstring -XX:+UseZGC, $$(JTREG_ALL_OPTIONS)), )
+    ifneq ($$(findstring -XX:-ZGenerational, $$(JTREG_ALL_OPTIONS)), )
+      JTREG_AUTO_PROBLEM_LISTS += ProblemList-zgc.txt
+    else
+      JTREG_AUTO_PROBLEM_LISTS += ProblemList-generational-zgc.txt
+    endif
+  endif
+
+  ifneq ($$(findstring -XX:+UseShenandoahGC, $$(JTREG_ALL_OPTIONS)), )
+    JTREG_AUTO_PROBLEM_LISTS += ProblemList-shenandoah.txt
+  endif
+
   ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
     # Accept both absolute paths as well as relative to the current test root.
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
@@ -861,6 +883,18 @@ define SetupRunJtregTestBody
 
   $$(eval $$(call SetupRunJtregTestCustom, $1))
 
+  # SetupRunJtregTestCustom might also adjust JTREG_AUTO_ variables
+  # so set the final results after setting values from custom setup
+  ifneq ($$(JTREG_AUTO_PROBLEM_LISTS), )
+    # Accept both absolute paths as well as relative to the current test root.
+    $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
+        $$(JTREG_AUTO_PROBLEM_LISTS) \
+        $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_AUTO_PROBLEM_LISTS)) \
+    ))
+  endif
+
+  JTREG_TIMEOUT_FACTOR ?= $$(JTREG_AUTO_TIMEOUT_FACTOR)
+
   clean-outputdirs-$1:
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
 	$$(RM) -r $$($1_TEST_RESULTS_DIR)

make/autoconf/configure.ac

@@ -313,9 +313,11 @@ AC_OUTPUT
 
 # After AC_OUTPUT, we need to do final work
 CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK
-BASIC_POST_CONFIG_OUTPUT
 
 # Finally output some useful information to the user
 HELP_PRINT_SUMMARY_AND_WARNINGS
 CUSTOM_SUMMARY_AND_WARNINGS_HOOK
 HELP_REPEAT_WARNINGS
+
+# All output is done. Do the post-config output management.
+BASIC_POST_CONFIG_OUTPUT

make/autoconf/flags-cflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 # Setup flags for C/C++ compiler
 #
 
-###############################################################################
+################################################################################
 #
 # How to compile shared libraries.
 #
@@ -37,7 +37,10 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     # Default works for linux, might work on other platforms as well.
     SHARED_LIBRARY_FLAGS='-shared'
-    SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
+    # --disable-new-dtags forces use of RPATH instead of RUNPATH for rpaths.
+    # This protects internal library dependencies within the JDK from being
+    # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
+    SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1 -Wl,--disable-new-dtags'
     SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
     SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
     SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
@@ -63,6 +66,9 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
       # Default works for linux, might work on other platforms as well.
       SHARED_LIBRARY_FLAGS='-shared'
       SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
+      if test "x$OPENJDK_TARGET_OS" = xlinux; then
+        SET_EXECUTABLE_ORIGIN="$SET_EXECUTABLE_ORIGIN -Wl,--disable-new-dtags"
+      fi
       SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
       SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
 
@@ -117,6 +123,16 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
       FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${DEBUG_PREFIX_CFLAGS}],
         IF_FALSE: [
             DEBUG_PREFIX_CFLAGS=
+        ],
+        IF_TRUE: [
+            # Add debug prefix map gcc system include paths, as they cause
+            # non-deterministic debug paths depending on gcc path location.
+            DEBUG_PREFIX_MAP_GCC_INCLUDE_PATHS
+
+            # Add debug prefix map for OUTPUTDIR to handle the scenario when
+            # it is not located within WORKSPACE_ROOT
+            outputdir_slash="${OUTPUTDIR%/}/"
+            DEBUG_PREFIX_CFLAGS="$DEBUG_PREFIX_CFLAGS -fdebug-prefix-map=${outputdir_slash}="
         ]
       )
     fi
@@ -158,6 +174,55 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
   AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
 ])
 
+# gcc will embed the full system include paths in the debug info
+# resulting in non-deterministic debug symbol files and thus
+# non-reproducible native libraries if gcc includes are located
+# in different paths.
+# Add -fdebug-prefix-map'ings for root and gcc include paths,
+# pointing to a common set of folders so that the binaries are deterministic:
+#  root include : /usr/include
+#  gcc include  : /usr/local/gcc_include
+#  g++ include  : /usr/local/gxx_include
+AC_DEFUN([DEBUG_PREFIX_MAP_GCC_INCLUDE_PATHS],
+[
+    # Determine gcc system include paths.
+    # Assume default roots to start with:
+    GCC_ROOT_INCLUDE="/usr/include"
+
+    # Determine is sysroot or devkit specified?
+    if test "x$SYSROOT" != "x"; then
+      GCC_ROOT_INCLUDE="${SYSROOT%/}/usr/include"
+    fi
+
+    # Add root include mapping => /usr/include
+    GCC_INCLUDE_DEBUG_MAP_FLAGS="-fdebug-prefix-map=${GCC_ROOT_INCLUDE}/=/usr/include/"
+
+    # Add gcc system include mapping => /usr/local/gcc_include
+    #   Find location of stddef.h using build C compiler
+    GCC_SYSTEM_INCLUDE=`$ECHO "#include <stddef.h>" | \
+                        $CC $CFLAGS -v -E - 2>&1 | \
+                        $GREP stddef | $TAIL -1 | $TR -s " " | $CUT -d'"' -f2`
+    if test "x$GCC_SYSTEM_INCLUDE" != "x"; then
+      GCC_SYSTEM_INCLUDE=`$DIRNAME $GCC_SYSTEM_INCLUDE`
+      GCC_INCLUDE_DEBUG_MAP_FLAGS="$GCC_INCLUDE_DEBUG_MAP_FLAGS \
+          -fdebug-prefix-map=${GCC_SYSTEM_INCLUDE}/=/usr/local/gcc_include/"
+    fi
+
+    # Add g++ system include mapping => /usr/local/gxx_include
+    #   Find location of cstddef using build C++ compiler
+    GXX_SYSTEM_INCLUDE=`$ECHO "#include <cstddef>" | \
+                        $CXX $CXXFLAGS -v -E -x c++ - 2>&1 | \
+                        $GREP cstddef | $TAIL -1 | $TR -s " " | $CUT -d'"' -f2`
+    if test "x$GXX_SYSTEM_INCLUDE" != "x"; then
+      GXX_SYSTEM_INCLUDE=`$DIRNAME $GXX_SYSTEM_INCLUDE`
+      GCC_INCLUDE_DEBUG_MAP_FLAGS="$GCC_INCLUDE_DEBUG_MAP_FLAGS \
+          -fdebug-prefix-map=${GXX_SYSTEM_INCLUDE}/=/usr/local/gxx_include/"
+    fi
+
+    # Add to debug prefix cflags
+    DEBUG_PREFIX_CFLAGS="$DEBUG_PREFIX_CFLAGS $GCC_INCLUDE_DEBUG_MAP_FLAGS"
+])
+
 AC_DEFUN([FLAGS_SETUP_WARNINGS],
 [
   # Set default value.
@@ -425,13 +490,13 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
 [
   #### OS DEFINES, these should be independent on toolchain
   if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    CFLAGS_OS_DEF_JVM="-DLINUX"
+    CFLAGS_OS_DEF_JVM="-DLINUX -D_FILE_OFFSET_BITS=64"
     CFLAGS_OS_DEF_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
   elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
     CFLAGS_OS_DEF_JVM="-D_ALLBSD_SOURCE -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
     CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
   elif test "x$OPENJDK_TARGET_OS" = xaix; then
-    CFLAGS_OS_DEF_JVM="-DAIX"
+    CFLAGS_OS_DEF_JVM="-DAIX -D_LARGE_FILES"
   elif test "x$OPENJDK_TARGET_OS" = xbsd; then
     CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE"
   elif test "x$OPENJDK_TARGET_OS" = xwindows; then
@@ -770,6 +835,11 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
         # for all archs except arm and ppc, prevent gcc to omit frame pointer
         $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
       fi
+      if test "x$FLAGS_CPU" = xppc64le; then
+        # Little endian machine uses ELFv2 ABI.
+        # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
+        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power8"
+      fi
     fi
     if test "x$OPENJDK_TARGET_OS" = xaix; then
       $1_CFLAGS_CPU="-mcpu=pwr8"
@@ -797,15 +867,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
     $1_TOOLCHAIN_CFLAGS="${$1_GCC6_CFLAGS}"
 
     $1_WARNING_CFLAGS_JVM="-Wno-format-zero-length -Wtype-limits -Wuninitialized"
-  elif test "x$TOOLCHAIN_TYPE" = xclang; then
-    NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
-    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG],
-        PREFIX: $3,
-        IF_FALSE: [
-            NO_DELETE_NULL_POINTER_CHECKS_CFLAG=
-        ]
-    )
-    $1_TOOLCHAIN_CFLAGS="${NO_DELETE_NULL_POINTER_CHECKS_CFLAG}"
   fi
 
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
@@ -943,17 +1004,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
 # $2 - Prefix for compiler variables (either BUILD_ or nothing).
 AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
 [
-  # These flags are required for GCC 6 builds as undefined behavior in OpenJDK code
-  # runs afoul of the more aggressive versions of these optimizations.
-  # Notably, value range propagation now assumes that the this pointer of C++
-  # member functions is non-null.
-  NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
-  FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG],
-      PREFIX: $2, IF_FALSE: [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""])
+  # This flag is required for GCC 6 builds as undefined behavior in OpenJDK code
+  # runs afoul of the more aggressive versions of this optimization.
   NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse"
   FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_LIFETIME_DSE_CFLAG],
       PREFIX: $2, IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""])
-  $1_GCC6_CFLAGS="${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
+  $1_GCC6_CFLAGS="${NO_LIFETIME_DSE_CFLAG}"
 ])
 
 AC_DEFUN_ONCE([FLAGS_SETUP_BRANCH_PROTECTION],

make/autoconf/jdk-options.m4

@@ -190,6 +190,16 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   fi
   AC_SUBST(INCLUDE_SA)
 
+  # Setup default CDS alignment. On platforms where one build may run on machines with different
+  # page sizes, the JVM choses a compatible alignment to fit all possible page sizes. This slightly
+  # increases archive size.
+  # The only platform having this problem at the moment is Linux on aarch64, which may encounter
+  # three different page sizes: 4K, 64K, and if run on Mac m1 hardware, 16K.
+  COMPATIBLE_CDS_ALIGNMENT_DEFAULT=false
+  if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+    COMPATIBLE_CDS_ALIGNMENT_DEFAULT=auto
+  fi
+
   # Compress jars
   COMPRESS_JARS=false
 
@@ -514,9 +524,15 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_LEAK_SANITIZER],
 #
 AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
 [
+  UTIL_ARG_WITH(NAME: additional-ubsan-checks, TYPE: string,
+      DEFAULT: [],
+      DESC: [Customizes the ubsan checks],
+      OPTIONAL: true)
+
   # GCC reports lots of likely false positives for stringop-truncation and format-overflow.
   # Silence them for now.
-  UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base"
+  UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base -fno-sanitize=alignment \
+      $ADDITIONAL_UBSAN_CHECKS"
   UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-stringop-truncation -Wno-format-overflow -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
   UBSAN_LDFLAGS="$UBSAN_CHECKS"
   UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED,
@@ -698,10 +714,10 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
 #
 AC_DEFUN([JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT],
 [
-  UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: false,
+  UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: $COMPATIBLE_CDS_ALIGNMENT_DEFAULT,
       RESULT: ENABLE_COMPATIBLE_CDS_ALIGNMENT,
       DESC: [enable use alternative compatible cds core region alignment],
-      DEFAULT_DESC: [disabled],
+      DEFAULT_DESC: [disabled except on linux-aarch64],
       CHECKING_MSG: [if compatible cds region alignment enabled],
       CHECK_AVAILABLE: [
         AC_MSG_CHECKING([if CDS archive is available])

make/autoconf/jdk-version.m4

@@ -110,6 +110,15 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
   AC_SUBST(COMPANY_NAME)
 
+  # Set the JDK RC Company name
+  # Otherwise uses the value set for "vendor-name".
+  UTIL_ARG_WITH(NAME: jdk-rc-company-name, TYPE: string,
+    DEFAULT: $COMPANY_NAME,
+    DESC: [Set JDK RC company name. This is used for CompanyName properties of MS Windows binaries.],
+    DEFAULT_DESC: [from branding.conf],
+    CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
+  AC_SUBST(JDK_RC_COMPANY_NAME)
+
   # The vendor URL, if any
   # Only set VENDOR_URL if '--with-vendor-url' was used and is not empty.
   # Otherwise we will use the value from "branding.conf" included above.

make/autoconf/lib-alsa.m4

@@ -70,6 +70,25 @@ AC_DEFUN_ONCE([LIB_SETUP_ALSA],
         PKG_CHECK_MODULES(ALSA, alsa, [ALSA_FOUND=yes], [ALSA_FOUND=no])
       fi
     fi
+    if test "x$ALSA_FOUND" = xno; then
+      # If we have sysroot set, and no explicit library location is set,
+      # look at known locations in sysroot.
+      if test "x$SYSROOT" != "x" && test "x${with_alsa_lib}" == x; then
+        if test -f "$SYSROOT/usr/lib64/libasound.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+          ALSA_LIBS="-L$SYSROOT/usr/lib64 -lasound"
+          ALSA_FOUND=yes
+        elif test -f "$SYSROOT/usr/lib/libasound.so"; then
+          ALSA_LIBS="-L$SYSROOT/usr/lib -lasound"
+          ALSA_FOUND=yes
+        elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libasound.so"; then
+          ALSA_LIBS="-L$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI -lasound"
+          ALSA_FOUND=yes
+        elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libasound.so"; then
+          ALSA_LIBS="-L$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI -lasound"
+          ALSA_FOUND=yes
+        fi
+      fi
+    fi
     if test "x$ALSA_FOUND" = xno; then
       AC_CHECK_HEADERS([alsa/asoundlib.h],
           [

make/autoconf/lib-dbus.m4

@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, JetBrains s.r.o.. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################################
+# Check if a potential dbus library match is correct and usable
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_DBUS],
+[
+  AC_ARG_WITH(dbus-includes, [AS_HELP_STRING([--with-dbus-includes],
+      [specify include directories for the dbus files as list separated by space])])
+
+  if test "x$NEEDS_LIB_DBUS" = xfalse; then
+    DBUS_CFLAGS=
+    DBUS_FOUND=false
+  else
+    if test "x${with_dbus_includes}" != x; then
+      DBUS_FOUND=true
+      DBUS_CFLAGS=""
+      for include in $with_dbus_includes; do
+        DBUS_CFLAGS="${DBUS_CFLAGS}-I${include} "
+      done
+    else
+      PKG_CHECK_MODULES(DBUS, dbus-1, [DBUS_FOUND=true], [
+        DBUS_FOUND=false
+        AC_MSG_NOTICE([Can't find dbus-1 library. This library is needed to use some features. You can install dbus-1 library or specify include directories manually by giving --with-dbus-includes option.])
+      ])
+    fi
+  fi
+
+  AC_SUBST(DBUS_CFLAGS)
+  AC_SUBST(DBUS_FOUND)
+])

make/autoconf/lib-vulkan.m4

@@ -0,0 +1,114 @@
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2025, JetBrains s.r.o.. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################################
+# Setup vulkan
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_VULKAN],
+[
+  AC_ARG_WITH(vulkan, [AS_HELP_STRING([--with-vulkan],
+    [specify whether we use vulkan])])
+  AC_ARG_WITH(vulkan-include, [AS_HELP_STRING([--with-vulkan-include],
+    [specify directory for the vulkan include files ({with-vulkan-include}/vulkan/vulkan.h)])])
+  AC_ARG_WITH(vulkan-shader-compiler, [AS_HELP_STRING([--with-vulkan-shader-compiler],
+    [specify which shader compiler to use: glslc/glslangValidator])])
+
+  VULKAN_ENABLED=false
+  VULKAN_FLAGS=
+
+  # Find Vulkan SDK
+  if test "x$NEEDS_LIB_VULKAN" = xtrue || test "x${with_vulkan}" = xyes || test "x${with_vulkan_include}" != x ; then
+
+    # Check custom directory
+    if test "x${with_vulkan_include}" != x; then
+      AC_MSG_CHECKING([for ${with_vulkan_include}/vulkan/vulkan.h])
+      if test -s "${with_vulkan_include}/vulkan/vulkan.h"; then
+        VULKAN_ENABLED=true
+        VULKAN_FLAGS="-I${with_vulkan_include}"
+        AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        AC_MSG_ERROR([Can't find 'vulkan/vulkan.h' under '${with_vulkan_include}'])
+      fi
+    fi
+
+    # Check $VULKAN_SDK
+    if test "x$VULKAN_ENABLED" = xfalse && test "x${VULKAN_SDK}" != x; then
+      AC_MSG_CHECKING([for ${VULKAN_SDK}/include/vulkan/vulkan.h])
+      if test -s "${VULKAN_SDK}/include/vulkan/vulkan.h"; then
+        VULKAN_ENABLED=true
+        VULKAN_FLAGS="-I${VULKAN_SDK}/include"
+        AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+      fi
+    fi
+
+    # Check default /usr/include location
+    if test "x$VULKAN_ENABLED" = xfalse; then
+      AC_CHECK_HEADERS([vulkan/vulkan.h],
+        [ VULKAN_ENABLED=true ], [ break ]
+      )
+    fi
+
+    if test "x$VULKAN_ENABLED" = xfalse; then
+      # Vulkan SDK not found
+      HELP_MSG_MISSING_DEPENDENCY([vulkan])
+      AC_MSG_ERROR([Could not find vulkan! $HELP_MSG ])
+    fi
+  fi
+
+  # Find shader compiler - glslc or glslangValidator
+  if test "x$VULKAN_ENABLED" = xtrue; then
+    SHADER_COMPILER=
+
+    # Check glslc
+    if (test "x${with_vulkan_shader_compiler}" = x || test "x${with_vulkan_shader_compiler}" = xglslc); then
+      UTIL_LOOKUP_PROGS(GLSLC, glslc)
+      SHADER_COMPILER="$GLSLC"
+      VULKAN_SHADER_COMPILER="glslc --target-env=vulkan1.2 -mfmt=num -o"
+    fi
+
+    # Check glslangValidator
+    if (test "x${with_vulkan_shader_compiler}" = x || test "x${with_vulkan_shader_compiler}" = xglslangValidator) && \
+        test "x$SHADER_COMPILER" = x; then
+      UTIL_LOOKUP_PROGS(GLSLANG, glslangValidator)
+      SHADER_COMPILER="$GLSLANG"
+      VULKAN_SHADER_COMPILER="glslangValidator --target-env vulkan1.2 -x -o"
+    fi
+
+    if test "x$SHADER_COMPILER" = x; then
+      # Compiler not found
+      VULKAN_ENABLED=false
+      VULKAN_FLAGS=
+      AC_MSG_ERROR([Can't find vulkan shader compiler])
+    fi
+  fi
+
+  AC_SUBST(VULKAN_ENABLED)
+  AC_SUBST(VULKAN_FLAGS)
+  AC_SUBST(VULKAN_SHADER_COMPILER)
+])

make/autoconf/lib-wayland.m4

@@ -45,8 +45,6 @@ AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
     fi
     WAYLAND_CFLAGS=
     WAYLAND_LIBS=
-    VULKAN_FLAGS=
-    VULKAN_ENABLED=false
   else
     WAYLAND_FOUND=no
 
@@ -79,7 +77,7 @@ AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
     if test "x${with_wayland_lib}" != x; then
       WAYLAND_LIBS="-L${with_wayland_lib} -lwayland-client -lwayland-cursor"
     fi
- 
+
     if test "x$WAYLAND_FOUND" = xno; then
       # Are the wayland headers installed in the default /usr/include location?
       AC_CHECK_HEADERS([wayland-client.h wayland-cursor.h],
@@ -97,117 +95,7 @@ AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
       AC_MSG_ERROR([Could not find wayland! $HELP_MSG ])
     fi
 
-
-    # Checking for vulkan sdk
-
-    AC_ARG_WITH(vulkan, [AS_HELP_STRING([--with-vulkan],
-      [specify whether we use vulkan])])
-
-    AC_ARG_WITH(vulkan-include, [AS_HELP_STRING([--with-vulkan-include],
-      [specify directory for the vulkan include files ({with-vulkan-include}/vulkan/vulkan.h)])])
-
-    AC_ARG_WITH(vulkan-hpp, [AS_HELP_STRING([--with-vulkan-hpp],
-      [specify directory for the vulkan-hpp include files ({with-vulkan-hpp}/vulkan/vulkan_raii.hpp)])])
-
-    AC_ARG_WITH(vulkan-shader-compiler, [AS_HELP_STRING([--with-vulkan-shader-compiler],
-      [specify which shader compiler to use: glslc/glslangValidator])])
-
-    if test "x$SUPPORTS_LIB_VULKAN" = xfalse; then
-
-      if (test "x${with_vulkan}" != x && test "x${with_vulkan}" != xno) || \
-         (test "x${with_vulkan_include}" != x && test "x${with_vulkan_include}" != xno); then
-        AC_MSG_WARN([[vulkan not used, so --with-vulkan-include is ignored]])
-      fi
-      VULKAN_FLAGS=
-      VULKAN_ENABLED=false
-    else
-      # Do not build vulkan rendering pipeline by default
-      if (test "x${with_vulkan}" = x && test "x${with_vulkan_include}" = x) || \
-          test "x${with_vulkan}" = xno || test "x${with_vulkan_include}" = xno ; then
-        VULKAN_FLAGS=
-        VULKAN_ENABLED=false
-      else
-        VULKAN_FOUND=no
-
-        if test "x${with_vulkan_include}" != x; then
-          AC_MSG_CHECKING([for vulkan.h])
-          if test -s "${with_vulkan_include}/vulkan/vulkan.h"; then
-            VULKAN_FOUND=yes
-            VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -I${with_vulkan_include} -DVULKAN_ENABLED"
-            AC_MSG_RESULT([yes])
-          else
-            AC_MSG_RESULT([no])
-            AC_MSG_ERROR([Can't find 'vulkan/vulkan.h' under '${with_vulkan_include}'])
-          fi
-          AC_MSG_CHECKING([for vulkan_raii.hpp])
-          if test "x${with_vulkan_hpp}" != x; then
-            VULKAN_FLAGS="-I${with_vulkan_hpp} ${VULKAN_FLAGS}"
-            VULKAN_HPP_DIR=${with_vulkan_hpp}
-          else
-            VULKAN_HPP_DIR=${with_vulkan_include}
-          fi
-          if test -s "$VULKAN_HPP_DIR/vulkan/vulkan_raii.hpp"; then
-            VULKAN_FOUND=yes
-            AC_MSG_RESULT([yes])
-          else
-            VULKAN_FOUND=no
-            AC_MSG_RESULT([no])
-            AC_MSG_ERROR([Can't find 'vulkan/vulkan_raii.hpp' under '$VULKAN_HPP_DIR'])
-          fi
-        fi
-
-        AC_LANG_PUSH([C++])
-        if test "x$VULKAN_FOUND" = xno; then
-          # Check vulkan sdk location
-          AC_CHECK_HEADERS([$VULKAN_SDK/include/vulkan/vulkan.h $VULKAN_SDK/include/vulkan/vulkan_raii.hpp],
-            [ VULKAN_FOUND=yes
-              VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -I${VULKAN_SDK}/include -DVULKAN_ENABLED"
-            ],
-            [ VULKAN_FOUND=no; break ]
-          )
-        fi
-
-        if test "x$VULKAN_FOUND" = xno; then
-          # Check default /usr/include location
-          AC_CHECK_HEADERS([vulkan/vulkan.h vulkan/vulkan_raii.hpp],
-            [ VULKAN_FOUND=yes
-              VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -DVULKAN_ENABLED"
-            ],
-            [ VULKAN_FOUND=no; break ]
-          )
-        fi
-        AC_LANG_POP([C++])
-
-        if test "x$VULKAN_FOUND" = xno; then
-          HELP_MSG_MISSING_DEPENDENCY([vulkan])
-          AC_MSG_ERROR([Could not find vulkan! $HELP_MSG ])
-        else
-          # Find shader compiler - glslc or glslangValidator
-          if (test "x${with_vulkan_shader_compiler}" = x || test "x${with_vulkan_shader_compiler}" = xglslc); then
-            UTIL_LOOKUP_PROGS(GLSLC, glslc)
-            SHADER_COMPILER="$GLSLC"
-            VULKAN_SHADER_COMPILER="glslc --target-env=vulkan1.2 -mfmt=num -o"
-          fi
-
-          if (test "x${with_vulkan_shader_compiler}" = x || test "x${with_vulkan_shader_compiler}" = xglslangValidator) && \
-              test "x$SHADER_COMPILER" = x; then
-            UTIL_LOOKUP_PROGS(GLSLANG, glslangValidator)
-            SHADER_COMPILER="$GLSLANG"
-            VULKAN_SHADER_COMPILER="glslangValidator --target-env vulkan1.2 -x -o"
-          fi
-
-          if test "x$SHADER_COMPILER" != x; then
-            VULKAN_ENABLED=true
-          else
-            AC_MSG_ERROR([Can't find shader compiler])
-          fi
-        fi
-      fi
-    fi
   fi
-  AC_SUBST(VULKAN_FLAGS)
-  AC_SUBST(VULKAN_SHADER_COMPILER)
-  AC_SUBST(VULKAN_ENABLED)
   AC_SUBST(WAYLAND_CFLAGS)
   AC_SUBST(WAYLAND_LIBS)
 ])

make/autoconf/lib-x11.m4

@@ -71,9 +71,9 @@ AC_DEFUN_ONCE([LIB_SETUP_X11],
           elif test -f "$SYSROOT/usr/lib/libX11.so"; then
             x_libraries="$SYSROOT/usr/lib"
           elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"; then
-            x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"
+            x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI"
           elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"; then
-            x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"
+            x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI"
           fi
         fi
       fi

make/autoconf/libraries.m4

@@ -33,11 +33,11 @@ m4_include([lib-freetype.m4])
 m4_include([lib-hsdis.m4])
 m4_include([lib-std.m4])
 m4_include([lib-x11.m4])
-m4_include([lib-fontconfig.m4])
 m4_include([lib-speechd.m4])
 m4_include([lib-nvdacontrollerclient.m4])
+m4_include([lib-dbus.m4])
+m4_include([lib-vulkan.m4])
 m4_include([lib-wayland.m4])
-
 m4_include([lib-tests.m4])
 
 ################################################################################
@@ -51,22 +51,23 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
     NEEDS_LIB_X11=false
     NEEDS_LIB_SPEECHD=false
     NEEDS_LIB_WAYLAND=false
-    SUPPORTS_LIB_VULKAN=false
   elif test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
-    # No X11 support needed when building headless only
-    NEEDS_LIB_X11=false
+    # All other instances need X11, even if building headless only, libawt still
+    # needs X11 headers.
+    NEEDS_LIB_X11=true
     NEEDS_LIB_SPEECHD=false
     NEEDS_LIB_WAYLAND=false
-    SUPPORTS_LIB_VULKAN=false
   else
     # All other instances need X11 and wayland, even if building headless only, libawt still
     # needs X11 headers.
     NEEDS_LIB_X11=true
     NEEDS_LIB_SPEECHD=true
     NEEDS_LIB_WAYLAND=true
-    SUPPORTS_LIB_VULKAN=true
   fi
 
+  # Vulkan is not built by default
+  NEEDS_LIB_VULKAN=false
+
   # Check if fontconfig is needed
   if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
     # No fontconfig support on windows or macosx
@@ -90,11 +91,13 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
     NEEDS_LIB_FREETYPE=true
   fi
 
-  # Check if alsa is needed
+  # Check if alsa and dbus is needed
   if test "x$OPENJDK_TARGET_OS" = xlinux; then
     NEEDS_LIB_ALSA=true
+    NEEDS_LIB_DBUS=true
   else
     NEEDS_LIB_ALSA=false
+    NEEDS_LIB_DBUS=false
   fi
 
   # Check if ffi is needed
@@ -151,8 +154,9 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   LIB_SETUP_X11
   LIB_SETUP_SPEECHD
   LIB_SETUP_NVDACONTROLLERCLIENT
+  LIB_SETUP_VULKAN
   LIB_SETUP_WAYLAND
-
+  LIB_SETUP_DBUS
   LIB_TESTS_SETUP_GTEST
 
   BASIC_JDKLIB_LIBS=""
@@ -191,7 +195,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   if test "x$OPENJDK_TARGET_OS" = xwindows; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \
         comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib powrprof.lib uuid.lib \
-        ws2_32.lib winmm.lib version.lib psapi.lib"
+        ws2_32.lib winmm.lib version.lib psapi.lib Synchronization.lib"
   fi
   LIB_SETUP_JVM_LIBS(BUILD)
   LIB_SETUP_JVM_LIBS(TARGET)

make/autoconf/spec.gmk.in

@@ -191,6 +191,7 @@ PRODUCT_NAME:=@PRODUCT_NAME@
 PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
 JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
 JDK_RC_NAME:=@JDK_RC_NAME@
+JDK_RC_COMPANY_NAME:=@JDK_RC_COMPANY_NAME@
 COMPANY_NAME:=@COMPANY_NAME@
 HOTSPOT_VM_DISTRO:=@HOTSPOT_VM_DISTRO@
 MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
@@ -466,6 +467,10 @@ UBSAN_LDFLAGS:=@UBSAN_LDFLAGS@
 X_CFLAGS:=@X_CFLAGS@
 X_LIBS:=@X_LIBS@
 
+# Necessary additional compiler flags to compile dbus
+DBUS_CFLAGS := @DBUS_CFLAGS@
+DBUS_FOUND := @DBUS_FOUND@
+
 # Linux speechd a11y announcer
 A11Y_SPEECHD_ANNOUNCING_ENABLED:=@A11Y_SPEECHD_ANNOUNCING_ENABLED@
 SPEECHD_CFLAGS:=@SPEECHD_CFLAGS@
@@ -482,9 +487,9 @@ A11Y_JAWS_ANNOUNCING_ENABLED:=@A11Y_JAWS_ANNOUNCING_ENABLED@
 
 WAYLAND_CFLAGS:=@WAYLAND_CFLAGS@
 WAYLAND_LIBS:=@WAYLAND_LIBS@
+VULKAN_ENABLED:=@VULKAN_ENABLED@
 VULKAN_FLAGS:=@VULKAN_FLAGS@
 VULKAN_SHADER_COMPILER:=@VULKAN_SHADER_COMPILER@
-VULKAN_ENABLED:=@VULKAN_ENABLED@
 
 # The lowest required version of macosx
 MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@

make/autoconf/toolchain.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -389,6 +389,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
   # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
   CFLAGS="$ORG_CFLAGS"
   CXXFLAGS="$ORG_CXXFLAGS"
+
+  # filter out some unwanted additions autoconf may add to CXX; we saw this on macOS with autoconf 2.72
+  UTIL_GET_NON_MATCHING_VALUES(cxx_filtered, $CXX, -std=c++11 -std=gnu++11)
+  CXX="$cxx_filtered"
 ])
 
 # Check if a compiler is of the toolchain type we expect, and save the version
@@ -445,6 +449,11 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
     #     Copyright (C) 2013 Free Software Foundation, Inc.
     #     This is free software; see the source for copying conditions.  There is NO
     #     warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    # or look like
+    #     gcc (GCC) 10.2.1 20200825 (Alibaba 10.2.1-3.8 2.32)
+    #     Copyright (C) 2020 Free Software Foundation, Inc.
+    #     This is free software; see the source for copying conditions.  There is NO
+    #     warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
     # Check that this is likely to be GCC.
     $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Free Software Foundation" > /dev/null
@@ -458,7 +467,8 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
         $SED -e 's/ *Copyright .*//'`
     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
-        $SED -e 's/^.* \(@<:@1-9@:>@<:@0-9@:>@*\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'`
+        $AWK -F ')' '{print [$]2}' | \
+        $AWK '{print [$]1}'`
   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
     # clang --version output typically looks like
     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)

make/autoconf/util.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -199,7 +199,7 @@ AC_DEFUN([UTIL_GET_NON_MATCHING_VALUES],
   if test -z "$legal_values"; then
     $1="$2"
   else
-    result=`$GREP -Fvx "$legal_values" <<< "$values_to_check" | $GREP -v '^$'`
+    result=`$GREP -Fvx -- "$legal_values" <<< "$values_to_check" | $GREP -v '^$'`
     $1=${result//$'\n'/ }
   fi
 ])
@@ -226,7 +226,7 @@ AC_DEFUN([UTIL_GET_MATCHING_VALUES],
   if test -z "$illegal_values"; then
     $1=""
   else
-    result=`$GREP -Fx "$illegal_values" <<< "$values_to_check" | $GREP -v '^$'`
+    result=`$GREP -Fx -- "$illegal_values" <<< "$values_to_check" | $GREP -v '^$'`
     $1=${result//$'\n'/ }
   fi
 ])

make/common/JavaCompilation.gmk

@@ -168,6 +168,7 @@ endef
 #   CREATE_API_DIGEST:=Set to true to use a javac plugin to generate a public API
 #        hash which can be used for down stream dependencies to only rebuild
 #        when the API changes.
+#   PROCESS_JBR_API:=Set to true to use an annotation processor to generate JBR API bindings.
 #   KEEP_ALL_TRANSLATIONS:=Set to true to skip translation filtering
 SetupJavaCompilation = $(NamedParamsMacroTemplate)
 define SetupJavaCompilationBody
@@ -442,13 +443,22 @@ define SetupJavaCompilationBody
 
     ifeq ($$($1_CREATE_API_DIGEST), true)
       $1_API_DIGEST_FLAGS := \
-          -classpath $$(BUILDTOOLS_OUTPUTDIR)/depend \
           -Xplugin:"depend $$($1_API_TARGET)" \
           "-XDinternalAPIPath=$$($1_API_INTERNAL)" \
           "-XDLOG_LEVEL=$(LOG_LEVEL)" \
           #
 
-      $1_EXTRA_DEPS := $$(BUILDTOOLS_OUTPUTDIR)/depend/_the.COMPILE_DEPEND_batch
+      $1_EXTRA_DEPS := $$($1_EXTRA_DEPS) $$(BUILDTOOLS_OUTPUTDIR)/plugins/_the.COMPILE_DEPEND_batch
+    endif
+
+    ifeq ($$($1_PROCESS_JBR_API), true)
+      # Automatic path conversion doesn't work for two arguments, so call fixpath manually
+      $1_JBR_API_FLAGS := -Xplugin:"jbr-api $$(call FixPath, $$($1_BIN)/java.base/META-INF/jbrapi.registry) $$(call FixPath, $(TOPDIR)/jb/jbr-api.version)"
+      $1_EXTRA_DEPS := $$($1_EXTRA_DEPS) $$(BUILDTOOLS_OUTPUTDIR)/plugins/_the.COMPILE_JBR_API_PLUGIN_batch
+    endif
+
+    ifeq ($$(call Or, $$($1_CREATE_API_DIGEST) $$($1_PROCESS_JBR_API)), true)
+        $1_PROCESSORPATH := -processorpath $$(BUILDTOOLS_OUTPUTDIR)/plugins
     endif
 
     # Create a file with all sources, to pass to javac in an @file.
@@ -487,7 +497,7 @@ define SetupJavaCompilationBody
 		$$(call MakeDir, $$(@D))
 		$$(call ExecuteWithLog, $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$$($1_SAFE_NAME)_batch, \
 		    $$($1_JAVAC_CMD) $$($1_FLAGS) \
-		        $$($1_API_DIGEST_FLAGS) \
+		        $$($1_PROCESSORPATH) $$($1_API_DIGEST_FLAGS) $$($1_JBR_API_FLAGS) \
 		        -XDmodifiedInputs=$$($1_MODFILELIST_FIXED) \
 		        -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_FILELIST)) && \
 		$(TOUCH) $$@

make/common/JdkNativeCompilation.gmk

@@ -98,7 +98,7 @@ GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/ve
 
 JDK_RCFLAGS=$(RCFLAGS) \
     -D"JDK_VERSION_STRING=$(VERSION_STRING)" \
-    -D"JDK_COMPANY=$(COMPANY_NAME)" \
+    -D"JDK_COMPANY=$(JDK_RC_COMPANY_NAME)" \
     -D"JDK_VER=$(VERSION_NUMBER_FOUR_POSITIONS)" \
     -D"JDK_COPYRIGHT=Copyright \xA9 $(COPYRIGHT_YEAR)" \
     -D"JDK_NAME=$(JDK_RC_NAME) $(VERSION_SHORT)" \

make/common/MakeBase.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -152,6 +152,10 @@ define SetupLogging
     endif
   endif
 
+  ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)
+    SHELL := $$(SHELL) -x
+  endif
+
   ifeq ($$(LOG_LEVEL), trace)
     SHELL_NO_RECURSE := $$(SHELL)
     # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
@@ -285,6 +289,7 @@ ifeq ($(call isTargetOs, macosx), true)
 	  $(CP) -fRP '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'; \
 	fi
 	if [ -n "`$(XATTR) -ls '$(call DecodeSpace, $@)'`" ]; then \
+	  $(CHMOD) -h u+w '$(call DecodeSpace, $@)'; \
 	  $(XATTR) -cs '$(call DecodeSpace, $@)'; \
 	fi
   endef

make/common/NativeCompilation.gmk

@@ -215,7 +215,21 @@ DEPENDENCY_TARGET_SED_PATTERN := \
 # The fix-deps-file macro is used to adjust the contents of the generated make
 # dependency files to contain paths compatible with make.
 #
+REWRITE_PATHS_RELATIVE = false
 ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT)-$(FILE_MACRO_CFLAGS), false-)
+  REWRITE_PATHS_RELATIVE = true
+endif
+
+# CCACHE_BASEDIR needs fix-deps-file as makefiles use absolute filenames for
+# object files while CCACHE_BASEDIR will make ccache relativize all paths for
+# its compiler. The compiler then produces relative dependency files.
+# make does not know a relative and absolute filename is the same so it will
+# ignore such dependencies.
+ifneq ($(CCACHE), )
+  REWRITE_PATHS_RELATIVE = true
+endif
+
+ifeq ($(REWRITE_PATHS_RELATIVE), true)
   # Need to handle -I flags as both '-Ifoo' and '-I foo'.
   MakeCommandRelative = \
       $(CD) $(WORKSPACE_ROOT) && \

make/common/TestFilesCompilation.gmk

@@ -56,22 +56,32 @@ define SetupTestFilesCompilationBody
     $$(error There are duplicate test file names for $1: $$($1_DUPLICATED_NAMES))
   endif
 
+  # Always include common test functionality
+  TEST_CFLAGS := -I$(TOPDIR)/test/lib/native
+
+  ifeq ($(TOOLCHAIN_TYPE), gcc)
+    TEST_CFLAGS += -fvisibility=hidden
+    TEST_LDFLAGS += -Wl,--exclude-libs,ALL
+  else ifeq ($(TOOLCHAIN_TYPE), clang)
+    TEST_CFLAGS += -fvisibility=hidden
+  endif
+
   # The list to depend on starts out empty
   $1 :=
   ifeq ($$($1_TYPE), LIBRARY)
     $1_PREFIX = lib
     $1_OUTPUT_SUBDIR := lib
-    $1_BASE_CFLAGS := $(CFLAGS_JDKLIB)
-    $1_BASE_CXXFLAGS := $(CXXFLAGS_JDKLIB)
-    $1_LDFLAGS := $(LDFLAGS_JDKLIB) $$(call SET_SHARED_LIBRARY_ORIGIN)
+    $1_BASE_CFLAGS := $(CFLAGS_JDKLIB) $$(TEST_CFLAGS)
+    $1_BASE_CXXFLAGS := $(CXXFLAGS_JDKLIB) $$(TEST_CFLAGS)
+    $1_LDFLAGS := $(LDFLAGS_JDKLIB) $$(TEST_LDFLAGS) $$(call SET_SHARED_LIBRARY_ORIGIN)
     $1_COMPILATION_TYPE := LIBRARY
     $1_LOG_TYPE := library
   else ifeq ($$($1_TYPE), PROGRAM)
     $1_PREFIX = exe
     $1_OUTPUT_SUBDIR := bin
-    $1_BASE_CFLAGS := $(CFLAGS_JDKEXE)
-    $1_BASE_CXXFLAGS := $(CXXFLAGS_JDKEXE)
-    $1_LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_TESTEXE)
+    $1_BASE_CFLAGS := $(CFLAGS_JDKEXE) $$(TEST_CFLAGS)
+    $1_BASE_CXXFLAGS := $(CXXFLAGS_JDKEXE) $$(TEST_CFLAGS)
+    $1_LDFLAGS := $(LDFLAGS_JDKEXE) $$(TEST_LDFLAGS) $(LDFLAGS_TESTEXE)
     $1_COMPILATION_TYPE := EXECUTABLE
     $1_LOG_TYPE := executable
   else

make/conf/github-actions.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,13 +29,17 @@ GTEST_VERSION=1.13.0
 JTREG_VERSION=7.3.1+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
-LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz
-LINUX_X64_BOOT_JDK_SHA256=bb863b2d542976d1ae4b7b81af3e78b1e4247a64644350b552d298d8dc5980dc
+LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.6_7.tar.gz
+LINUX_X64_BOOT_JDK_SHA256=a2650fba422283fbed20d936ce5d2a52906a5414ec17b2f7676dddb87201dbae
+
+MACOS_AARCH64_BOOT_JDK_EXT=tar.gz
+MACOS_AARCH64_BOOT_JDK_URL=https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.6_7.tar.gz
+MACOS_AARCH64_BOOT_JDK_SHA256=4ef4083919126a3d93e603284b405c7493905497485a92b375f5d6c3e8f7e8f2
 
 MACOS_X64_BOOT_JDK_EXT=tar.gz
-MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_macos-x64_bin.tar.gz
-MACOS_X64_BOOT_JDK_SHA256=47cf960d9bb89dbe987535a389f7e26c42de7c984ef5108612d77c81aa8cc6a4
+MACOS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.6_7.tar.gz
+MACOS_X64_BOOT_JDK_SHA256=7aacfc400078ad65b7c7de3ec75ff74bf5c2077d6740b350f85ae10be4f71e76
 
 WINDOWS_X64_BOOT_JDK_EXT=zip
-WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_windows-x64_bin.zip
-WINDOWS_X64_BOOT_JDK_SHA256=c92fae5e42b9aecf444a66c8ec563c652f60b1e231dfdd33a4f5a3e3603058fb
+WINDOWS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.6_7.zip
+WINDOWS_X64_BOOT_JDK_SHA256=897c8eebb0f85a99ccecbd482ebae9a45d88c19d6077054f6529ebab49b6d259

make/conf/version-numbers.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,12 +28,12 @@
 
 DEFAULT_VERSION_FEATURE=21
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=2
+DEFAULT_VERSION_UPDATE=8
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2024-01-16
+DEFAULT_VERSION_DATE=2025-07-15
 DEFAULT_VERSION_CLASSFILE_MAJOR=65  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11

make/data/cldr/common/main/ff_Adlm.xml

@@ -708,7 +708,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BS">𞤄𞤢𞤸𞤢𞤥𞤢𞥄𞤧</territory>
 			<territory type="BT">𞤄𞤵𞥅𞤼𞤢𞥄𞤲</territory>
 			<territory type="BV">𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤄𞤵𞥅𞤾𞤫𞥅</territory>
-			<territory type="BW">‮𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢</territory>
+			<territory type="BW">𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢</territory>
 			<territory type="BY">𞤄𞤫𞤤𞤢𞤪𞤵𞥅𞤧</territory>
 			<territory type="BZ">𞤄𞤫𞤤𞤭𞥅𞥁</territory>
 			<territory type="CA">𞤑𞤢𞤲𞤢𞤣𞤢𞥄</territory>
@@ -8278,7 +8278,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>𞤐𞤵𞥅𞤳</exemplarCity>
 			</zone>
 			<zone type="America/Scoresbysund">
-				<exemplarCity>‮𞤋𞤼𞥆𞤮𞤳𞤮𞤪𞤼𞤮𞥅𞤪𞤥𞤭𞥅𞤼</exemplarCity>
+				<exemplarCity>𞤋𞤼𞥆𞤮𞤳𞤮𞤪𞤼𞤮𞥅𞤪𞤥𞤭𞥅𞤼</exemplarCity>
 			</zone>
 			<zone type="America/Danmarkshavn">
 				<exemplarCity>𞤁𞤢𞥄𞤲𞤥𞤢𞤪𞤳𞥃𞤢𞥄𞤾𞤲</exemplarCity>

make/devkit/Tools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -539,6 +539,7 @@ $(BUILDDIR)/$(gcc_ver)/Makefile \
 	  $(PATHPRE) $(ENVS) $(GCC_CFG) $(EXTRA_CFLAGS) \
 	      $(CONFIG) \
 	      --with-sysroot=$(SYSROOT) \
+	      --with-debug-prefix-map=$(OUTPUT_ROOT)=devkit \
 	      --enable-languages=c,c++ \
 	      --enable-shared \
 	      --disable-nls \

make/devkit/createJMHBundle.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 JMH_VERSION=1.37
 COMMONS_MATH3_VERSION=3.6.1
 JOPT_SIMPLE_VERSION=5.0.4
+MAVEN_MIRROR=${MAVEN_MIRROR:-https://repo.maven.apache.org/maven2}
 
 BUNDLE_NAME=jmh-$JMH_VERSION.tar.gz
 
@@ -41,9 +42,9 @@ cd $JAR_DIR
 rm -f *
 
 fetchJar() {
-  url="https://repo.maven.apache.org/maven2/$1/$2/$3/$2-$3.jar"
+  url="${MAVEN_MIRROR}/$1/$2/$3/$2-$3.jar"
   if command -v curl > /dev/null; then
-      curl -O --fail $url
+      curl -OL --fail $url
   elif command -v wget > /dev/null; then
       wget $url
   else

make/hotspot/gensrc/GensrcAdlc.gmk

@@ -51,7 +51,7 @@ ifeq ($(call check-jvm-feature, compiler2), true)
   endif
 
   # Set the C++ standard
-  ADLC_CFLAGS += $(ADLC_LANGSTD_CXXFLAG)
+  ADLC_CFLAGS += $(ADLC_LANGSTD_CXXFLAGS)
 
   # NOTE: The old build didn't set -DASSERT for windows but it doesn't seem to
   # hurt.

make/hotspot/lib/CompileGtest.gmk

@@ -57,7 +57,8 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
         $(GTEST_FRAMEWORK_SRC)/googletest/src \
         $(GTEST_FRAMEWORK_SRC)/googlemock/src, \
     INCLUDE_FILES := gtest-all.cc gmock-all.cc, \
-    DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral maybe-uninitialized, \
+    DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral \
+        maybe-uninitialized zero-as-null-pointer-constant, \
     DISABLED_WARNINGS_clang := undef unused-result format-nonliteral, \
     CFLAGS := $(JVM_CFLAGS) \
         -I$(GTEST_FRAMEWORK_SRC)/googletest \

make/hotspot/lib/CompileJvm.gmk

@@ -157,8 +157,13 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
     DISABLED_WARNINGS_gcc_ad_$(HOTSPOT_TARGET_CPU_ARCH).cpp := nonnull, \
     DISABLED_WARNINGS_gcc_cgroupV1Subsystem_linux.cpp := address, \
     DISABLED_WARNINGS_gcc_cgroupV2Subsystem_linux.cpp := address, \
+    DISABLED_WARNINGS_gcc_handshake.cpp := stringop-overflow, \
     DISABLED_WARNINGS_gcc_interp_masm_x86.cpp := uninitialized, \
+    DISABLED_WARNINGS_gcc_jvmciCodeInstaller.cpp := stringop-overflow, \
+    DISABLED_WARNINGS_gcc_jvmtiTagMap.cpp := stringop-overflow, \
     DISABLED_WARNINGS_gcc_postaloc.cpp := address, \
+    DISABLED_WARNINGS_gcc_shenandoahLock.cpp := stringop-overflow, \
+    DISABLED_WARNINGS_gcc_synchronizer.cpp := stringop-overflow, \
     DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang), \
     DISABLED_WARNINGS_clang_arguments.cpp := missing-field-initializers, \
     DISABLED_WARNINGS_clang_codeBuffer.cpp := tautological-undefined-compare, \

make/jdk/src/classes/build/tools/classlist/HelloClasslist.java

@@ -36,6 +36,8 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.net.InetAddress;
 import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -153,6 +155,20 @@ public class HelloClasslist {
         // an inconsistency in the classlist between builds (see JDK-8295951).
         // To avoid the problem, load the class explicitly.
         Class<?> striped64Class = Class.forName("java.util.concurrent.atomic.Striped64$Cell");
+        Files.lines(Path.of(args[0])).forEach(line -> {
+                if (line.isEmpty() || line.charAt(0) == '#') {
+                    return;
+                }
+                try {
+                    int index = line.indexOf(' ');
+                    if (index <= 0) {
+                        return;
+                    }
+                    String className = line.substring(0, index).replace('/', '.');
+                    Class.forName(className);
+                } catch (Exception e) {
+                }
+            });
     }
 
     public HelloClasslist() {}

make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;
@@ -339,9 +340,15 @@ public class GenerateCurrencyData {
                 validCurrencyCodes.substring(i * 7 + 3, i * 7 + 6));
             checkCurrencyCode(currencyCode);
             int tableEntry = mainTable[(currencyCode.charAt(0) - 'A') * A_TO_Z + (currencyCode.charAt(1) - 'A')];
-            if (tableEntry == INVALID_COUNTRY_ENTRY ||
-                    (tableEntry & SPECIAL_CASE_COUNTRY_MASK) != 0 ||
-                    (tableEntry & SIMPLE_CASE_COUNTRY_FINAL_CHAR_MASK) != (currencyCode.charAt(2) - 'A')) {
+
+            // Do not allow a future currency to be classified as an otherCurrency,
+            // otherwise it will leak out into Currency:getAvailableCurrencies
+            boolean futureCurrency = Arrays.asList(specialCaseNewCurrencies).contains(currencyCode);
+            boolean simpleCurrency = (tableEntry & SIMPLE_CASE_COUNTRY_FINAL_CHAR_MASK) == (currencyCode.charAt(2) - 'A');
+
+            // If neither a simple currency, or one defined in the future
+            // then the current currency is applicable to be added to the otherTable
+            if (!futureCurrency && !simpleCurrency) {
                 if (otherCurrenciesCount == maxOtherCurrencies) {
                     throw new RuntimeException("too many other currencies");
                 }

make/jdk/src/classes/build/tools/jbrapi/JBRApiPlugin.java

@@ -0,0 +1,451 @@
+package build.tools.jbrapi;
+
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.util.*;
+
+import javax.lang.model.element.*;
+import javax.lang.model.type.ArrayType;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.ExecutableType;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementScanner14;
+import javax.lang.model.util.Elements;
+import javax.lang.model.util.Types;
+import javax.tools.Diagnostic;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
+import java.nio.channels.OverlappingFileLockException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.locks.LockSupport;
+import java.util.stream.Collectors;
+
+public class JBRApiPlugin implements Plugin {
+
+    enum Binding {
+        SERVICE,
+        PROVIDES,
+        PROVIDED,
+        TWO_WAY
+    }
+
+    record DiagnosticTree(CompilationUnitTree root, Tree tree) {}
+    record TypeBinding(DiagnosticTree diagnostic, TypeElement element, String currentType, String bindType, Binding binding) {}
+    record MethodBinding(DiagnosticTree diagnostic, ExecutableElement element, Registry.StaticDescriptor currentMethod, Registry.StaticMethod bindMethod) {}
+
+    final Map<String, TypeBinding> typeBindings = new HashMap<>();
+    final List<MethodBinding> methodBindings = new ArrayList<>();
+    Elements elements;
+    Trees trees;
+    Types types;
+
+    class Registry {
+
+        record Type(String type, Binding binding) {}
+        record StaticMethod(String type, String name) {}
+        record StaticDescriptor(StaticMethod method, String descriptor) {}
+
+        final Map<String, Type> types = new HashMap<>();
+        final Map<StaticDescriptor, StaticMethod> methods = new HashMap<>();
+        final Set<Object> internal = new HashSet<>();
+
+        void validateInternal(DiagnosticTree diagnostic, String currentType, Binding binding, TypeElement bindType) {
+            if (bindType.getKind() != ElementKind.CLASS && bindType.getKind() != ElementKind.INTERFACE) {
+                trees.printMessage(Diagnostic.Kind.ERROR, "Invalid JBR API binding:" + currentType + " -> " +
+                                bindType.getQualifiedName().toString() + " (not a class or interface)",
+                        diagnostic.tree, diagnostic.root);
+            } else if (bindType.getModifiers().contains(Modifier.FINAL) || bindType.getModifiers().contains(Modifier.SEALED)) {
+                trees.printMessage(Diagnostic.Kind.ERROR, "Invalid JBR API binding:" + currentType + " -> " +
+                                bindType.getQualifiedName().toString() + " (not inheritable)",
+                        diagnostic.tree, diagnostic.root);
+            }
+            if (binding != Binding.SERVICE) {
+                trees.printMessage(Diagnostic.Kind.ERROR, "Invalid JBR API binding:" + currentType + " -> " +
+                                bindType.getQualifiedName().toString() + " (internal, non-service)",
+                        diagnostic.tree, diagnostic.root);
+            }
+        }
+
+        void validateInternalMethod(DiagnosticTree diagnostic, StaticDescriptor currentMethod, TypeElement bindType, String bindMethod) {
+            boolean methodFound = false;
+            for (Element m : bindType.getEnclosedElements()) {
+                if (m.getKind() == ElementKind.METHOD &&
+                        !m.getModifiers().contains(Modifier.STATIC) &&
+                        !m.getModifiers().contains(Modifier.FINAL) &&
+                        m.getSimpleName().contentEquals(bindMethod) &&
+                        descriptor(m.asType()).equals(currentMethod.descriptor)) {
+                    methodFound = true;
+                }
+            }
+            if (!methodFound) {
+                trees.printMessage(Diagnostic.Kind.ERROR, "Invalid static binding: " +
+                                currentMethod.method.type + "#" + currentMethod.method.name + " -> " +
+                                bindType.getQualifiedName().toString() + "#" + bindMethod +
+                                " (no matching method found, type conversions are not allowed for internal bindings)",
+                        diagnostic.tree, diagnostic.root);
+            }
+        }
+
+        List<String> addBindings() {
+            List<String> unresolvedErrors = new ArrayList<>();
+            List<TypeBinding> addedTypes = new ArrayList<>();
+            List<MethodBinding> addedMethods = new ArrayList<>();
+            Set<Object> validated = new HashSet<>();
+            // Remove changed bindings.
+            for (TypeBinding type : typeBindings.values()) {
+                if (type.bindType != null) addedTypes.add(type);
+                types.remove(type.currentType);
+            }
+            for (MethodBinding method : methodBindings) {
+                if (method.bindMethod != null) addedMethods.add(method);
+                methods.remove(method.currentMethod);
+            }
+            methods.entrySet().removeIf(m -> typeBindings.containsKey(m.getKey().method.type));
+            // Build inverse binding map.
+            Map<String, String> inverseTypes = types.entrySet().stream().collect(Collectors.toMap(
+                    e -> e.getValue().type, Map.Entry::getKey, (a, b) -> {
+                        unresolvedErrors.add("Conflicting JBR API binding: " + a + " and "+ b + " binds to the same type");
+                        return a + "," + b;
+                    }));
+            Map<StaticDescriptor, StaticMethod> inverseMethods = methods.entrySet().stream().collect(Collectors.toMap(
+                    e -> new StaticDescriptor(e.getValue(), e.getKey().descriptor), e -> e.getKey().method, (a, b) -> {
+                        unresolvedErrors.add("Conflicting JBR API binding: " +
+                                a.type + "#" + a.name + " and "+ b.type + "#" + b.name + " binds to the same method");
+                        return new StaticMethod(a.type + "," + b.type, a.name + "," + b.name);
+                    }));
+            // Add new bindings.
+            for (TypeBinding type : addedTypes) types.put(type.currentType, new Type(type.bindType, type.binding));
+            for (MethodBinding method : addedMethods) methods.put(method.currentMethod, method.bindMethod);
+            // Validate type bindings.
+            for (TypeBinding type : addedTypes) {
+                String inv = inverseTypes.get(type.bindType);
+                if (inv != null) {
+                    trees.printMessage(Diagnostic.Kind.ERROR,
+                            "Conflicting JBR API binding: " + type.currentType + " -> " + type.bindType + " <- " + inv,
+                            type.diagnostic.tree, type.diagnostic.root);
+                    inverseTypes.put(type.bindType, inv + "," + type.currentType);
+                } else inverseTypes.put(type.bindType, type.currentType);
+                Type next = types.get(type.bindType);
+                if (next != null) {
+                    trees.printMessage(Diagnostic.Kind.ERROR,
+                            "Conflicting JBR API binding: " + type.currentType + " -> " + type.bindType + " -> " + next,
+                            type.diagnostic.tree, type.diagnostic.root);
+                }
+                String prev = inverseTypes.get(type.currentType);
+                if (prev != null) {
+                    trees.printMessage(Diagnostic.Kind.ERROR,
+                            "Conflicting JBR API binding: " + prev + " -> " + type.currentType + " -> " + type.bindType,
+                            type.diagnostic.tree, type.diagnostic.root);
+                }
+                if (validated.add(type.currentType)) {
+                    TypeElement bindElement = elements.getTypeElement(type.bindType);
+                    if (bindElement != null) {
+                        internal.add(type.currentType);
+                        validateInternal(type.diagnostic, type.currentType, type.binding, bindElement);
+                    }
+                }
+            }
+            // Validate method bindings.
+            for (MethodBinding method : addedMethods) {
+                StaticDescriptor invDescriptor = new StaticDescriptor(method.bindMethod, method.currentMethod.descriptor);
+                StaticMethod inv = inverseMethods.get(invDescriptor);
+                if (inv != null) {
+                    trees.printMessage(Diagnostic.Kind.ERROR, "Conflicting JBR API binding: " +
+                                    method.currentMethod.method.type + "#" + method.currentMethod.method.name + " -> " +
+                                    method.bindMethod.type + "#" + method.bindMethod.name + " <- " +
+                                    inv.type + "#" + inv.name,
+                            method.diagnostic.tree, method.diagnostic.root);
+                    inverseMethods.put(invDescriptor, new StaticMethod(
+                            inv.type + "," + method.currentMethod.method.type, inv.name + "," + method.currentMethod.method.name));
+                } else inverseMethods.put(invDescriptor, method.currentMethod.method);
+                if (validated.add(method.currentMethod)) {
+                    TypeElement bindElement = elements.getTypeElement(method.bindMethod.type);
+                    if (bindElement != null) {
+                        internal.add(method.currentMethod);
+                        validateInternalMethod(method.diagnostic, method.currentMethod, bindElement, method.bindMethod.name);
+                    }
+                }
+            }
+            // [Re]validate remaining.
+            types.forEach((k, v) -> {
+                if (validated.add(k)) {
+                    TypeBinding type = typeBindings.get(v.type);
+                    if (type != null) {
+                        internal.add(k);
+                        validateInternal(type.diagnostic, k, v.binding, type.element);
+                    } else if (elements.getTypeElement(v.type) != null) {
+                        internal.add(k); // Couldn't validate, but at least found the type.
+                        if (v.binding != Binding.SERVICE) {
+                            unresolvedErrors.add("Invalid JBR API binding:" + k + " -> " + v.type + " (internal, non-service)");
+                        }
+                    }
+                }
+            });
+            methods.forEach((k, v) -> {
+                if (validated.add(k)) {
+                    TypeBinding type = typeBindings.get(v.type);
+                    if (type != null) {
+                        internal.add(k);
+                        validateInternalMethod(type.diagnostic, k, type.element, v.name);
+                    } else if (elements.getTypeElement(v.type) != null) {
+                        internal.add(k); // Couldn't validate, but at least found the type.
+                    }
+                }
+            });
+            return unresolvedErrors;
+        }
+
+        void read(RandomAccessFile file) throws IOException {
+            String s;
+            while ((s = file.readLine()) != null) {
+                String[] tokens = s.split(" ");
+                switch (tokens[0]) {
+                    case "TYPE" -> {
+                        types.put(tokens[1], new Type(tokens[2], Binding.valueOf(tokens[3])));
+                        if (tokens.length > 4 && tokens[4].equals("INTERNAL")) internal.add(tokens[1]);
+                    }
+                    case "STATIC" -> {
+                        StaticDescriptor descriptor = new StaticDescriptor(new StaticMethod(
+                                tokens[1], tokens[2]), tokens[3]);
+                        methods.put(descriptor, new StaticMethod(tokens[4], tokens[5]));
+                        if (tokens.length > 6 && tokens[6].equals("INTERNAL")) internal.add(descriptor);
+                    }
+                }
+            }
+        }
+
+        void write(RandomAccessFile file) throws IOException {
+            for (var t : types.entrySet()) {
+                file.writeBytes("TYPE " + t.getKey() + " " + t.getValue().type + " " + t.getValue().binding +
+                        (internal.contains(t.getKey()) ? " INTERNAL\n" : "\n"));
+            }
+            for (var t : methods.entrySet()) {
+                file.writeBytes("STATIC " + t.getKey().method.type + " " + t.getKey().method.name + " " +
+                        t.getKey().descriptor + " " + t.getValue().type + " " + t.getValue().name +
+                        (internal.contains(t.getKey()) ? " INTERNAL\n" : "\n"));
+            }
+        }
+    }
+
+    String descriptor(TypeMirror t) {
+        return switch (t.getKind()) {
+            case VOID       -> "V";
+            case BOOLEAN    -> "Z";
+            case BYTE       -> "B";
+            case CHAR       -> "C";
+            case SHORT      -> "S";
+            case INT        -> "I";
+            case LONG       -> "J";
+            case FLOAT      -> "F";
+            case DOUBLE     -> "D";
+            case ARRAY      -> "[" + descriptor(((ArrayType) t).getComponentType());
+            case DECLARED   -> "L" + elements.getBinaryName((TypeElement) ((DeclaredType) t).asElement())
+                    .toString().replace('.', '/') + ";";
+            case EXECUTABLE -> "(" + ((ExecutableType) t).getParameterTypes().stream().map(this::descriptor)
+                    .collect(Collectors.joining()) + ")" + descriptor(((ExecutableType) t).getReturnType());
+            case TYPEVAR, WILDCARD, UNION, INTERSECTION -> descriptor(types.erasure(t));
+            default -> throw new RuntimeException("Cannot generate descriptor for type: " + t);
+        };
+    }
+
+    Registry.StaticDescriptor staticDescriptor(String type, ExecutableElement e) {
+        return new Registry.StaticDescriptor(new Registry.StaticMethod(type, e.getSimpleName().toString()), descriptor(e.asType()));
+    }
+
+    AnnotationValue annotationValue(AnnotationMirror m) {
+        if (m == null) return null;
+        return m.getElementValues().entrySet().stream()
+                .filter(t -> t.getKey().getSimpleName().contentEquals("value"))
+                .map(Map.Entry::getValue).findFirst().orElseThrow();
+    }
+
+    static boolean isJavaIdentifier(String name, int from, int to) {
+        if (!Character.isJavaIdentifierStart(name.charAt(from))) return false;
+        for (int i = from + 1; i < to; i++) {
+            if (!Character.isJavaIdentifierPart(name.charAt(i))) return false;
+        }
+        return true;
+    }
+    static boolean isJavaIdentifier(String name) {
+        if (name == null || name.isEmpty()) return false;
+        return isJavaIdentifier(name, 0, name.length());
+    }
+    static boolean isJavaTypeIdentifier(String name) {
+        if (name == null || name.isEmpty()) return false;
+        for (int i = 0; i < name.length();) {
+            int next = name.indexOf('.', i);
+            if (next == -1) next = name.length();
+            if (!isJavaIdentifier(name, i, next)) return false;
+            i = next + 1;
+        }
+        return true;
+    }
+
+    void scan(CompilationUnitTree root, Element e) {
+        // Get current type name.
+        String currentType;
+        if (e.getKind() == ElementKind.CLASS || e.getKind() == ElementKind.INTERFACE) {
+            currentType = ((TypeElement) e).getQualifiedName().toString();
+        } else if (e.getKind() == ElementKind.METHOD && e.getModifiers().contains(Modifier.STATIC)) {
+            currentType = ((QualifiedNameable) e.getEnclosingElement()).getQualifiedName().toString();
+        } else currentType = null;
+
+        // Find the annotation.
+        AnnotationMirror providedMirror = null, providesMirror = null, serviceMirror = null;
+        for (AnnotationMirror m :  elements.getAllAnnotationMirrors(e)) {
+            switch (m.getAnnotationType().toString()) {
+                case "com.jetbrains.exported.JBRApi.Provided" -> providedMirror = m;
+                case "com.jetbrains.exported.JBRApi.Provides" -> providesMirror = m;
+                case "com.jetbrains.exported.JBRApi.Service"  -> serviceMirror  = m;
+            }
+        }
+
+        AnnotationMirror mirror = null;
+        AnnotationValue value = null;
+        Binding binding = null;
+        if (serviceMirror != null) {
+            if (providesMirror == null) {
+                trees.printMessage(Diagnostic.Kind.ERROR,
+                        "@Service also requires @Provides", trees.getTree(e, serviceMirror), root);
+                return;
+            }
+            if (providedMirror != null) {
+                trees.printMessage(Diagnostic.Kind.ERROR,
+                        "@Service cannot be used with @Provided", trees.getTree(e, serviceMirror), root);
+                return;
+            }
+            value = annotationValue(mirror = providesMirror);
+            binding = Binding.SERVICE;
+        } else if (providesMirror != null) {
+            value = annotationValue(mirror = providesMirror);
+            if (providedMirror != null) {
+                AnnotationValue v = annotationValue(providedMirror);
+                if (!value.getValue().toString().equals(v.getValue().toString())) {
+                    trees.printMessage(Diagnostic.Kind.ERROR,
+                            "@Provided and @Provides doesn't match", trees.getTree(e, mirror, value), root);
+                    return;
+                }
+                binding = Binding.TWO_WAY;
+            } else binding = Binding.PROVIDES;
+        } else if (providedMirror != null) {
+            value = annotationValue(mirror = providedMirror);
+            binding = Binding.PROVIDED;
+        }
+
+        if (value != null && value.getValue().toString().isEmpty()) {
+            trees.printMessage(Diagnostic.Kind.ERROR,
+                    "Empty JBR API binding",
+                    trees.getTree(e, mirror, value), root);
+            return;
+        }
+
+        if (currentType == null) {
+            if (value != null) {
+                trees.printMessage(Diagnostic.Kind.ERROR,
+                        "JBR API annotations are only allowed on classes, interfaces and static methods",
+                        trees.getTree(e, mirror), root);
+            }
+            return;
+        }
+        if (value != null && e.getKind() == ElementKind.METHOD && binding != Binding.PROVIDES) {
+            trees.printMessage(Diagnostic.Kind.ERROR,
+                    "Only @Provides is allowed for static methods",
+                    trees.getTree(e, mirror), root);
+            return;
+        }
+
+        // Determine class/method names.
+        String bindType = null, bindMethod = null;
+        if (value != null) {
+            bindType = value.getValue().toString();
+            if (e.getKind() == ElementKind.METHOD) {
+                int splitIndex = bindType.indexOf('#');
+                if (splitIndex != -1) {
+                    bindMethod = bindType.substring(splitIndex + 1);
+                    bindType = bindType.substring(0, splitIndex);
+                    if (!isJavaIdentifier(bindMethod)) {
+                        trees.printMessage(Diagnostic.Kind.ERROR, "Invalid method identifier: " + bindMethod,
+                                trees.getTree(e, mirror, value), root);
+                        return;
+                    }
+                } else bindMethod = e.getSimpleName().toString();
+            }
+            if (!isJavaTypeIdentifier(bindType)) {
+                trees.printMessage(Diagnostic.Kind.ERROR, "Invalid type identifier: " + bindType,
+                        trees.getTree(e, mirror, value), root);
+                return;
+            }
+            if (Character.isUpperCase(bindType.charAt(0))) bindType = "com.jetbrains." + bindType; // Short form
+        }
+
+        // Add entry.
+        DiagnosticTree diagnostic = new DiagnosticTree(root, trees.getTree(e, mirror, value));
+        if (e.getKind() == ElementKind.METHOD) {
+            ExecutableElement m = (ExecutableElement) e;
+            methodBindings.add(new MethodBinding(diagnostic, m, staticDescriptor(currentType, m),
+                    bindType == null ? null : new Registry.StaticMethod(bindType, bindMethod)));
+        } else {
+            typeBindings.put(currentType, new TypeBinding(diagnostic, (TypeElement) e, currentType, bindType, binding));
+        }
+    }
+
+    @Override
+    public String getName() {
+        return "jbr-api";
+    }
+
+    @Override
+    public void init(JavacTask jt, String... args) {
+        Path output = Path.of(args[0]);
+        String implVersion;
+        try {
+            implVersion = Files.readString(Path.of(args[1])).strip();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        elements = jt.getElements();
+        trees = Trees.instance(jt);
+        types = jt.getTypes();
+        jt.addTaskListener(new TaskListener() {
+            @Override
+            public void finished(TaskEvent te) {
+                if (te.getKind() == TaskEvent.Kind.ANALYZE && te.getTypeElement() != null) {
+                    new ElementScanner14<Void, CompilationUnitTree>() {
+                        @Override
+                        public Void visitModule(ModuleElement e, CompilationUnitTree unused) { return null; }
+                        @Override
+                        public Void visitPackage(PackageElement e, CompilationUnitTree unused) { return null; }
+                        @Override
+                        public Void scan(Element e, CompilationUnitTree root) {
+                            JBRApiPlugin.this.scan(root, e);
+                            e.accept(this, root);
+                            return null;
+                        }
+                    }.scan(te.getTypeElement(), te.getCompilationUnit());
+                } else if (te.getKind() == TaskEvent.Kind.COMPILATION) {
+                    try (RandomAccessFile file = new RandomAccessFile(output.toFile(), "rw");
+                         FileChannel channel = file.getChannel()) {
+                        for (;;) {
+                            try { if (channel.lock() != null) break; } catch (OverlappingFileLockException ignore) {}
+                            LockSupport.parkNanos(10_000000);
+                        }
+                        Registry r = new Registry();
+                        r.read(file);
+                        var unresolvedErrors = r.addBindings();
+                        file.setLength(0);
+                        file.writeBytes("VERSION " + implVersion + "\n");
+                        r.write(file);
+                        if (!unresolvedErrors.isEmpty()) {
+                            throw new RuntimeException(String.join("\n", unresolvedErrors));
+                        }
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        });
+    }
+}

make/jdk/src/classes/build/tools/tzdb/TzdbZoneRulesCompiler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -273,7 +273,7 @@ public final class TzdbZoneRulesCompiler {
             // link version-region-rules
             out.writeShort(builtZones.size());
             for (Map.Entry<String, ZoneRules> entry : builtZones.entrySet()) {
-                 int regionIndex = Arrays.binarySearch(regionArray, entry.getKey());
+                 int regionIndex = findRegionIndex(regionArray, entry.getKey());
                  int rulesIndex = rulesList.indexOf(entry.getValue());
                  out.writeShort(regionIndex);
                  out.writeShort(rulesIndex);
@@ -281,8 +281,8 @@ public final class TzdbZoneRulesCompiler {
             // alias-region
             out.writeShort(links.size());
             for (Map.Entry<String, String> entry : links.entrySet()) {
-                 int aliasIndex = Arrays.binarySearch(regionArray, entry.getKey());
-                 int regionIndex = Arrays.binarySearch(regionArray, entry.getValue());
+                 int aliasIndex = findRegionIndex(regionArray, entry.getKey());
+                 int regionIndex = findRegionIndex(regionArray, entry.getValue());
                  out.writeShort(aliasIndex);
                  out.writeShort(regionIndex);
             }
@@ -294,6 +294,14 @@ public final class TzdbZoneRulesCompiler {
         }
     }
 
+    private static int findRegionIndex(String[] regionArray, String region) {
+        int index = Arrays.binarySearch(regionArray, region);
+        if (index < 0) {
+            throw new IllegalArgumentException("Unknown region: " + region);
+        }
+        return index;
+    }
+
     /** Whether to output verbose messages. */
     private boolean verbose;
 

make/jdk/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -164,7 +164,8 @@ class TzdbZoneRulesProvider {
                         }
                         continue;
                     }
-                    if (line.startsWith("Zone")) {        // parse Zone line
+                    int token0len = tokens.length > 0 ? tokens[0].length() : line.length();
+                    if (line.regionMatches(true, 0, "Zone", 0, token0len)) {        // parse Zone line
                         String name = tokens[1];
                         if (excludedZones.contains(name)){
                             continue;
@@ -182,13 +183,13 @@ class TzdbZoneRulesProvider {
                         if (zLine.parse(tokens, 2)) {
                             openZone = null;
                         }
-                    } else if (line.startsWith("Rule")) { // parse Rule line
+                    } else if (line.regionMatches(true, 0, "Rule", 0, token0len)) { // parse Rule line
                         String name = tokens[1];
                         if (!rules.containsKey(name)) {
                             rules.put(name, new ArrayList<RuleLine>(10));
                         }
                         rules.get(name).add(new RuleLine().parse(tokens));
-                    } else if (line.startsWith("Link")) { // parse link line
+                    } else if (line.regionMatches(true, 0, "Link", 0, token0len)) { // parse link line
                         if (tokens.length >= 3) {
                             String realId = tokens[1];
                             String aliasId = tokens[2];
@@ -304,7 +305,7 @@ class TzdbZoneRulesProvider {
             month = parseMonth(tokens[off++]);
             if (off < tokens.length) {
                 String dayRule = tokens[off++];
-                if (dayRule.startsWith("last")) {
+                if (dayRule.regionMatches(true, 0, "last", 0, 4)) {
                     dayOfMonth = -1;
                     dayOfWeek = parseDayOfWeek(dayRule.substring(4));
                     adjustForwards = false;
@@ -355,42 +356,45 @@ class TzdbZoneRulesProvider {
         }
 
         int parseYear(String year, int defaultYear) {
-            switch (year.toLowerCase()) {
-            case "min":  return 1900;
-            case "max":  return Year.MAX_VALUE;
-            case "only": return defaultYear;
-            }
+            int len = year.length();
+
+            if (year.regionMatches(true, 0, "minimum", 0, len)) return 1900;
+            if (year.regionMatches(true, 0, "maximum", 0, len)) return Year.MAX_VALUE;
+            if (year.regionMatches(true, 0, "only", 0, len)) return defaultYear;
+
             return Integer.parseInt(year);
         }
 
         Month parseMonth(String mon) {
-            switch (mon) {
-            case "Jan": return Month.JANUARY;
-            case "Feb": return Month.FEBRUARY;
-            case "Mar": return Month.MARCH;
-            case "Apr": return Month.APRIL;
-            case "May": return Month.MAY;
-            case "Jun": return Month.JUNE;
-            case "Jul": return Month.JULY;
-            case "Aug": return Month.AUGUST;
-            case "Sep": return Month.SEPTEMBER;
-            case "Oct": return Month.OCTOBER;
-            case "Nov": return Month.NOVEMBER;
-            case "Dec": return Month.DECEMBER;
-            }
+            int len = mon.length();
+
+            if (mon.regionMatches(true, 0, "January", 0, len)) return Month.JANUARY;
+            if (mon.regionMatches(true, 0, "February", 0, len)) return Month.FEBRUARY;
+            if (mon.regionMatches(true, 0, "March", 0, len)) return Month.MARCH;
+            if (mon.regionMatches(true, 0, "April", 0, len)) return Month.APRIL;
+            if (mon.regionMatches(true, 0, "May", 0, len)) return Month.MAY;
+            if (mon.regionMatches(true, 0, "June", 0, len)) return Month.JUNE;
+            if (mon.regionMatches(true, 0, "July", 0, len)) return Month.JULY;
+            if (mon.regionMatches(true, 0, "August", 0, len)) return Month.AUGUST;
+            if (mon.regionMatches(true, 0, "September", 0, len)) return Month.SEPTEMBER;
+            if (mon.regionMatches(true, 0, "October", 0, len)) return Month.OCTOBER;
+            if (mon.regionMatches(true, 0, "November", 0, len)) return Month.NOVEMBER;
+            if (mon.regionMatches(true, 0, "December", 0, len)) return Month.DECEMBER;
+
             throw new IllegalArgumentException("Unknown month: " + mon);
         }
 
         DayOfWeek parseDayOfWeek(String dow) {
-            switch (dow) {
-            case "Mon": return DayOfWeek.MONDAY;
-            case "Tue": return DayOfWeek.TUESDAY;
-            case "Wed": return DayOfWeek.WEDNESDAY;
-            case "Thu": return DayOfWeek.THURSDAY;
-            case "Fri": return DayOfWeek.FRIDAY;
-            case "Sat": return DayOfWeek.SATURDAY;
-            case "Sun": return DayOfWeek.SUNDAY;
-            }
+            int len = dow.length();
+
+            if (dow.regionMatches(true, 0, "Monday", 0, len)) return DayOfWeek.MONDAY;
+            if (dow.regionMatches(true, 0, "Tuesday", 0, len)) return DayOfWeek.TUESDAY;
+            if (dow.regionMatches(true, 0, "Wednesday", 0, len)) return DayOfWeek.WEDNESDAY;
+            if (dow.regionMatches(true, 0, "Thursday", 0, len)) return DayOfWeek.THURSDAY;
+            if (dow.regionMatches(true, 0, "Friday", 0, len)) return DayOfWeek.FRIDAY;
+            if (dow.regionMatches(true, 0, "Saturday", 0, len)) return DayOfWeek.SATURDAY;
+            if (dow.regionMatches(true, 0, "Sunday", 0, len)) return DayOfWeek.SUNDAY;
+
             throw new IllegalArgumentException("Unknown day-of-week: " + dow);
         }
 

make/modules/java.base/Launcher.gmk

@@ -78,7 +78,8 @@ ifeq ($(call isTargetOs, macosx aix linux), true)
       NAME := jspawnhelper, \
       SRC := $(TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKEXE) -I$(TOPDIR)/src/$(MODULE)/unix/native/libjava, \
+      CFLAGS := $(CFLAGS_JDKEXE) $(VERSION_CFLAGS) \
+          -I$(TOPDIR)/src/$(MODULE)/unix/native/libjava, \
       EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc$(OBJ_SUFFIX), \
       LDFLAGS := $(LDFLAGS_JDKEXE), \
       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \

make/modules/java.base/lib/CoreLibraries.gmk

@@ -59,8 +59,10 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(LIBJAVA_CFLAGS), \
     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
+    ProcessImpl_md.c_CFLAGS := $(VERSION_CFLAGS), \
     WARNINGS_AS_ERRORS_xlc := false, \
     DISABLED_WARNINGS_gcc_ProcessImpl_md.c := unused-result, \
+    DISABLED_WARNINGS_clang_jni_util.c := format-nonliteral, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \