8333743: Change .jcheck/conf branches property to match valid branches

Reviewed-by: iris, erikj Backport-of: 2a37764e74
2026-01-03 07:01:40 +01:00 · 2024-06-06 22:07:16 +00:00
24867 changed files with 913065 additions and 1714332 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,14 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-
-[*.{cpp,hpp,c,h,java,cc,hh,m,mm,S,md,properties,gmk,m4,ac}]
-trim_trailing_whitespace = true
-
-[Makefile]
-trim_trailing_whitespace = true
-
-[src/hotspot/**.{cpp,hpp,h}]
-indent_style = space
-indent_size = 2
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,4 @@
 *	-text
-*	encoding=utf-8
 *.java	diff=java
 *.c	diff=cpp
 *.h	diff=cpp
--- a/.github/README.md
+++ b/.github/README.md
@@ -1,271 +0,0 @@
-[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
-
-# Welcome to JetBrains Runtime!
-
-JetBrains Runtime is a fork of [OpenJDK](https://github.com/openjdk/jdk) available for Windows, Mac OS X, and Linux.
-It supports enhanced class redefinition ([DCEVM](https://ssw.jku.at/dcevm/)),
-features optional [JCEF](https://github.com/JetBrains/jcef), a framework for embedding Chromium-based browsers,
-includes a number of improvements in font rendering, keyboards support,
-windowing/focus subsystems, HiDPI, accessibility, and performance, provides better desktop integration
-and bugfixes not yet present in OpenJDK.
-
-> **_NOTE_**: This is a **development** branch that is periodically synchronized with
-> the [OpenJDK master](https://github.com/openjdk/jdk/tree/master) branch.
->
- Release builds are based on these branches:
- * [jbr25](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr25) (JDK 25)
- * [jbr21](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr21) (JDK 21)
- * [jbr17](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr17) (JDK 17)
- * [jbr11](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr11) (JDK 11)
- 
-Download the latest releases of JetBrains Runtime to use with JetBrains IDEs. The full list
-can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntime/releases).
-
-## Releases based on JDK 25
-
-| IDE Version | Latest JBR                                                                                              | Date Released |
-|-------------|---------------------------------------------------------------------------------------------------------|---------------|
-| 2025.3      | [25-b176.4](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-25b176.4)            | 23-Oct-2025   |
-
-## Releases based on JDK 21
-
-| IDE Version | Latest JBR                                                                                              | Date Released |
-|-------------|---------------------------------------------------------------------------------------------------------|---------------|
-| 2025.3      | [21.0.8-b1163.69](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.8b1163.69)| 27-Oct-2025   |
-| 2025.2      | [21.0.9-b1038.75](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.9b1038.75)| 02-Nov-2025   |
-| 2025.1      | [21.0.9-b895.147](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.9b895.147)| 02-Nov-2025   |
-| 2024.3      | [21.0.6-b631.52](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b631.52)  | 15-May-2025   |
-| 2024.2      | [21.0.4-b509.40](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b509.40)  | 15-May-2025   |
-| 2024.1      | [21.0.2-b346.3](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.2b346.3)    | 30-Jan-2024   |
-
-## Releases based on JDK 17
-
-| IDE Version | Latest JBR                                                                                             | Date Released |
-|-------------|--------------------------------------------------------------------------------------------------------|---------------|
-| 2024.2      | [17.0.11-b1312.2](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.11b1312.2)   | 18-Jun-2024|
-| 2024.1      | [17.0.12-b1207.37](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1207.37) | 15-Oct-2024|
-| 2023.3      | [17.0.12-b1087.25](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1087.25) | 02-Sep-2024|
-| 2023.2      | [17.0.12-b1000.54](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1000.54) | 02-Sep-2024|
-| 2023.1      | [17.0.10-b829.27](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.10b829.27) | 21-Mar-2024  |
-| 2022.3      | [17.0.6-b653.34](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b653.34) | 28-Feb-2023   |
-| 2022.2      | [17.0.6-b469.82](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b469.82) | 06-Mar-2023   |
-
-## Releases based on JDK 11
-
-| IDE Version | Latest JBR                                                                                            | Date Released |
-|-------------|-------------------------------------------------------------------------------------------------------|---------------|
-| 2022.1      | [11_0_16-b2043.64](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr11_0_16b2043.64)     | 10-Nov-2022   |
-| 2021.3      | [11_0_14_1-b1751.46](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr11_0_14_1b1751.46) | 21-Feb-2022   |
-| 2021.2      | [11_0_13-b1504.49](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jb11_0_13-b1504.49)     | 15-Nov-2021   |
-| 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)
-  - [Products Built on JetBrains Runtime](#products-built-on-jetbrains-runtime)
-  - [Getting Sources](#getting-sources)
-    - [macOS, Linux](#macos-linux)
-    - [Windows](#sources-windows)
-  - [Configuring the Build Environment](#configuring-the-build-environment)
-    - [Linux (Docker)](#linux-docker)
-    - [Ubuntu Linux](#ubuntu-linux)
-    - [Windows](#build-windows)
-    - [macOS](#macos)
-  - [Developing](#developing)
-  - [Contributing](#contributing)
-  - [Resources](#resources)
-
-## Why Use JetBrains Runtime?
-* **Embedded browser**: JetBrains Runtime includes the Java Chromium Embedded Framework ([JCEF](https://github.com/JetBrains/jcef)), which
-  enables you to embed a Chromium-based browsers in your JVM-based application.
- To use it, [download a build with JCEF](https://github.com/JetBrains/JetBrainsRuntime/releases).
-* **Enhanced class re-definition** with the [DCEVM](https://ssw.jku.at/dcevm/) technology that makes it easier to reload
-  changed code without restarting JVM; this feature needs to be explicitly enabled with `-XX:+AllowEnhancedClassRedefinition`.
-* **Better FPS performance** for graphics-intensive applications.
-* **Improved font rendering**, **keyboard input** (such as shortcuts and multinational keyboards),
-  **HiDPI** and **accessibility** support.
-* **Robust desktop experience**: GUI-related fixes often reach JetBrains Runtime much earlier than the corresponding version of OpenJDK.
-* Additional capabilities that are made available to applications through
-  [JBR API](https://github.com/JetBrains/JetBrainsRuntimeApi) services such as, for example, 
-  the ability to wrap a native graphics texture into `java.awt.Image`.
-
-## Products Built on JetBrains Runtime
-* [Android Studio](https://developer.android.com/studio). The official IDE for Google's Android operating system.
-* [CLion](https://www.jetbrains.com/clion/). A cross-platform IDE for C and C++ from JetBrains.
-* [DataGrip](https://www.jetbrains.com/datagrip/). The IDE for Databases and SQL from JetBrains.
-* [GoLand](https://www.jetbrains.com/go/). The cross-platform Go IDE from JetBrains.
-* [IntelliJ IDEA](https://www.jetbrains.com/idea/). The IDE for JVM from JetBrains.
-* [JProfiler](https://www.ej-technologies.com/products/jprofiler/overview.html). The Java profiler.
-* [PhpStorm](https://www.jetbrains.com/phpstorm/). The PHP IDE from JetBrains.
-* [PyCharm](https://www.jetbrains.com/pycharm/). The Python IDE from JetBrains.
-* [Rider](https://www.jetbrains.com/rider/). The cross-platform .NET IDE from JetBrains.
-* [RubyMine](https://www.jetbrains.com/ruby/). The Ruby and Rails IDE from JetBrains.
-* [Toolbox App](https://www.jetbrains.com/toolbox-app/). JetBrains IDE manager.
-* [WebStorm](https://www.jetbrains.com/webstorm/). The JavaScript IDE from JetBrains.
-* [YourKit](https://www.yourkit.com/). Java and .NET profilers.
-
-## Getting Sources
-### macOS, Linux
-```
-git config --global core.autocrlf input
-git clone git@github.com:JetBrains/JetBrainsRuntime.git
-```
-
-### Windows
-<a name="sources-windows"></a>
-```
-git config --global core.autocrlf false
-git clone git@github.com:JetBrains/JetBrainsRuntime.git
-```
-
-## Configuring the Build Environment
-Here are quick per-platform instructions for those who can't wait to get started.
-Please refer to [OpenJDK build docs](https://openjdk.java.net/groups/build/doc/building.html) for in-depth
-coverage of all the details.
-
-> **_TIP:_**  To get a preliminary report of what's missing, run `./configure` and check its output.
-> It would usually have meaningful advice on how to solve the problem.
-
-### Linux (Docker)
-Download an image from [Docker Hub](https://hub.docker.com/repository/docker/jetbrains/runtime/general) related to your architecture:
-```
-$ docker pull jetbrains/runtime:oraclelinux8_aarch64
-```
-or
-```
-$ 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:
-```
-# cd /JetBrainsRuntime
-# sh ./configure
-# make images
-```
-
-### Ubuntu Linux
-Install the necessary tools, libraries, and headers with:
-```
-$ sudo apt-get install 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 \
-       wayland-protocols libxkbcommon-x11-0 libdbus-1-dev
-```
-Get Java 23 (for instance, [Azul Zulu Builds of OpenJDK 23](https://www.azul.com/downloads/?version=java-23&os=linux&package=jdk#zulu)).
-
-Then run the following:
-```
-$ cd JetBrainsRuntime
-$ git checkout main
-$ sh ./configure
-$ make images
-```
-This will build the release configuration under `./build/linux-x86_64-server-release/`.
-
-### Windows
-<a name="build-windows"></a>
-Install the following:
-* [Cygwin x64](http://www.cygwin.com/).
-  Required packages: `autoconf`, `binutils`, `cpio`, `diffutils`, `file`, `gawk`, `gcc-core`, `make`, `m4`, `unzip`, `zip`.
-  Install those together with Cygwin.
-* [Visual Studio compiler toolset](https://visualstudio.microsoft.com/downloads/).
-  Install with the desktop development kit, which includes Windows SDK and compilers.
-  Visual Studio 2019 is supported by default.
-* Java 21 (for instance, [Azul Zulu Builds of OpenJDK 21](https://www.azul.com/downloads/?version=java-21-lts&os=windows&package=jdk#zulu)).
-  If you have problems while configuring, read [Java tips on Cygwin](http://horstmann.com/articles/cygwin-tips.html).
-
-From the command line:
-```
-"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-"c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
-```
-The first command sets up environment variables, the second starts a Cygwin shell with the proper environment.
-
-In the Cygwin shell:
-```
-$ cd JetBrainsRuntime
-$ git checkout main
-$ bash configure --with-toolchain-version=2019
-$ 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/).
-* Java 21 (for instance, [Azul Zulu Builds of OpenJDK 21](https://www.azul.com/downloads/?version=java-21-lts&os=macos&package=jdk#zulu)).
-
-From the command line:
-```
-$ cd JetBrainsRuntime
-$ git checkout main
-$ sh ./configure
-$ make images
-```
-This will build the release configuration under `./build/macosx-x86_64-server-release/`.
-
-## Developing
-You can use  [CLion](https://www.jetbrains.com/clion/) to develop native parts of the JetBrains Runtime and
-[IntelliJ IDEA](https://www.jetbrains.com/idea/) for the parts written in Java.
-Both require projects to be created.
-
-### CLion
-Run
-```
-$ make compile-commands
-```
-in the git root and open the resulting `build/.../compile_commands.json` file as a project.
-Then use `Tools | Compilation Database | Change Project Root` to point to git root of this repository.
-
-See also this detailed step-by-step tutorial for all platforms:
-[How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).
-
-### IDEA
-Run
-```
-$ sh ./bin/idea.sh
-```
-in the git root to generate project files (add `--help` for options). If you have multiple
-configurations (for example, `release` and `fastdebug`), supply the `--conf <conf_name>` argument.
-Then open the git root directory as a project in IDEA.
-
-## Contributing
-Please contribute your changes through [OpenJDK](https://dev.java/contribute/openjdk/).
-
-## Resources
-* [JetBrains Runtime on GitHub](https://github.com/JetBrains/JetBrainsRuntime).
-* [OpenJDK build instructions](https://openjdk.java.net/groups/build/doc/building.html).
-* [OpenJDK test instructions](https://htmlpreview.github.io/?https://raw.githubusercontent.com/openjdk/jdk/master/doc/building.html#running-tests).
-* [How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).
--- a/.github/actions/build-jtreg/action.yml
+++ b/.github/actions/build-jtreg/action.yml
@@ -1,68 +0,0 @@
-#
-# 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: 5
--- a/.github/actions/config/action.yml
+++ b/.github/actions/config/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 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
@@ -41,6 +41,6 @@ runs:
      id: read-config
      run: |
        # Extract value from configuration file
-        value="$(grep -h '^${{ inputs.var }}'= make/conf/github-actions.conf | cut -d '=' -f 2-)"
+        value="$(grep -h ${{ inputs.var }}= make/conf/github-actions.conf | cut -d '=' -f 2-)"
        echo "value=$value" >> $GITHUB_OUTPUT
      shell: bash
--- a/.github/actions/do-build/action.yml
+++ b/.github/actions/do-build/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 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
@@ -42,7 +42,7 @@ runs:
    - name: 'Build'
      id: build
      run: >
-        make -k LOG=info ${{ inputs.make-target }}
+        make LOG=info ${{ inputs.make-target }}
        || bash ./.github/scripts/gen-build-failure-report.sh "$GITHUB_STEP_SUMMARY"
      shell: bash

--- a/.github/actions/get-bootjdk/action.yml
+++ b/.github/actions/get-bootjdk/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, 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
--- a/.github/actions/get-bundles/action.yml
+++ b/.github/actions/get-bundles/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 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,16 +32,10 @@ inputs:
  debug-suffix:
    description: 'File name suffix denoting debug level, possibly empty'
    required: false
-  static-suffix:
-    description: 'Static bundle file name suffix'
-    required: false
 outputs:
  jdk-path:
    description: 'Path to the installed JDK bundle'
    value: ${{ steps.path-name.outputs.jdk }}
-  static-jdk-path:
-    description: 'Path to the installed static JDK bundle'
-    value: ${{ steps.path-name.outputs.static_jdk }}
  symbols-path:
    description: 'Path to the installed symbols bundle'
    value: ${{ steps.path-name.outputs.symbols }}
@@ -67,15 +61,6 @@ runs:
        path: bundles
      if: steps.download-bundles.outcome == 'failure'

-    - name: 'Download static bundles artifact'
-      id: download-static-bundles
-      uses: actions/download-artifact@v4
-      with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}
-        path: bundles
-      continue-on-error: true
-      if: ${{ inputs.static-suffix == '-static' }}
-
    - name: 'Unpack bundles'
      run: |
        if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip ]]; then
@@ -90,20 +75,6 @@ runs:
          tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/jdk
        fi

-        if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
-          if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip ]]; then
-            echo 'Unpacking static jdk bundle...'
-            mkdir -p bundles/static-jdk
-            unzip -q bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip -d bundles/static-jdk
-          fi
-
-          if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz ]]; then
-            echo 'Unpacking static jdk bundle...'
-            mkdir -p bundles/static-jdk
-            tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz -C bundles/static-jdk
-          fi
-        fi
-
        if [[ -e bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
          echo 'Unpacking symbols bundle...'
          mkdir -p bundles/symbols
@@ -135,12 +106,4 @@ runs:
        echo "jdk=$jdk_dir" >> $GITHUB_OUTPUT
        echo "symbols=$symbols_dir" >> $GITHUB_OUTPUT
        echo "tests=$tests_dir" >> $GITHUB_OUTPUT
-
-        if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
-          static_jdk_dir="$GITHUB_WORKSPACE/$(dirname $(find bundles/static-jdk -name bin -type d))"
-          if [[ '${{ runner.os }}' == 'Windows' ]]; then
-            static_jdk_dir="$(cygpath $static_jdk_dir)"
-          fi
-          echo "static_jdk=$static_jdk_dir" >> $GITHUB_OUTPUT
-        fi
      shell: bash
--- a/.github/actions/get-gtest/action.yml
+++ b/.github/actions/get-gtest/action.yml
@@ -49,6 +49,6 @@ runs:
    - name: 'Export path to where GTest is installed'
      id: path-name
      run: |
-        # Export the absolute path
-        echo "path=`pwd`/gtest" >> $GITHUB_OUTPUT
+        # Export the path
+        echo 'path=gtest' >> $GITHUB_OUTPUT
      shell: bash
--- a/.github/actions/get-jtreg/action.yml
+++ b/.github/actions/get-jtreg/action.yml
@@ -24,7 +24,7 @@
 #

 name: 'Get JTReg'
-description: 'Get JTReg'
+description: 'Download JTReg from cache or source location'
 outputs:
  path:
    description: 'Path to the installed JTReg'
@@ -39,16 +39,40 @@ runs:
      with:
        var: JTREG_VERSION

-    - name: 'Download JTReg artifact'
-      id: download-jtreg
-      uses: actions/download-artifact@v4
+    - name: 'Check cache for JTReg'
+      id: get-cached-jtreg
+      uses: actions/cache@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: |
+        # If runner architecture is x64 set JAVA_HOME_17_X64 otherwise set to JAVA_HOME_17_arm64
+        if [[ '${{ runner.arch }}' == 'X64' ]]; then
+          JDK="$JAVA_HOME_17_X64"
+        else
+          JDK="$JAVA_HOME_17_arm64"
+        fi
+        # Build JTReg and move files to the proper locations
+        bash make/build.sh --jdk "$JDK"
+        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
      run: |
-        # Export the absolute path
-        echo "path=`pwd`/jtreg/installed" >> $GITHUB_OUTPUT
+        # Export the path
+        echo 'path=jtreg/installed' >> $GITHUB_OUTPUT
      shell: bash
--- a/.github/actions/get-msys2/action.yml
+++ b/.github/actions/get-msys2/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, 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
@@ -30,15 +30,15 @@ runs:
  using: composite
  steps:
    - name: 'Install MSYS2'
-      id: msys2
-      uses: msys2/setup-msys2@v2.28.0
+      uses: msys2/setup-msys2@v2.22.0
      with:
        install: 'autoconf tar unzip zip make'
        path-type: minimal
-        release: false
+        location: ${{ runner.tool_cache }}/msys2

      # We can't run bash until this is completed, so stick with pwsh
    - name: 'Set MSYS2 path'
      run: |
-        echo "${{ steps.msys2.outputs.msys2-location }}/usr/bin" >> $env:GITHUB_PATH
+        # Prepend msys2/msys64/usr/bin to the PATH
+        echo "$env:RUNNER_TOOL_CACHE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
      shell: pwsh
--- a/.github/actions/upload-bundles/action.yml
+++ b/.github/actions/upload-bundles/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 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,12 +32,6 @@ inputs:
  debug-suffix:
    description: 'File name suffix denoting debug level, possibly empty'
    required: false
-  bundle-suffix:
-    description: 'Bundle name suffix, possibly empty'
-    required: false
-  static-suffix:
-    description: 'Static JDK bundle name suffix, possibly empty'
-    required: false

 runs:
  using: composite
@@ -49,11 +43,8 @@ runs:
        # Rename bundles to consistent names
        jdk_bundle_zip="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
        jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
-        static_jdk_bundle_zip="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
-        static_jdk_bundle_tar_gz="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
        symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
        tests_bundle="$(ls build/*/bundles/jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
-        static_libs_bundle="$(ls build/*/bundles/jdk-*_bin-static-libs${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"

        mkdir bundles

@@ -63,23 +54,14 @@ runs:
        if [[ "$jdk_bundle_tar_gz" != "" ]]; then
          mv "$jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
        fi
-        if [[ "$static_jdk_bundle_zip" != "" ]]; then
-          mv "$static_jdk_bundle_zip" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip"
-        fi
-        if [[ "$static_jdk_bundle_tar_gz" != "" ]]; then
-          mv "$static_jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz"
-        fi
        if [[ "$symbols_bundle" != "" ]]; then
          mv "$symbols_bundle" "bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
        fi
        if [[ "$tests_bundle" != "" ]]; then
          mv "$tests_bundle" "bundles/tests-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
        fi
-        if [[ "$static_libs_bundle" != "" ]]; then
-          mv "$static_libs_bundle" "bundles/static-libs-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
-        fi

-        if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$static_jdk_bundle_zip$static_jdk_bundle_tar_gz$symbols_bundle$tests_bundle$static_libs_bundle" != "" ]]; then
+        if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle" != "" ]]; then
          echo 'bundles-found=true' >> $GITHUB_OUTPUT
        else
          echo 'bundles-found=false' >> $GITHUB_OUTPUT
@@ -89,7 +71,7 @@ runs:
    - name: 'Upload bundles artifact'
      uses: actions/upload-artifact@v4
      with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}${{ inputs.bundle-suffix }}
+        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
        path: bundles
-        retention-days: 5
+        retention-days: 1
      if: steps.bundles.outputs.bundles-found == 'true'
--- a/.github/scripts/gen-build-failure-report.sh
+++ b/.github/scripts/gen-build-failure-report.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 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,19 +24,12 @@
 # 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 ''
@@ -53,20 +46,6 @@ hs_err_files=$(ls make/hs_err*.log 2> /dev/null || true)
  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
--- a/.github/scripts/gen-test-results.sh
+++ b/.github/scripts/gen-test-results.sh
@@ -24,9 +24,6 @@
 # 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)
@@ -92,6 +89,18 @@ for test in $failures $errors; do
  fi
 done >> $GITHUB_STEP_SUMMARY

-echo ':arrow_right: To see the entire test log, click the job in the list to the left.'  >> $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

-truncate_summary
+echo ':arrow_right: To see the entire test log, click the job in the list to the left.'  >> $GITHUB_STEP_SUMMARY
--- a/.github/scripts/gen-test-summary.sh
+++ b/.github/scripts/gen-test-summary.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 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
--- a/.github/scripts/report-utils.sh
+++ b/.github/scripts/report-utils.sh
@@ -1,41 +0,0 @@
-#!/bin/bash
-#
-# 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.  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.
-#
-
-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
-}
--- a/.github/workflows/build-alpine-linux.yml
+++ b/.github/workflows/build-alpine-linux.yml
@@ -1,118 +0,0 @@
-#
-# 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.  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 (alpine-linux)'
-
-on:
-  workflow_call:
-    inputs:
-      platform:
-        required: true
-        type: string
-      extra-conf-options:
-        required: false
-        type: string
-      make-target:
-        required: false
-        type: string
-        default: 'product-bundles test-bundles'
-      debug-levels:
-        required: false
-        type: string
-        default: '[ "debug", "release" ]'
-      apk-extra-packages:
-        required: false
-        type: string
-      configure-arguments:
-        required: false
-        type: string
-      make-arguments:
-        required: false
-        type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
-
-jobs:
-  build-linux:
-    name: build
-    runs-on: ubuntu-22.04
-    container:
-      image: alpine:3.20
-
-    strategy:
-      fail-fast: false
-      matrix:
-        debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug+
-
-    steps:
-      - name: 'Checkout the JDK source'
-        uses: actions/checkout@v4
-
-      - name: 'Install toolchain and dependencies'
-        run: |
-          apk update
-          apk add alpine-sdk alsa-lib-dev autoconf bash cups-dev cups-libs fontconfig-dev freetype-dev grep libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev libxtst-dev linux-headers wget zip ${{ inputs.apk-extra-packages }}
-
-      - name: 'Get the BootJDK'
-        id: bootjdk
-        uses: ./.github/actions/get-bootjdk
-        with:
-          platform: alpine-linux-x64
-
-      - name: 'Configure'
-        run: >
-          bash configure
-          --with-conf-name=${{ inputs.platform }}
-          ${{ matrix.flags }}
-          --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
-          --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
-          --with-zlib=system
-          --with-jmod-compress=zip-1
-          ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
-          echo "Dumping config.log:" &&
-          cat config.log &&
-          exit 1)
-
-      - name: 'Build'
-        id: build
-        uses: ./.github/actions/do-build
-        with:
-          make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}
-
-      - name: 'Upload bundles'
-        uses: ./.github/actions/upload-bundles
-        with:
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}
--- a/.github/workflows/build-cross-compile.yml
+++ b/.github/workflows/build-cross-compile.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, 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
@@ -40,10 +40,6 @@ on:
      make-arguments:
        required: false
        type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false

 jobs:
  build-cross-compile:
@@ -64,33 +60,33 @@ jobs:
            gnu-arch: aarch64
            debian-arch: arm64
            debian-repository: https://httpredir.debian.org/debian/
-            debian-version: trixie
+            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: trixie
+            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: trixie
+            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: trixie
+            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: trixie
-            tolerate-sysroot-errors: false
+            debian-version: sid
+            tolerate-sysroot-errors: true

    steps:
      - name: 'Checkout the JDK source'
@@ -135,7 +131,6 @@ jobs:
        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
@@ -156,9 +151,6 @@ jobs:
          rm -rf sysroot/usr/{sbin,bin,share}
          rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd}
          rm -rf sysroot/usr/libexec/gcc
-          # /{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'
@@ -193,4 +185,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') && inputs.dry-run == false)
+        if: steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true'
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, 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
@@ -61,16 +61,6 @@ on:
      make-arguments:
        required: false
        type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
-      bundle-suffix:
-        required: false
-        type: string
-      static-suffix:
-        required: false
-        type: string

 jobs:
  build-linux:
@@ -81,6 +71,10 @@ jobs:
      fail-fast: false
      matrix:
        debug-level: ${{ fromJSON(inputs.debug-levels) }}
+        include:
+          - debug-level: debug
+            flags: --with-debug-level=fastdebug
+            suffix: -debug

    steps:
      - name: 'Checkout the JDK source'
@@ -124,7 +118,7 @@ jobs:
        run: >
          bash configure
          --with-conf-name=${{ inputs.platform }}
-          ${{ matrix.debug-level == 'debug' && '--with-debug-level=fastdebug' || '' }}
+          ${{ matrix.flags }}
          --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
          --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
          --with-jtreg=${{ steps.jtreg.outputs.path }}
@@ -142,14 +136,10 @@ jobs:
        with:
          make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
          platform: ${{ inputs.platform }}
-          debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
-        if: ${{ inputs.dry-run == false }}
+          debug-suffix: '${{ matrix.suffix }}'

      - name: 'Upload bundles'
        uses: ./.github/actions/upload-bundles
        with:
          platform: ${{ inputs.platform }}
-          debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
-          bundle-suffix: ${{ inputs.bundle-suffix }}
-          static-suffix: ${{ inputs.static-suffix }}
-        if: ${{ inputs.dry-run == false }}
+          debug-suffix: '${{ matrix.suffix }}'
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -54,10 +54,6 @@ on:
      make-arguments:
        required: false
        type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false

 jobs:
  build-macos:
@@ -122,11 +118,9 @@ jobs:
          make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
          platform: ${{ inputs.platform }}
          debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}

      - name: 'Upload bundles'
        uses: ./.github/actions/upload-bundles
        with:
          platform: ${{ inputs.platform }}
          debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -54,10 +54,6 @@ on:
      make-arguments:
        required: false
        type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false

 env:
  # These are needed to make the MSYS2 bash work properly
@@ -67,7 +63,7 @@ env:
 jobs:
  build-windows:
    name: build
-    runs-on: windows-2025
+    runs-on: windows-2019
    defaults:
      run:
        shell: bash
@@ -106,7 +102,7 @@ jobs:
        id: toolchain-check
        run: |
          set +e
-          '/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
+          '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
          if [ $? -eq 0 ]; then
            echo "Toolchain is already installed"
            echo "toolchain-installed=true" >> $GITHUB_OUTPUT
@@ -119,7 +115,7 @@ jobs:
        run: |
          # Run Visual Studio Installer
          '/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
-            modify --quiet --installPath 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' \
+            modify --quiet --installPath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' \
            --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
        if: steps.toolchain-check.outputs.toolchain-installed != 'true'

@@ -143,7 +139,6 @@ jobs:
          # Set PATH to "", so just GITHUB_PATH is included
          PATH: ''
        shell: env /usr/bin/bash --login -eo pipefail {0}
-        if: ${{ inputs.dry-run == false }}

      - name: 'Build'
        id: build
@@ -152,11 +147,9 @@ jobs:
          make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
          platform: ${{ inputs.platform }}
          debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}

      - name: 'Upload bundles'
        uses: ./.github/actions/upload-bundles
        with:
          platform: ${{ inputs.platform }}
          debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,23 +28,21 @@ name: 'OpenJDK GHA Sanity Checks'
 on:
  push:
    branches-ignore:
+      - master
      - pr/*
-      - main
+      - jdk*
  workflow_dispatch:
    inputs:
      platforms:
        description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
        required: true
-        default: 'linux-x64, linux-x64-variants, linux-cross-compile, alpine-linux-x64, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
+        default: 'linux-x64, linux-x86, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
      configure-arguments:
        description: 'Additional configure arguments'
        required: false
      make-arguments:
        description: 'Additional make arguments'
        required: false
-      dry-run:
-        description: 'Dry run: skip actual builds and tests'
-        required: false

 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
@@ -56,38 +54,22 @@ jobs:
  ### Determine platforms to include
  ###

-  prepare:
-    name: 'Prepare the run'
+  select:
+    name: 'Select platforms'
    runs-on: ubuntu-22.04
-    env:
-      # List of platforms to exclude by default
-      EXCLUDED_PLATFORMS: 'alpine-linux-x64'
    outputs:
      linux-x64: ${{ steps.include.outputs.linux-x64 }}
+      linux-x86: ${{ steps.include.outputs.linux-x86 }}
      linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
      linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
-      alpine-linux-x64: ${{ steps.include.outputs.alpine-linux-x64 }}
      macos-x64: ${{ steps.include.outputs.macos-x64 }}
      macos-aarch64: ${{ steps.include.outputs.macos-aarch64 }}
      windows-x64: ${{ steps.include.outputs.windows-x64 }}
      windows-aarch64: ${{ steps.include.outputs.windows-aarch64 }}
      docs: ${{ steps.include.outputs.docs }}
-      dry-run: ${{ steps.include.outputs.dry-run }}

    steps:
-      - 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
+        # This function must be inlined in main.yml, or we'd be forced to checkout the repo
      - name: 'Check what jobs to run'
        id: include
        run: |
@@ -96,10 +78,6 @@ jobs:
          # Returns 'true' if the input platform list matches any of the platform monikers given as argument,
          # 'false' otherwise.
          # arg $1: platform name or names to look for
-
-          # Convert EXCLUDED_PLATFORMS from a comma-separated string to an array
-          IFS=',' read -r -a excluded_array <<< "$EXCLUDED_PLATFORMS"
-
          function check_platform() {
            if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
              input='${{ github.event.inputs.platforms }}'
@@ -116,13 +94,7 @@ jobs:

            normalized_input="$(echo ,$input, | tr -d ' ')"
            if [[ "$normalized_input" == ",," ]]; then
-              # For an empty input, assume all platforms should run, except those in the EXCLUDED_PLATFORMS list
-              for excluded in "${excluded_array[@]}"; do
-                if [[ "$1" == "$excluded" ]]; then
-                  echo 'false'
-                  return
-                fi
-              done
+              # For an empty input, assume all platforms should run
              echo 'true'
              return
            else
@@ -133,58 +105,20 @@ jobs:
                  return
                fi
              done
-
-              # If not explicitly included, check against the EXCLUDED_PLATFORMS list
-              for excluded in "${excluded_array[@]}"; do
-                if [[ "$1" == "$excluded" ]]; then
-                  echo 'false'
-                  return
-                fi
-              done
-            fi
-
-            echo 'false'
-          }
-
-          function check_dry_run() {
-            if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
-              # Take the user-specified one.
-              echo '${{ github.event.inputs.dry-run }}'
-              return
-            elif [[ $GITHUB_EVENT_NAME == push ]]; then
-              # Cut out the real branch name
-              BRANCH=${GITHUB_REF##*/}
-
-              # Dry run rebuilds the caches in current branch, so they can be reused
-              # for any child PR branches. Because of this, we want to trigger this
-              # workflow in master branch, so that actual PR branches can use the cache.
-              # This workflow would trigger every time contributors sync their master
-              # branches in their personal forks.
-              if [[ $BRANCH == "master" ]]; then
-                echo 'true'
-                return
-              fi
-
-              # ...same for stabilization branches
-              if [[ $BRANCH =~ "jdk(.*)" ]]; then
-                echo 'true'
-                return
-              fi
            fi

            echo 'false'
          }

          echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
+          echo "linux-x86=$(check_platform linux-x86 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 "alpine-linux-x64=$(check_platform alpine-linux-x64 alpine-linux x64)" >> $GITHUB_OUTPUT
          echo "macos-x64=$(check_platform macos-x64 macos x64)" >> $GITHUB_OUTPUT
          echo "macos-aarch64=$(check_platform macos-aarch64 macos aarch64)" >> $GITHUB_OUTPUT
          echo "windows-x64=$(check_platform windows-x64 windows x64)" >> $GITHUB_OUTPUT
          echo "windows-aarch64=$(check_platform windows-aarch64 windows aarch64)" >> $GITHUB_OUTPUT
          echo "docs=$(check_platform docs)" >> $GITHUB_OUTPUT
-          echo "dry-run=$(check_dry_run)" >> $GITHUB_OUTPUT

  ###
  ### Build jobs
@@ -192,19 +126,35 @@ jobs:

  build-linux-x64:
    name: linux-x64
-    needs: prepare
+    needs: select
    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 }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.linux-x64 == 'true'
+    if: needs.select.outputs.linux-x64 == 'true'
+
+  build-linux-x86:
+    name: linux-x86
+    needs: select
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      platform: linux-x86
+      gcc-major-version: '10'
+      gcc-package-suffix: '-multilib'
+      apt-architecture: 'i386'
+      # Some multilib libraries do not have proper inter-dependencies, so we have to
+      # install their dependencies manually.
+      apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386 libffi-dev:i386'
+      extra-conf-options: '--with-target-bits=32 --enable-fallback-linker --enable-libffi-bundling'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+    if: needs.select.outputs.linux-x86 == 'true'

  build-linux-x64-hs-nopch:
    name: linux-x64-hs-nopch
-    needs: prepare
+    needs: select
    uses: ./.github/workflows/build-linux.yml
    with:
      platform: linux-x64
@@ -214,12 +164,11 @@ jobs:
      extra-conf-options: '--disable-precompiled-headers'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.linux-x64-variants == 'true'
+    if: needs.select.outputs.linux-x64-variants == 'true'

  build-linux-x64-hs-zero:
    name: linux-x64-hs-zero
-    needs: prepare
+    needs: select
    uses: ./.github/workflows/build-linux.yml
    with:
      platform: linux-x64
@@ -229,12 +178,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 }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.linux-x64-variants == 'true'
+    if: needs.select.outputs.linux-x64-variants == 'true'

  build-linux-x64-hs-minimal:
    name: linux-x64-hs-minimal
-    needs: prepare
+    needs: select
    uses: ./.github/workflows/build-linux.yml
    with:
      platform: linux-x64
@@ -244,12 +192,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 }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.linux-x64-variants == 'true'
+    if: needs.select.outputs.linux-x64-variants == 'true'

  build-linux-x64-hs-optimized:
    name: linux-x64-hs-optimized
-    needs: prepare
+    needs: select
    uses: ./.github/workflows/build-linux.yml
    with:
      platform: linux-x64
@@ -260,125 +207,72 @@ 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 }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.linux-x64-variants == 'true'
-
-  build-linux-x64-static:
-    name: linux-x64-static
-    needs: prepare
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'static-jdk-bundles'
-      # There are issues with fastdebug static build in GHA due to space limit.
-      # Only do release build for now.
-      debug-levels: '[ "release" ]'
-      gcc-major-version: '10'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-      static-suffix: "-static"
-    if: needs.prepare.outputs.linux-x64 == 'true'
-
-  build-linux-x64-static-libs:
-    name: linux-x64-static-libs
-    needs: prepare
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'static-libs-bundles'
-      # Only build static-libs-bundles for release builds.
-      # For debug builds, building static-libs often exceeds disk space.
-      debug-levels: '[ "release" ]'
-      gcc-major-version: '10'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-      # Upload static libs bundles separately to avoid interference with normal linux-x64 bundle.
-      # This bundle is not used by testing jobs, but downstreams use it to check that
-      # dependent projects, e.g. libgraal, builds fine.
-      bundle-suffix: "-static-libs"
-    if: needs.prepare.outputs.linux-x64-variants == 'true'
+    if: needs.select.outputs.linux-x64-variants == 'true'

  build-linux-cross-compile:
    name: linux-cross-compile
-    needs: prepare
+    needs:
+      - select
    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 }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.linux-cross-compile == 'true'
-
-  build-alpine-linux-x64:
-    name: alpine-linux-x64
-    needs: prepare
-    uses: ./.github/workflows/build-alpine-linux.yml
-    with:
-      platform: alpine-linux-x64
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.alpine-linux-x64 == 'true'
+    if: needs.select.outputs.linux-cross-compile == 'true'

  build-macos-x64:
    name: macos-x64
-    needs: prepare
+    needs: select
    uses: ./.github/workflows/build-macos.yml
    with:
      platform: macos-x64
-      runs-on: 'macos-15-intel'
-      xcode-toolset-version: '16.4'
+      runs-on: 'macos-13'
+      xcode-toolset-version: '14.3.1'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.macos-x64 == 'true'
+    if: needs.select.outputs.macos-x64 == 'true'

  build-macos-aarch64:
    name: macos-aarch64
-    needs: prepare
+    needs: select
    uses: ./.github/workflows/build-macos.yml
    with:
      platform: macos-aarch64
-      runs-on: 'macos-15'
-      xcode-toolset-version: '16.4'
+      runs-on: 'macos-14'
+      xcode-toolset-version: '14.3.1'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.macos-aarch64 == 'true'
+    if: needs.select.outputs.macos-aarch64 == 'true'

  build-windows-x64:
    name: windows-x64
-    needs: prepare
+    needs: select
    uses: ./.github/workflows/build-windows.yml
    with:
      platform: windows-x64
-      msvc-toolset-version: '14.44'
+      msvc-toolset-version: '14.29'
      msvc-toolset-architecture: 'x86.x64'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.windows-x64 == 'true'
+    if: needs.select.outputs.windows-x64 == 'true'

  build-windows-aarch64:
    name: windows-aarch64
-    needs: prepare
+    needs: select
    uses: ./.github/workflows/build-windows.yml
    with:
      platform: windows-aarch64
-      msvc-toolset-version: '14.44'
+      msvc-toolset-version: '14.29'
      msvc-toolset-architecture: 'arm64'
      make-target: 'hotspot'
      extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.windows-aarch64 == 'true'
+    if: needs.select.outputs.windows-aarch64 == 'true'

  build-docs:
    name: docs
-    needs: prepare
+    needs: select
    uses: ./.github/workflows/build-linux.yml
    with:
      platform: linux-x64
@@ -390,8 +284,7 @@ jobs:
      gcc-major-version: '10'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-    if: needs.prepare.outputs.docs == 'true'
+    if: needs.select.outputs.docs == 'true'

  ###
  ### Test jobs
@@ -400,53 +293,96 @@ jobs:
  test-linux-x64:
    name: linux-x64
    needs:
-      - prepare
      - build-linux-x64
    uses: ./.github/workflows/test.yml
    with:
      platform: linux-x64
      bootjdk-platform: linux-x64
      runs-on: ubuntu-22.04
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-      debug-suffix: -debug

-  test-linux-x64-static:
-    name: linux-x64-static
+  test-linux-x86:
+    name: linux-x86
    needs:
-      - prepare
-      - build-linux-x64
-      - build-linux-x64-static
+      - build-linux-x86
    uses: ./.github/workflows/test.yml
    with:
-      platform: linux-x64
+      platform: linux-x86
      bootjdk-platform: linux-x64
      runs-on: ubuntu-22.04
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-      static-suffix: "-static"
+
+  test-macos-x64:
+    name: macos-x64
+    needs:
+      - build-macos-x64
+    uses: ./.github/workflows/test.yml
+    with:
+      platform: macos-x64
+      bootjdk-platform: macos-x64
+      runs-on: macos-13

  test-macos-aarch64:
    name: macos-aarch64
    needs:
-      - prepare
      - build-macos-aarch64
    uses: ./.github/workflows/test.yml
    with:
      platform: macos-aarch64
      bootjdk-platform: macos-aarch64
-      runs-on: macos-15
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-      xcode-toolset-version: '16.4'
-      debug-suffix: -debug
+      runs-on: macos-14

  test-windows-x64:
    name: windows-x64
    needs:
-      - prepare
      - build-windows-x64
    uses: ./.github/workflows/test.yml
    with:
      platform: windows-x64
      bootjdk-platform: windows-x64
-      runs-on: windows-2025
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-      debug-suffix: -debug
+      runs-on: windows-2019
+
+  # Remove bundles so they are not misconstrued as binary distributions from the JDK project
+  remove-bundles:
+    name: 'Remove bundle artifacts'
+    runs-on: ubuntu-22.04
+    if: always()
+    needs:
+      - build-linux-x64
+      - build-linux-x86
+      - build-linux-x64-hs-nopch
+      - build-linux-x64-hs-zero
+      - build-linux-x64-hs-minimal
+      - build-linux-x64-hs-optimized
+      - build-linux-cross-compile
+      - build-macos-x64
+      - build-macos-aarch64
+      - build-windows-x64
+      - build-windows-aarch64
+      - test-linux-x64
+      - test-linux-x86
+      - test-macos-x64
+      - 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@v7
+        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" \
+            || echo "Failed to remove bundle"
+          done
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -1,270 +0,0 @@
-#
-# Copyright 2000-2023 JetBrains s.r.o.
-# 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 OpenJDK on pull request'
-
-on:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  ###
-  ### Determine platforms to include
-  ###
-  select:
-    name: 'Select platforms'
-    runs-on: ubuntu-22.04
-    outputs:
-      linux-x64: ${{ steps.include.outputs.linux-x64 }}
-      linux-x86: ${{ steps.include.outputs.linux-x86 }}
-      linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
-      macos-x64: ${{ steps.include.outputs.macos-x64 }}
-      macos-aarch64: ${{ steps.include.outputs.macos-aarch64 }}
-      windows-x64: ${{ steps.include.outputs.windows-x64 }}
-      windows-aarch64: ${{ steps.include.outputs.windows-aarch64 }}
-      windows-x86: ${{ steps.include.outputs.windows-x86 }}
-
-    steps:
-      # This function must be inlined in main.yml, or we'd be forced to checkout the repo
-      - name: 'Check what jobs to run'
-        id: include
-        run: |
-          # Determine which platform jobs to run
-
-          # Returns 'true' if the input platform list matches any of the platform monikers given as argument,
-          # 'false' otherwise.
-          # arg $1: platform name or names to look for
-          function check_platform() {
-            if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
-              input='${{ github.event.inputs.platforms }}'
-            elif [[ $GITHUB_EVENT_NAME == push ]]; then
-              if [[ '${{ !secrets.JDK_SUBMIT_FILTER || startsWith(github.ref, 'refs/heads/submit/') }}' == 'false' ]]; then
-                # If JDK_SUBMIT_FILTER is set, and this is not a "submit/" branch, don't run anything
-                >&2 echo 'JDK_SUBMIT_FILTER is set and not a "submit/" branch'
-                echo 'false'
-                return
-              else
-                input='${{ secrets.JDK_SUBMIT_PLATFORMS }}'
-              fi
-            fi
-
-            normalized_input="$(echo ,$input, | tr -d ' ')"
-            if [[ "$normalized_input" == ",," ]]; then
-              # For an empty input, assume all platforms should run
-              echo 'true'
-              return
-            else
-              # Check for all acceptable platform names
-              for part in $* ; do
-                if echo "$normalized_input" | grep -q -e ",$part," ; then
-                  echo 'true'
-                  return
-                fi
-              done
-            fi
-
-            echo 'false'
-          }
-
-          echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
-          echo "linux-x86=$(check_platform linux-x86 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
-          echo "macos-aarch64=$(check_platform macos-aarch64 macos aarch64)" >> $GITHUB_OUTPUT
-          echo "windows-x64=$(check_platform windows-x64 windows x64)" >> $GITHUB_OUTPUT
-          echo "windows-x86=$(check_platform windows-x86 windows x86)" >> $GITHUB_OUTPUT
-          echo "windows-aarch64=$(check_platform windows-aarch64 windows aarch64)" >> $GITHUB_OUTPUT
-          echo "docs=$(check_platform docs)" >> $GITHUB_OUTPUT
-
-  ###
-  ### Build jobs
-  ###
-
-  build-linux-x64:
-    name: linux-x64
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
-      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'
-
-  build-linux-x86:
-    name: linux-x86
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x86
-      gcc-major-version: '10'
-      gcc-package-suffix: '-multilib'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
-      apt-architecture: 'i386'
-      # Some multilib libraries do not have proper inter-dependencies, so we have to
-      # install their dependencies manually.
-      apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386'
-      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'
-
-  build-linux-cross-compile:
-    name: linux-cross-compile
-    needs:
-      - select
-      - build-linux-x64
-    uses: ./.github/workflows/build-cross-compile.yml
-    with:
-      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
-      apt-gcc-cross-version: '10.4.0-4ubuntu1~22.04cross1'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.linux-cross-compile == 'true'
-
-  build-macos-x64:
-    name: macos-x64
-    needs: select
-    uses: ./.github/workflows/build-macos.yml
-    with:
-      platform: macos-x64
-      xcode-toolset-version: '12.5.1'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.macos-x64 == 'true'
-
-  build-macos-aarch64:
-    name: macos-aarch64
-    needs: select
-    uses: ./.github/workflows/build-macos.yml
-    with:
-      platform: macos-aarch64
-      xcode-toolset-version: '12.5.1'
-      extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.macos-aarch64 == 'true'
-
-  build-windows-x64:
-    name: windows-x64
-    needs: select
-    uses: ./.github/workflows/build-windows.yml
-    with:
-      platform: windows-x64
-      msvc-toolset-version: '14.29'
-      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'
-
-  build-windows-x86:
-    name: windows-x86
-    needs: select
-    uses: ./.github/workflows/build-windows.yml
-    with:
-      platform: windows-x86
-      msvc-toolset-version: '14.29'
-      msvc-toolset-architecture: 'x86'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.windows-x86 == 'true'
-
-  build-windows-aarch64:
-    name: windows-aarch64
-    needs: select
-    uses: ./.github/workflows/build-windows.yml
-    with:
-      platform: windows-aarch64
-      msvc-toolset-version: '14.29'
-      msvc-toolset-architecture: 'arm64'
-      make-target: 'hotspot'
-      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'
-
-  build-docs:
-    name: docs
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      debug-levels: '[ "debug" ]'
-      make-target: 'docs-jdk-bundles'
-      # Make sure we never try to make full docs, since that would require a
-      # build JDK, and we do not need the additional testing of the graphs.
-      extra-conf-options: '--disable-full-docs'
-      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.docs == 'true'
-
-  # Remove bundles so they are not misconstrued as binary distributions from the JDK project
-  remove-bundles:
-    name: 'Remove bundle artifacts'
-    runs-on: ubuntu-22.04
-    if: always()
-    needs:
-      - build-linux-x64
-      - build-linux-x86
-      - build-linux-cross-compile
-      - build-macos-x64
-      - build-macos-aarch64
-      - build-windows-x64
-      - build-windows-aarch64
-      - build-windows-x86
-
-    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" \
-            || echo "Failed to remove bundle"
-          done
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, 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,19 +37,6 @@ on:
      runs-on:
        required: true
        type: string
-      xcode-toolset-version:
-        required: false
-        type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
-      debug-suffix:
-        required: false
-        type: string
-      static-suffix:
-        required: false
-        type: string

 env:
  # These are needed to make the MSYS2 bash work properly
@@ -76,6 +63,7 @@ jobs:
          - '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'
@@ -96,35 +84,39 @@ jobs:

          - test-name: 'hs/tier1 common'
            test-suite: 'test/hotspot/jtreg/:tier1_common'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug

          - test-name: 'hs/tier1 compiler part 1'
            test-suite: 'test/hotspot/jtreg/:tier1_compiler_1'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug

          - test-name: 'hs/tier1 compiler part 2'
            test-suite: 'test/hotspot/jtreg/:tier1_compiler_2'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug

          - test-name: 'hs/tier1 compiler part 3'
            test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            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'
            test-suite: 'test/hotspot/jtreg/:tier1_gc'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug

          - test-name: 'hs/tier1 runtime'
            test-suite: 'test/hotspot/jtreg/:tier1_runtime'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug

          - test-name: 'hs/tier1 serviceability'
            test-suite: 'test/hotspot/jtreg/:tier1_serviceability'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug

          - test-name: 'lib-test/tier1'
            test-suite: 'test/lib-test/:tier1'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug

    steps:
      - name: 'Checkout the JDK source'
@@ -150,14 +142,12 @@ jobs:
        with:
          platform: ${{ inputs.platform }}
          debug-suffix: ${{ matrix.debug-suffix }}
-          static-suffix: ${{ inputs.static-suffix }}
-        if: ${{ inputs.dry-run == false }}

      - name: 'Install dependencies'
        run: |
          # On macOS we need to install some dependencies for testing
          brew install make
-          sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
+          sudo xcode-select --switch /Applications/Xcode_14.3.1.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'
@@ -172,21 +162,6 @@ jobs:
          else
            echo "value=$PATH" >> $GITHUB_OUTPUT
          fi
-          if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
-            echo "static-hotspot-problemlist-path=`pwd`/test/hotspot/jtreg/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
-            echo "static-jdk-problemlist-path=`pwd`/test/jdk/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
-            echo "static-langtools-problemlist-path=`pwd`/test/langtools/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
-            echo "static-lib-test-problemlist-path=`pwd`/test/lib-test/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
-          fi
-
-      - name: 'Set Extra Options'
-        id: extra-options
-        run: |
-          if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
-            echo "test-jdk=JDK_UNDER_TEST=${{ steps.bundles.outputs.static-jdk-path }}" >> $GITHUB_OUTPUT
-            echo "compile-jdk=JDK_FOR_COMPILE=${{ steps.bundles.outputs.jdk-path }}" >> $GITHUB_OUTPUT
-            echo "extra-problem-lists=EXTRA_PROBLEM_LISTS=${{ steps.path.outputs.static-hotspot-problemlist-path }}%20${{ steps.path.outputs.static-jdk-problemlist-path }}%20${{ steps.path.outputs.static-langtools-problemlist-path }}%20${{ steps.path.outputs.static-lib-test-problemlist-path }}" >> $GITHUB_OUTPUT
-          fi

      - name: 'Run tests'
        id: run-tests
@@ -198,13 +173,10 @@ jobs:
          JDK_IMAGE_DIR=${{ steps.bundles.outputs.jdk-path }}
          SYMBOLS_IMAGE_DIR=${{ steps.bundles.outputs.symbols-path }}
          TEST_IMAGE_DIR=${{ steps.bundles.outputs.tests-path }}
-          ${{ steps.extra-options.outputs.test-jdk }}
-          ${{ steps.extra-options.outputs.compile-jdk }}
-          JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful;${{ steps.extra-options.outputs.extra-problem-lists }}'
+          JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
          && bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY" "$GITHUB_OUTPUT"
        env:
          PATH: ${{ steps.path.outputs.value }}
-        if: ${{ inputs.dry-run == false }}

        # This is a separate step, since if the markdown from a step gets bigger than
        # 1024 kB it is skipped, but then the short summary above is still generated
@@ -234,7 +206,7 @@ jobs:
            echo '::warning ::Missing test-support directory'
          fi

-          artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }}${{ inputs.static-suffix }} | tr '/ ' '__')"
+          artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }} | tr '/ ' '__')"
          echo "artifact-name=$artifact_name" >> $GITHUB_OUTPUT
        if: always()

--- a/.gitignore
+++ b/.gitignore
@@ -20,10 +20,3 @@ NashornProfile.txt
 /.settings/
 /compile_commands.json
 /.cache
-/.gdbinit
-/.lldbinit
-**/core.[0-9]*
-*.rej
-*.orig
-test/benchmarks/**/target
-/jbr-api/
--- a/.jcheck/conf
+++ b/.jcheck/conf
@@ -1,11 +1,11 @@
 [general]
 project=jdk
 jbs=JDK
-version=26
+version=23

 [checks]
-error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists,copyright
-warning=issuestitle,binary
+error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
+warning=issuestitle

 [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)
@@ -34,8 +34,3 @@ pattern=^([124-8][0-9]{6}): (\S.*)$

 [checks "problemlists"]
 dirs=test/jdk|test/langtools|test/lib-test|test/hotspot/jtreg|test/jaxp
-
-[checks "copyright"]
-files=^(?!LICENSE|license\.txt|.*\.bin|.*\.gif|.*\.jpg|.*\.png|.*\.icon|.*\.tiff|.*\.dat|.*\.patch|.*\.wav|.*\.class|.*-header|.*\.jar).*
-oracle_locator=.*Copyright \(c\)(.*)Oracle and/or its affiliates\. All rights reserved\.
-oracle_validator=.*Copyright \(c\) (\d{4})(?:, (\d{4}))?, Oracle and/or its affiliates\. All rights reserved\.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
 # Contributing to the JDK

-Please see the [OpenJDK Developers' Guide](https://openjdk.org/guide/).
+Please see the [OpenJDK Developers’ Guide](https://openjdk.org/guide/).
--- a/13
+++ b/13
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, 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,9 +24,8 @@
 #

 ###
-### This file is just a very small wrapper which will include make/PreInit.gmk,
-### where the real work is done. This wrapper also performs some sanity checks
-### on make that must be done before we can include another file.
+### This file is just a very small wrapper needed to run the real make/Init.gmk.
+### It also performs some sanity checks on make.
 ###

 # The shell code below will be executed on /usr/bin/make on Solaris, but not in GNU Make.
@@ -59,7 +58,7 @@ ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))),)
 else
  makefile_path := $(lastword $(MAKEFILE_LIST))
 endif
-TOPDIR := $(strip $(patsubst %/, %, $(dir $(makefile_path))))
+topdir := $(strip $(patsubst %/, %, $(dir $(makefile_path))))

-# ... and then we can include the real makefile to bootstrap the build
-include $(TOPDIR)/make/PreInit.gmk
+# ... and then we can include the real makefile
+include $(topdir)/make/Init.gmk
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
-
 # Welcome to the JDK!

 For build instructions please see the
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,3 +0,0 @@
-# JDK Vulnerabilities
-
-Please follow the process outlined in the [OpenJDK Vulnerability Policy](https://openjdk.org/groups/vulnerability/report) to disclose vulnerabilities in the JDK.
--- a/bin/idea.sh
+++ b/bin/idea.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2020, 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
@@ -25,26 +25,7 @@
 # Shell script for generating an IDEA project from a given list of modules

 usage() {
-      echo "Usage: $0 [-h|--help] [-q|--quiet] [-a|--absolute-paths] [-r|--root <path>] [-o|--output <path>] [-c|--conf <conf_name>] [modules...]"
-      echo "    -h | --help"
-      echo "    -q | --quiet
-        No stdout output"
-      echo "    -a | --absolute-paths
-        Use absolute paths to this jdk, so that generated .idea
-        project files can be moved independently of jdk sources"
-      echo "    -r | --root <path>
-        Project content root
-        Default: $TOPLEVEL_DIR"
-      echo "    -o | --output <path>
-        Where .idea directory with project files will be generated
-        (e.g. using '-o .' will place project files in './.idea')
-        Default: same as --root"
-      echo "    -c | --conf <conf_name>
-        make configuration (release, slowdebug etc)"
-      echo "    [modules...]
-        Generate project modules for specific java modules
-        (e.g. 'java.base java.desktop')
-        Default: all existing modules (java.* and jdk.*)"
+      echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [-c|--conf <conf_name>] [modules]+"
      exit 1
 }

@@ -52,13 +33,10 @@ SCRIPT_DIR=`dirname $0`
 #assume TOP is the dir from which the script has been called
 TOP=`pwd`
 cd $SCRIPT_DIR; SCRIPT_DIR=`pwd`
-if [ "x$TOPLEVEL_DIR" = "x" ] ; then
-  cd .. ; TOPLEVEL_DIR=`pwd`
-fi
 cd $TOP;

-VERBOSE=true
-ABSOLUTE_PATHS=false
+IDEA_OUTPUT=$TOP/.idea
+VERBOSE="false"
 CONF_ARG=
 while [ $# -gt 0 ]
 do
@@ -67,24 +45,14 @@ do
      usage
      ;;

-    -q | --quiet )
-      VERBOSE=false
-      ;;
-
-    -a | --absolute-paths )
-      ABSOLUTE_PATHS=true
-      ;;
-
-    -r | --root )
-      TOPLEVEL_DIR="$2"
-      shift
+    -v | --vebose )
+      VERBOSE="true"
      ;;

    -o | --output )
-      IDEA_OUTPUT="$2/.idea"
+      IDEA_OUTPUT=$2/.idea
      shift
      ;;
-
    -c | --conf )
      CONF_ARG="CONF_NAME=$2"
      shift
@@ -101,17 +69,20 @@ do
  shift
 done

-if [ "x$IDEA_OUTPUT" = "x" ] ; then
-  IDEA_OUTPUT="$TOPLEVEL_DIR/.idea"
+if [ -e $IDEA_OUTPUT ] ; then
+    rm -r $IDEA_OUTPUT
+fi
+mkdir -p $IDEA_OUTPUT || exit 1
+cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
+
+if [ "x$TOPLEVEL_DIR" = "x" ] ; then
+    cd $SCRIPT_DIR/..
+    TOPLEVEL_DIR=`pwd`
+    cd $IDEA_OUTPUT
 fi

-mkdir -p $IDEA_OUTPUT || exit 1
-cd "$TOP" ; cd $TOPLEVEL_DIR; TOPLEVEL_DIR=`pwd`
-cd "$TOP" ; cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
-cd ..; IDEA_OUTPUT_PARENT=`pwd`
-cd "$SCRIPT_DIR/.." ; OPENJDK_DIR=`pwd`
-
-IDEA_MAKE="$OPENJDK_DIR/make/ide/idea/jdk"
+MAKE_DIR="$SCRIPT_DIR/../make"
+IDEA_MAKE="$MAKE_DIR/ide/idea/jdk"
 IDEA_TEMPLATE="$IDEA_MAKE/template"

 cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
@@ -123,79 +94,41 @@ if [ -d "$TEMPLATES_OVERRIDE" ] ; then
    done
 fi

-if [ "$VERBOSE" = true ] ; then
-  echo "Will generate IDEA project files in \"$IDEA_OUTPUT\" for project \"$TOPLEVEL_DIR\""
+if [ "$VERBOSE" = "true" ] ; then
+  echo "output dir: $IDEA_OUTPUT"
+  echo "idea template dir: $IDEA_TEMPLATE"
 fi

-cd $TOP ; make idea-gen-config ALLOW=TOPLEVEL_DIR,IDEA_OUTPUT_PARENT,IDEA_OUTPUT,MODULES TOPLEVEL_DIR="$TOPLEVEL_DIR" \
-    IDEA_OUTPUT_PARENT="$IDEA_OUTPUT_PARENT" IDEA_OUTPUT="$IDEA_OUTPUT" MODULES="$*" $CONF_ARG || exit 1
+cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I $MAKE_DIR/.. idea MAKEOVERRIDES= OUT=$IDEA_OUTPUT/env.cfg MODULES="$*" $CONF_ARG || exit 1
 cd $SCRIPT_DIR

 . $IDEA_OUTPUT/env.cfg

-# Expect MODULES, MODULE_NAMES, RELATIVE_PROJECT_DIR, RELATIVE_BUILD_DIR to be set
-if [ "xMODULES" = "x" ] ; then
-  echo "FATAL: MODULES is empty" >&2; exit 1
+# Expect MODULE_ROOTS, MODULE_NAMES, BOOT_JDK & SPEC to be set
+if [ "x$MODULE_ROOTS" = "x" ] ; then
+  echo "FATAL: MODULE_ROOTS is empty" >&2; exit 1
 fi

 if [ "x$MODULE_NAMES" = "x" ] ; then
  echo "FATAL: MODULE_NAMES is empty" >&2; exit 1
 fi

-if [ "x$RELATIVE_PROJECT_DIR" = "x" ] ; then
-  echo "FATAL: RELATIVE_PROJECT_DIR is empty" >&2; exit 1
+if [ "x$BOOT_JDK" = "x" ] ; then
+  echo "FATAL: BOOT_JDK is empty" >&2; exit 1
 fi

-if [ "x$RELATIVE_BUILD_DIR" = "x" ] ; then
-  echo "FATAL: RELATIVE_BUILD_DIR is empty" >&2; exit 1
+if [ "x$SPEC" = "x" ] ; then
+  echo "FATAL: SPEC is empty" >&2; exit 1
 fi

 if [ -d "$TOPLEVEL_DIR/.hg" ] ; then
    VCS_TYPE="hg4idea"
 fi

-# Git worktrees use a '.git' file rather than directory, so test both.
-if [ -d "$TOPLEVEL_DIR/.git" -o -f "$TOPLEVEL_DIR/.git" ] ; then
+if [ -d "$TOPLEVEL_DIR/.git" ] ; then
    VCS_TYPE="Git"
 fi

-if [ "$ABSOLUTE_PATHS" = true ] ; then
-  if [ "x$PATHTOOL" != "x" ]; then
-    PROJECT_DIR="`$PATHTOOL -am $OPENJDK_DIR`"
-    TOPLEVEL_PROJECT_DIR="`$PATHTOOL -am $TOPLEVEL_DIR`"
-  else
-    PROJECT_DIR="$OPENJDK_DIR"
-    TOPLEVEL_PROJECT_DIR="$TOPLEVEL_DIR"
-  fi
-  MODULE_DIR="$PROJECT_DIR"
-  TOPLEVEL_MODULE_DIR="$TOPLEVEL_PROJECT_DIR"
-  cd "$IDEA_OUTPUT_PARENT" && cd "$RELATIVE_BUILD_DIR" && BUILD_DIR="`pwd`"
-  CLION_SCRIPT_TOPDIR="$OPENJDK_DIR"
-  CLION_PROJECT_DIR="$PROJECT_DIR"
-else
-  if [ "$RELATIVE_PROJECT_DIR" = "." ] ; then
-    PROJECT_DIR=""
-  else
-    PROJECT_DIR="/$RELATIVE_PROJECT_DIR"
-  fi
-  if [ "$RELATIVE_TOPLEVEL_PROJECT_DIR" = "." ] ; then
-    TOPLEVEL_PROJECT_DIR=""
-  else
-    TOPLEVEL_PROJECT_DIR="/$RELATIVE_TOPLEVEL_PROJECT_DIR"
-  fi
-  MODULE_DIR="\$MODULE_DIR\$$PROJECT_DIR"
-  PROJECT_DIR="\$PROJECT_DIR\$$PROJECT_DIR"
-  TOPLEVEL_MODULE_DIR="\$MODULE_DIR\$$TOPLEVEL_PROJECT_DIR"
-  TOPLEVEL_PROJECT_DIR="\$PROJECT_DIR\$$TOPLEVEL_PROJECT_DIR"
-  BUILD_DIR="\$PROJECT_DIR\$/$RELATIVE_BUILD_DIR"
-  CLION_SCRIPT_TOPDIR="$CLION_RELATIVE_PROJECT_DIR"
-  CLION_PROJECT_DIR="\$PROJECT_DIR\$/$CLION_SCRIPT_TOPDIR"
-fi
-if [ "$VERBOSE" = true ] ; then
-  echo "Project root: $PROJECT_DIR"
-  echo "Generating IDEA project files..."
-fi
-
 ### Replace template variables

 NUM_REPLACEMENTS=0
@@ -219,106 +152,116 @@ add_replacement() {
    eval TO$NUM_REPLACEMENTS='$2'
 }

-add_replacement "###PATHTOOL###" "$PATHTOOL"
-add_replacement "###CLION_SCRIPT_TOPDIR###" "$CLION_SCRIPT_TOPDIR"
-add_replacement "###CLION_PROJECT_DIR###" "$CLION_PROJECT_DIR"
-add_replacement "###PROJECT_DIR###" "$PROJECT_DIR"
-add_replacement "###MODULE_DIR###" "$MODULE_DIR"
-add_replacement "###TOPLEVEL_PROJECT_DIR###" "$TOPLEVEL_PROJECT_DIR"
-add_replacement "###TOPLEVEL_MODULE_DIR###" "$TOPLEVEL_MODULE_DIR"
 add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
 add_replacement "###VCS_TYPE###" "$VCS_TYPE"
-add_replacement "###BUILD_DIR###" "$BUILD_DIR"
-add_replacement "###RELATIVE_BUILD_DIR###" "$RELATIVE_BUILD_DIR"
-if [ "x$PATHTOOL" != "x" ]; then
-  add_replacement "###BASH_RUNNER_PREFIX###" "\$PROJECT_DIR\$/.idea/bash.bat"
-else
-  add_replacement "###BASH_RUNNER_PREFIX###" ""
-fi
-if [ "x$PATHTOOL" != "x" ]; then
+SPEC_DIR=`dirname $SPEC`
+if [ "x$CYGPATH" != "x" ]; then
+    add_replacement "###BUILD_DIR###" "`$CYGPATH -am $SPEC_DIR`"
+    add_replacement "###IMAGES_DIR###" "`$CYGPATH -am $SPEC_DIR`/images/jdk"
+    add_replacement "###ROOT_DIR###" "`$CYGPATH -am $TOPLEVEL_DIR`"
+    add_replacement "###IDEA_DIR###" "`$CYGPATH -am $IDEA_OUTPUT`"
    if [ "x$JT_HOME" = "x" ]; then
      add_replacement "###JTREG_HOME###" ""
    else
-      add_replacement "###JTREG_HOME###" "`$PATHTOOL -am $JT_HOME`"
+      add_replacement "###JTREG_HOME###" "`$CYGPATH -am $JT_HOME`"
+    fi
+elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
+    add_replacement "###BUILD_DIR###" "`wslpath -am $SPEC_DIR`"
+    add_replacement "###IMAGES_DIR###" "`wslpath -am $SPEC_DIR`/images/jdk"
+    add_replacement "###ROOT_DIR###" "`wslpath -am $TOPLEVEL_DIR`"
+    add_replacement "###IDEA_DIR###" "`wslpath -am $IDEA_OUTPUT`"
+    if [ "x$JT_HOME" = "x" ]; then
+      add_replacement "###JTREG_HOME###" ""
+    else
+      add_replacement "###JTREG_HOME###" "`wslpath -am $JT_HOME`"
    fi
 else
+    add_replacement "###BUILD_DIR###" "$SPEC_DIR"
    add_replacement "###JTREG_HOME###" "$JT_HOME"
+    add_replacement "###IMAGES_DIR###" "$SPEC_DIR/images/jdk"
+    add_replacement "###ROOT_DIR###" "$TOPLEVEL_DIR"
+    add_replacement "###IDEA_DIR###" "$IDEA_OUTPUT"
 fi

-MODULE_IMLS=""
-TEST_MODULE_DEPENDENCIES=""
-for module in $MODULE_NAMES; do
-    MODULE_IMLS="$MODULE_IMLS<module fileurl=\"file://\$PROJECT_DIR$/.idea/$module.iml\" filepath=\"\$PROJECT_DIR$/.idea/$module.iml\" /> "
-    TEST_MODULE_DEPENDENCIES="$TEST_MODULE_DEPENDENCIES<orderEntry type=\"module\" module-name=\"$module\" scope=\"TEST\" /> "
+SOURCE_PREFIX="<sourceFolder url=\"file://"
+SOURCE_POSTFIX="\" isTestSource=\"false\" />"
+
+for root in $MODULE_ROOTS; do
+    if [ "x$CYGPATH" != "x" ]; then
+      root=`$CYGPATH -am $root`
+    elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
+      root=`wslpath -am $root`
+    fi
+
+    SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
 done
-add_replacement "###MODULE_IMLS###" "$MODULE_IMLS"
-add_replacement "###TEST_MODULE_DEPENDENCIES###" "$TEST_MODULE_DEPENDENCIES"
+
+add_replacement "###SOURCE_ROOTS###" "$SOURCES"

 replace_template_dir "$IDEA_OUTPUT"

-### Generate module project files
+### Compile the custom Logger

-if [ "$VERBOSE" = true ] ; then
-    echo "Generating project modules:"
-  fi
-(
-DEFAULT_IFS="$IFS"
-IFS='#'
-for value in $MODULES; do
-  (
-  eval "$value"
-  if [ "$VERBOSE" = true ] ; then
-    echo "    $module"
-  fi
-  MAIN_SOURCE_DIRS=""
-  CONTENT_ROOTS=""
-  IFS=' '
-  for dir in $moduleSrcDirs; do
-    case $dir in
-      "src/"*) MAIN_SOURCE_DIRS="$MAIN_SOURCE_DIRS <sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" />" ;;
-      *"/support/gensrc/$module") ;; # Exclude generated sources to avoid module-info conflicts, see https://youtrack.jetbrains.com/issue/IDEA-185108
-      *) CONTENT_ROOTS="$CONTENT_ROOTS <content url=\"file://$MODULE_DIR/$dir\">\
-      <sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" generated=\"true\" /></content>" ;;
-    esac
-  done
-  if [ "x$MAIN_SOURCE_DIRS" != "x" ] ; then
-    CONTENT_ROOTS="<content url=\"file://$MODULE_DIR/src/$module\">$MAIN_SOURCE_DIRS</content>$CONTENT_ROOTS"
-  fi
-  add_replacement "###MODULE_CONTENT_ROOTS###" "$CONTENT_ROOTS"
-  DEPENDENCIES=""
-  for dep in $moduleDependencies; do
-    case $MODULE_NAMES in # Exclude skipped modules from dependencies
-      *"$dep"*) DEPENDENCIES="$DEPENDENCIES<orderEntry type=\"module\" module-name=\"$dep\" /> "
-    esac
-  done
-  add_replacement "###DEPENDENCIES###" "$DEPENDENCIES"
-  cp "$IDEA_OUTPUT/module.iml" "$IDEA_OUTPUT/$module.iml"
-  IFS="$DEFAULT_IFS"
-  replace_template_file "$IDEA_OUTPUT/$module.iml"
-  )
-done
-)
-rm "$IDEA_OUTPUT/module.iml"
+CLASSES=$IDEA_OUTPUT/classes

-### Create shell script runner for Windows
-
-if [ "x$PATHTOOL" != "x" ]; then
-  echo "@echo off" > "$IDEA_OUTPUT/bash.bat"
-  if [ "x$WSL_DISTRO_NAME" != "x" ] ; then
-    echo "wsl -d $WSL_DISTRO_NAME --cd \"%cd%\" -e %*" >> "$IDEA_OUTPUT/bash.bat"
+if [ "x$ANT_HOME" = "x" ] ; then
+  # try some common locations
+  if [ -f "/usr/share/ant/lib/ant.jar" ] ; then
+    ANT_HOME="/usr/share/ant"
  else
-    echo "$WINENV_ROOT\bin\bash.exe -l -c \"cd %CD:\=/%/ && %*\"" >> "$IDEA_OUTPUT/bash.bat"
+    try_ant=$(ls /opt/homebrew/Cellar/ant/*/libexec/lib/ant.jar 2> /dev/null | sort -r | head -n 1)
+    if [ "x$try_ant" != "x" ] ; then
+      ANT_HOME=$(cd $(dirname $try_ant)/.. && pwd)
+    else
+      try_ant=$(ls /usr/local/Cellar/ant/*/libexec/lib/ant.jar 2> /dev/null | sort -r | head -n 1)
+      if [ "x$try_ant" != "x" ] ; then
+        ANT_HOME=$(cd $(dirname $try_ant)/.. && pwd)
+      fi
+    fi
+  fi
+else
+  if [ ! -f "$ANT_HOME/lib/ant.jar" ] ; then
+     echo "FATAL: ANT_HOME is incorrect. Try removing it and use autodetection, or fix the value" >&2; exit 1
  fi
 fi

+if [ "x$ANT_HOME" = "x" ] ; then
+   echo "FATAL: cannot find ant. Try setting ANT_HOME." >&2; exit 1
+fi
+CP=$ANT_HOME/lib/ant.jar
+rm -rf $CLASSES; mkdir $CLASSES

+# If we have a Windows boot JDK, we need a .exe suffix
+if [ -e "$BOOT_JDK/bin/java.exe" ] ; then
+  JAVAC=javac.exe
+else
+  JAVAC=javac
+fi

-if [ "$VERBOSE" = true ] ; then
-  IDEA_PROJECT_DIR="`dirname $IDEA_OUTPUT`"
-  if [ "x$PATHTOOL" != "x" ]; then
-    IDEA_PROJECT_DIR="`$PATHTOOL -am $IDEA_PROJECT_DIR`"
-  fi
-  echo "
-Now you can open \"$IDEA_PROJECT_DIR\" as IDEA project
-You can also run 'bash \"$IDEA_OUTPUT/jdk-clion/update-project.sh\"' to generate Clion project"
-fi
+# If we are on WSL, the boot JDK might be either Windows or Linux,
+# and we need to use realpath instead of CYGPATH to make javac work on both.
+# We need to handle this case first since CYGPATH might be set on WSL.
+if [ "x$WSL_DISTRO_NAME" != "x" ]; then
+  JAVAC_SOURCE_FILE=`realpath --relative-to=./ $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
+  JAVAC_SOURCE_PATH=`realpath --relative-to=./ $IDEA_OUTPUT/src`
+  JAVAC_CLASSES=`realpath --relative-to=./ $CLASSES`
+  ANT_TEMP=`mktemp -d -p ./`
+  cp $ANT_HOME/lib/ant.jar $ANT_TEMP/ant.jar
+  JAVAC_CP=$ANT_TEMP/ant.jar
+elif [ "x$CYGPATH" != "x" ] ; then ## CYGPATH may be set in env.cfg
+  JAVAC_SOURCE_FILE=`$CYGPATH -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
+  JAVAC_SOURCE_PATH=`$CYGPATH -am $IDEA_OUTPUT/src`
+  JAVAC_CLASSES=`$CYGPATH -am $CLASSES`
+  JAVAC_CP=`$CYGPATH -am $CP`
+else
+  JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java
+  JAVAC_SOURCE_PATH=$IDEA_OUTPUT/src
+  JAVAC_CLASSES=$CLASSES
+  JAVAC_CP=$CP
+fi
+
+$BOOT_JDK/bin/$JAVAC -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE
+
+if [ "x$WSL_DISTRO_NAME" != "x" ]; then
+  rm -rf $ANT_TEMP
+fi
--- a/bin/unshuffle_list.txt
+++ b/bin/unshuffle_list.txt
@@ -0,0 +1,192 @@
+#
+# Copyright (c) 2014, 2020, 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.
+#
+# 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.
+#
+
+src/bsd : jdk/src/bsd
+src/demo : jdk/src/demo
+src/java.activation : jaxws/src/java.activation
+src/java.base : jdk/src/java.base
+src/java.compiler : langtools/src/java.compiler
+src/java.corba : corba/src/java.corba
+src/java.datatransfer : jdk/src/java.datatransfer
+src/java.desktop : jdk/src/java.desktop
+src/java.instrument : jdk/src/java.instrument
+src/java.logging : jdk/src/java.logging
+src/java.management : jdk/src/java.management
+src/java.management.rmi : jdk/src/java.management.rmi
+src/java.naming : jdk/src/java.naming
+src/java.prefs : jdk/src/java.prefs
+src/java.rmi : jdk/src/java.rmi
+src/java.scripting : jdk/src/java.scripting
+src/java.se : jdk/src/java.se
+src/java.security.jgss : jdk/src/java.security.jgss
+src/java.security.sasl : jdk/src/java.security.sasl
+src/java.se.ee : jdk/src/java.se.ee
+src/java.smartcardio : jdk/src/java.smartcardio
+src/java.sql : jdk/src/java.sql
+src/java.sql.rowset : jdk/src/java.sql.rowset
+src/java.transaction : jdk/src/java.transaction
+src/java.xml : jaxp/src/java.xml
+src/java.xml.bind : jaxws/src/java.xml.bind
+src/java.xml.crypto : jdk/src/java.xml.crypto
+src/java.xml.ws : jaxws/src/java.xml.ws
+src/java.xml.ws.annotation : jaxws/src/java.xml.ws.annotation
+src/jdk.accessibility : jdk/src/jdk.accessibility
+src/jdk.aot : hotspot/src/jdk.aot
+src/jdk.attach : jdk/src/jdk.attach
+src/jdk.charsets : jdk/src/jdk.charsets
+src/jdk.compiler : jdk/src/jdk.compiler  langtools/src/jdk.compiler
+src/jdk.crypto.cryptoki : jdk/src/jdk.crypto.cryptoki
+src/jdk.crypto.ec : jdk/src/jdk.crypto.ec
+src/jdk.crypto.mscapi : jdk/src/jdk.crypto.mscapi
+src/jdk.dynalink : nashorn/src/jdk.dynalink
+src/jdk.editpad : jdk/src/jdk.editpad
+src/jdk.hotspot.agent : hotspot/src/jdk.hotspot.agent
+src/jdk.httpserver : jdk/src/jdk.httpserver
+src/jdk.incubator.httpclient : jdk/src/jdk.incubator.httpclient
+src/jdk.internal.ed : jdk/src/jdk.internal.ed
+src/jdk.internal.jvmstat : jdk/src/jdk.internal.jvmstat
+src/jdk.internal.le : jdk/src/jdk.internal.le
+src/jdk.internal.opt : jdk/src/jdk.internal.opt
+src/jdk.internal.vm.ci : hotspot/src/jdk.internal.vm.ci
+src/jdk.internal.vm.compiler : hotspot/src/jdk.internal.vm.compiler
+src/jdk.jartool : jdk/src/jdk.jartool
+src/jdk.javadoc : langtools/src/jdk.javadoc
+src/jdk.jcmd : jdk/src/jdk.jcmd
+src/jdk.jconsole : jdk/src/jdk.jconsole
+src/jdk.jdeps : langtools/src/jdk.jdeps
+src/jdk.jdi : jdk/src/jdk.jdi
+src/jdk.jdwp.agent : jdk/src/jdk.jdwp.agent
+src/jdk.jlink : jdk/src/jdk.jlink
+src/jdk.jshell : langtools/src/jdk.jshell
+src/jdk.jsobject : jdk/src/jdk.jsobject
+src/jdk.jstatd : jdk/src/jdk.jstatd
+src/jdk.localedata : jdk/src/jdk.localedata
+src/jdk.management : jdk/src/jdk.management
+src/jdk.management.agent : jdk/src/jdk.management.agent
+src/jdk.naming.dns : jdk/src/jdk.naming.dns
+src/jdk.naming.rmi : jdk/src/jdk.naming.rmi
+src/jdk.net : jdk/src/jdk.net
+src/jdk.pack : jdk/src/jdk.pack
+src/jdk.scripting.nashorn : nashorn/src/jdk.scripting.nashorn
+src/jdk.scripting.nashorn.shell : nashorn/src/jdk.scripting.nashorn.shell
+src/jdk.sctp : jdk/src/jdk.sctp
+src/jdk.security.auth : jdk/src/jdk.security.auth
+src/jdk.security.jgss : jdk/src/jdk.security.jgss
+src/jdk.unsupported : jdk/src/jdk.unsupported
+src/jdk.xml.bind : jaxws/src/jdk.xml.bind
+src/jdk.xml.dom : jaxp/src/jdk.xml.dom
+src/jdk.xml.ws : jaxws/src/jdk.xml.ws
+src/jdk.zipfs : jdk/src/jdk.zipfs
+src/langtools/sample : langtools/src/sample
+src/linux : jdk/src/linux
+src/sample : jdk/src/sample
+src/hotspot/share : hotspot/src/share/vm
+src/hotspot/cpu/aarch64 : hotspot/src/cpu/aarch64/vm
+src/hotspot/cpu/arm : hotspot/src/cpu/arm/vm
+src/hotspot/cpu/ppc : hotspot/src/cpu/ppc/vm
+src/hotspot/cpu/s390 : hotspot/src/cpu/s390/vm
+src/hotspot/cpu/x86 : hotspot/src/cpu/x86/vm
+src/hotspot/cpu/zero : hotspot/src/cpu/zero/vm
+src/hotspot/os/aix : hotspot/src/os/aix/vm
+src/hotspot/os/bsd : hotspot/src/os/bsd/vm
+src/hotspot/os/linux : hotspot/src/os/linux/vm
+src/hotspot/os/posix/dtrace : hotspot/src/os/posix/dtrace
+src/hotspot/os/posix : hotspot/src/os/posix/vm
+src/hotspot/os/windows : hotspot/src/os/windows/vm
+src/hotspot/os_cpu/aix_ppc : hotspot/src/os_cpu/aix_ppc/vm
+src/hotspot/os_cpu/bsd_x86 : hotspot/src/os_cpu/bsd_x86/vm
+src/hotspot/os_cpu/bsd_zero : hotspot/src/os_cpu/bsd_zero/vm
+src/hotspot/os_cpu/linux_aarch64 : hotspot/src/os_cpu/linux_aarch64/vm
+src/hotspot/os_cpu/linux_arm : hotspot/src/os_cpu/linux_arm/vm
+src/hotspot/os_cpu/linux_ppc : hotspot/src/os_cpu/linux_ppc/vm
+src/hotspot/os_cpu/linux_s390 : hotspot/src/os_cpu/linux_s390/vm
+src/hotspot/os_cpu/linux_x86 : hotspot/src/os_cpu/linux_x86/vm
+src/hotspot/os_cpu/linux_zero : hotspot/src/os_cpu/linux_zero/vm
+src/hotspot/os_cpu/windows_x86 : hotspot/src/os_cpu/windows_x86/vm
+src/hotspot : hotspot/src
+src/utils/IdealGraphVisualizer : hotspot/src/share/tools/IdealGraphVisualizer
+src/utils/LogCompilation : hotspot/src/share/tools/LogCompilation
+src/utils/hsdis : hotspot/src/share/tools/hsdis
+src/utils/reorder : jdk/make/non-build-utils/reorder
+src/utils/src/build : jdk/make/non-build-utils/src/build
+make/BuildNashorn.gmk : nashorn/make/BuildNashorn.gmk
+make/CompileDemos.gmk : jdk/make/CompileDemos.gmk
+make/CompileInterimLangtools.gmk : langtools/make/CompileInterim.gmk
+make/CompileModuleTools.gmk : jdk/make/CompileModuleTools.gmk
+make/CompileToolsHotspot.gmk : hotspot/make/CompileTools.gmk
+make/CompileToolsJdk.gmk : jdk/make/CompileTools.gmk
+make/CopyInterimCLDRConverter.gmk : jdk/make/CopyInterimCLDRConverter.gmk
+make/GenerateModuleSummary.gmk : jdk/make/GenerateModuleSummary.gmk
+make/ModuleTools.gmk : jdk/make/ModuleTools.gmk
+make/ToolsJdk.gmk : jdk/make/Tools.gmk
+make/ToolsLangtools.gmk : langtools/make/Tools.gmk
+make/UnpackSecurity.gmk : jdk/make/UnpackSecurity.gmk
+make/autoconf : common/autoconf
+make/conf : common/conf
+make/copy : jdk/make/copy
+make/copy/Copy-java.corba.gmk : corba/make/copy/Copy-java.corba.gmk
+make/corba : corba/make
+make/data : jdk/make/data
+make/gendata : jdk/make/gendata
+make/gendata/Gendata-jdk.compiler.gmk : langtools/make/gendata/Gendata-jdk.compiler.gmk
+make/gensrc : jdk/make/gensrc
+make/gensrc/Gensrc-java.corba.gmk : corba/make/gensrc/Gensrc-java.corba.gmk
+make/gensrc/Gensrc-jdk.compiler.gmk : langtools/make/gensrc/Gensrc-jdk.compiler.gmk
+make/gensrc/Gensrc-jdk.hotspot.agent.gmk : hotspot/make/gensrc/Gensrc-jdk.hotspot.agent.gmk
+make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk : hotspot/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
+make/gensrc/Gensrc-jdk.javadoc.gmk : langtools/make/gensrc/Gensrc-jdk.javadoc.gmk
+make/gensrc/Gensrc-jdk.jdeps.gmk : langtools/make/gensrc/Gensrc-jdk.jdeps.gmk
+make/gensrc/Gensrc-jdk.jshell.gmk : langtools/make/gensrc/Gensrc-jdk.jshell.gmk
+make/gensrc/GensrcCommonLangtools.gmk : langtools/make/gensrc/GensrcCommon.gmk
+make/hotspot : hotspot/make
+make/jdk : jdk/make
+make/langtools : langtools/make
+make/launcher : jdk/make/launcher
+make/lib : jdk/make/lib
+make/lib/Lib-jdk.hotspot.agent.gmk : hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
+make/mapfiles : jdk/make/mapfiles
+make/mapfiles/libjsig : hotspot/make/mapfiles/libjsig
+make/mapfiles/libjvm_db : hotspot/make/mapfiles/libjvm_db
+make/mapfiles/libjvm_dtrace : hotspot/make/mapfiles/libjvm_dtrace
+make/mapfiles/libsaproc : hotspot/make/mapfiles/libsaproc
+make/nashorn : nashorn/make
+make/nb_native : common/nb_native
+make/scripts/addNotices.sh : jdk/make/scripts/addNotices.sh
+make/scripts/compare.sh : common/bin/compare.sh
+make/scripts/compare_exceptions.sh.incl : common/bin/compare_exceptions.sh.incl
+make/scripts/genExceptions.sh : jdk/make/scripts/genExceptions.sh
+make/scripts/hide_important_warnings_from_javac.sh : common/bin/hide_important_warnings_from_javac.sh
+make/scripts/logger.sh : common/bin/logger.sh
+make/src/native/fixpath.c : common/src/fixpath.c
+make/test/JtregNativeHotspot.gmk : hotspot/make/test/JtregNative.gmk
+make/test/JtregNativeJdk.gmk : jdk/make/test/JtregNative.gmk
+test/jdk : jdk/test
+test/langtools : langtools/test
+test/nashorn : nashorn/test
+test/jaxp : jaxp/test
+test/hotspot/gtest : hotspot/test/native
+test/hotspot/jtreg : hotspot/test
+bin : common/bin
+bin/nashorn : nashorn/bin
+doc : common/doc
+doc/nashorn : nashorn/docs
--- a/bin/unshuffle_patch.sh
+++ b/bin/unshuffle_patch.sh
@@ -0,0 +1,237 @@
+#!/bin/bash
+#
+# Copyright (c) 2014, 2017, 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.
+#
+# 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.
+#
+
+# Script for updating a patch file as per the shuffled/unshuffled source location.
+
+usage() {
+  echo "Usage: $0 [-h|--help] [-v|--verbose] [-to9|-to10] [-r <repo>] <input_patch> <output_patch>"
+  echo "where:"
+  echo "  -to9            create patches appropriate for a JDK 9 source tree"
+  echo "                  When going to 9, the output patches will be suffixed with the"
+  echo "                  repo name"
+  echo "  -to10           create patches appropriate for a JDK 10 source tree"
+  echo "  -r <repo>       specify repo for source patch, set to 'top' for top repo"
+  echo "  <input_patch>   is the input patch file, that needs shuffling/unshuffling"
+  echo "  <output_patch>  is the updated patch file "
+  echo " "
+  exit 1
+}
+
+SCRIPT_DIR=`dirname $0`
+UNSHUFFLE_LIST=$SCRIPT_DIR"/unshuffle_list.txt"
+
+if [ ! -f "$UNSHUFFLE_LIST" ] ; then
+  echo "FATAL: cannot find $UNSHUFFLE_LIST" >&2
+  exit 1
+fi
+
+vflag="false"
+while [ $# -gt 0 ]
+do
+  case $1 in
+    -h | --help )
+      usage
+      ;;
+
+    -v | --verbose )
+      vflag="true"
+      ;;
+
+    -r)
+      repo="$2"
+      shift
+      ;;
+
+    -to9)
+      shuffle_to=9
+      ;;
+
+    -to10)
+      shuffle_to=10
+      ;;
+
+    -*)  # bad option
+      usage
+      ;;
+
+    * )  # non option
+      break
+      ;;
+  esac
+  shift
+done
+
+# Make sure we have the right number of arguments
+if [ ! $# -eq 2 ] ; then
+  echo "ERROR: Invalid number of arguments." >&2
+  usage
+fi
+
+# Check the given repo
+repos="top corba jaxp jaxws jdk langtools nashorn hotspot"
+found="false"
+if [ -n "$repo" ]; then
+  for r in $repos ; do
+    if [ $repo = "$r" ] ; then
+      found="true"
+      break;
+    fi
+  done
+  if [ $found = "false" ] ; then
+    echo "ERROR: Unknown repo: $repo. Should be one of [$repos]." >&2
+    usage
+  fi
+fi
+
+if [ "$shuffle_to" != "9" -a "$shuffle_to" != "10" ]; then
+  echo "ERROR: Must pick either -to9 or -to10"
+  exit 1
+fi
+
+# When going to 10, a repo must be specified for the source patch
+if [ "$shuffle_to" = "10" -a -z "$repo" ]; then
+  echo "ERROR: Must specify src repo for JDK 9 patch"
+  exit 1
+fi
+
+# Check given input/output files
+input="$1"
+if [ "x$input" = "x-" ] ; then
+  input="/dev/stdin"
+fi
+
+if [ ! -f $input -a "x$input" != "x/dev/stdin" ] ; then
+  echo "ERROR: Cannot find input patch file: $input" >&2
+  exit 1
+fi
+
+output="$2"
+if [ "x$output" = "x-" ] ; then
+  output="/dev/stdout"
+fi
+base_output="$output"
+
+if [ "$shuffle_to" = "10" ]; then
+  if [ -f $output -a "x$output" != "x/dev/stdout" ] ; then
+    echo "ERROR: Output patch already exists: $output" >&2
+    exit 1
+  fi
+else
+  for r in $repos; do
+    if [ -f "$output.$r" ]; then
+      echo "ERROR: Output patch already exists: $output.$r" >&2
+      exit 1
+    fi
+  done
+fi
+
+verbose() {
+  if [ ${vflag} = "true" ] ; then
+    echo "$@" >&2
+  fi
+}
+
+unshuffle() {
+  line=$@
+  verbose "Attempting to rewrite: \"$line\""
+
+  # Retrieve the file name
+  path=
+  if echo "$line" | egrep '^diff' > /dev/null ; then
+    if ! echo "$line" | egrep '\-\-git' > /dev/null ; then
+      echo "ERROR: Only git patches supported. Please use 'hg export --git ...'." >&2
+      exit 1
+    fi
+    path="`echo "$line" | sed -e s@'diff --git a/'@@ -e s@' b/.*$'@@`"
+  elif echo "$line" | egrep '^\-\-\-' > /dev/null ; then
+    path="`echo "$line" | sed -e s@'--- a/'@@`"
+  elif echo "$line" | egrep '^\+\+\+' > /dev/null ; then
+    path="`echo "$line" | sed s@'+++ b/'@@`"
+  fi
+  verbose "Extracted path: \"$path\""
+
+  # Find the most specific matches in the shuffle list
+  matches=
+  if [ -n "$repo" -a "$repo" != "top" ]; then
+    matchpath="$repo"/"$path"/x
+  else
+    matchpath="$path"/x
+  fi
+  while [ "$matchpath" != "" ] ; do
+    matchpath="`echo $matchpath | sed s@'\(.*\)/.*$'@'\1'@`"
+
+    if [ "$shuffle_to" =  "10" ] ; then
+      pattern=": $matchpath$"
+    else
+      pattern="^$matchpath :"
+    fi
+    verbose "Attempting to find \"$matchpath\""
+    matches=`egrep "$pattern" "$UNSHUFFLE_LIST"`
+    if ! [ "x${matches}" = "x" ] ; then
+      verbose "Got matches: [$matches]"
+      break;
+    fi
+
+    if ! echo "$matchpath" | egrep '.*/.*' > /dev/null ; then
+      break;
+    fi
+  done
+
+  # Rewrite the line, if we have a match
+  if ! [ "x${matches}" = "x" ] ; then
+    shuffled="${matches%% : *}"
+    unshuffled="${matches#* : }"
+    patch_suffix_9=""
+    for r in $repos; do
+      if [ "$unshuffled" != "${unshuffled#$r}" ]; then
+        unshuffled="${unshuffled#$r\/}"
+        patch_suffix_9=".$r"
+      fi
+    done
+    verbose "shuffled: $shuffled"
+    verbose "unshuffled: $unshuffled"
+    verbose "patch_suffix_9: $patch_suffix_9"
+    if [ "$shuffle_to" =  "10" ] ; then
+      newline="`echo "$line" | sed -e s@"$unshuffled"@"$shuffled"@g`"
+    else
+      newline="`echo "$line" | sed -e s@"$shuffled"@"$unshuffled"@g`"
+      output=$base_output$patch_suffix_9
+      verbose "Writing to $output"
+    fi
+    verbose "Rewriting to \"$newline\""
+    echo "$newline" >> $output
+  else
+    echo "WARNING: no match found for $path"
+    echo "$line" >> $output
+  fi
+}
+
+while IFS= read -r line
+do
+  if echo "$line" | egrep '^diff|^\-\-\-|^\+\+\+' > /dev/null ; then
+    unshuffle "$line"
+  else
+    printf "%s\n" "$line" >> $output
+  fi
+done < "$input"
--- a/bin/update_copyright_year.sh
+++ b/bin/update_copyright_year.sh
@@ -1,272 +0,0 @@
-#!/bin/bash -f
-
-#
-# Copyright (c) 2010, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# 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.
-#
-
-# Script to update the Copyright YEAR range in Mercurial & Git sources.
-#  (Originally from xdono, Thanks!)
-
-#------------------------------------------------------------
-copyright="Copyright"
-copyright_symbol="(c)"
-company="Oracle"
-year=`date +%Y`
-#------------------------------------------------------------
-
-awk="awk"
-
-# Stop on any error
-set -e
-
-# To allow total changes counting
-shopt -s lastpipe
-
-# Temp area
-tmp=/tmp/`basename $0`.${USER}.$$
-rm -f -r ${tmp}
-mkdir -p ${tmp}
-total=0
-
-usage="Usage: `basename "$0"` [-c company] [-y year] [-h|f]"
-Help()
-{
-  # Display Help
-  echo "Updates the Copyright year range in Git sources."
-  echo
-  echo "By default, the tool limits the processed changesets "
-  echo "to those in the current branch and the current year."
-  echo
-  echo "Note, cancelling the script will skip cleanup in /tmp."
-  echo
-  echo $usage
-  echo "options:"
-  echo "-c     Specifies the company. Set to Oracle by default."
-  echo "-y     Specifies the copyright year. Set to current year by default."
-  echo "-b     Specifies the base reference for change set lookup."
-  echo "-f     Updates the copyright for all change sets in a given year,"
-  echo "       as specified by -y. Overrides -b flag."
-  echo "-h     Print this help."
-  echo
-}
-
-full_year=false
-base_reference=master
-
-# Process options
-while getopts "b:c:fhy:" option; do
-  case $option in
-    b) # supplied base reference
-      base_reference=${OPTARG}
-      ;;
-    c) # supplied company year
-      company=${OPTARG}
-      ;;
-    f) # update all change sets in a full year
-      full_year=true
-      ;;
-    h) # display help
-      Help
-      exit 0
-      ;;
-    y) # supplied company year
-      year=${OPTARG}
-      ;;
-    \?) # illegal option
-      echo "$usage"
-      exit 1
-      ;;
-  esac
-done
-
-# VCS check
-git_installed=false
-which git > /dev/null && git_installed=true
-if [ "$git_installed" != "true" ]; then
-  echo "Error: This script requires git. Please install it."
-  exit 1
-fi
-git_found=false
-git status &> /dev/null && git_found=true
-if [ "$git_found" != "true" ]; then
-  echo "Error: Please execute script from within a JDK git repository."
-  exit 1
-else
-  echo "Using Git version control system"
-  vcs_status=(git ls-files -m)
-  if [ "$full_year" = "true" ]; then
-    vcs_list_changesets=(git log --no-merges --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
-  else
-    vcs_list_changesets=(git log --no-merges "${base_reference}..HEAD" --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
-  fi
-  vcs_changeset_message=(git log -1 --pretty=tformat:"%B") # followed by ${changeset}
-  vcs_changeset_files=(git diff-tree --no-commit-id --name-only -r) # followed by ${changeset}
-fi
-
-# Return true if it makes sense to edit this file
-saneFileToCheck()
-{
-  if [ "$1" != "" -a -f $1 ] ; then
-    isText=`file "$1" | grep -i -E '(text|source)' | cat`
-    hasCopyright=`grep 'Copyright' "$1" | cat`
-    lastLineCount=`tail -1 "$1" | wc -l`
-    if [ "${isText}" != ""  \
-         -a "${hasCopyright}" != "" \
-	 -a ${lastLineCount} -eq 1 ] ; then
-      echo "true"
-    else
-      echo "false"
-    fi
-  else
-    echo "false"
-  fi
-}
-
-# Update the copyright year on a file
-updateFile() # file
-{
-  changed="false"
-  if [ `saneFileToCheck "$1"` = "true" ] ; then
-    rm -f $1.OLD
-    mv $1 $1.OLD
-    cat $1.OLD | \
-      sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9], ${company}@\1 ${year}, ${company}@" | \
-      sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9] ${company}@\1 ${year} ${company}@" | \
-      sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) ${company}@\1 ${year}, ${company}@" | \
-      sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9],\) ${company}@\1, ${year}, ${company}@" | \
-      sed -e "s@\(${copyright} \(${copyright_symbol} \)\{0,1\}[12][0-9][0-9][0-9]\) ${company}@\1, ${year} ${company}@" | \
-      sed -e "s@${copyright} ${year}, ${year}, ${company}@${copyright} ${year}, ${company}@" | \
-      sed -e "s@${copyright} ${copyright_symbol} ${year}, ${year}, ${company}@${copyright} ${copyright_symbol} ${year}, ${company}@"  \
-      > $1
-    if ! diff -b -w $1.OLD $1 > /dev/null ; then \
-      changed="true"
-      rm -f $1.OLD
-    else
-      rm -f $1
-      mv $1.OLD $1
-    fi
-  fi
-  echo "${changed}"
-}
-
-# Update the copyright year on all files changed by this changeset
-updateChangesetFiles() # changeset
-{
-  count=0
-  files=${tmp}/files.$1
-  rm -f ${files}
-  "${vcs_changeset_files[@]}" "$1" | expand \
-    | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' \
-    > ${files}
-  if [ -f "${files}" -a -s "${files}" ] ; then
-    fcount=`cat ${files}| wc -l`
-    for i in `cat ${files}` ; do
-      if [ `updateFile "${i}"` = "true" ] ; then
-        count=`expr ${count} '+' 1`
-      fi
-    done
-    if [ ${count} -gt 0 ] ; then
-      printf "  UPDATED year on %d of %d files.\n" ${count} ${fcount}
-      total=`expr ${total} '+' ${count}`
-    else
-      printf "  None of the %d files were changed.\n" ${fcount}
-    fi
-  else
-    printf "  ERROR: No files changed in the changeset? Must be a mistake.\n"
-    set -x
-    ls -al ${files}
-    "${vcs_changeset_files[@]}" "$1"
-    "${vcs_changeset_files[@]}" "$1" | expand \
-      | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}'
-    set +x
-    exit 1
-  fi
-  rm -f ${files}
-}
-
-# Check if repository is clean
-previous=`"${vcs_status[@]}"|wc -l`
-if [ ${previous} -ne 0 ] ; then
-  echo "WARNING: This repository contains previously edited working set files."
-  echo "  ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`"
-fi
-
-# Get all changesets this year
-all_changesets=${tmp}/all_changesets
-rm -f ${all_changesets}
-"${vcs_list_changesets[@]}" > ${all_changesets}
-
-# Check changeset to see if it is Copyright only changes, filter changesets
-if [ -s ${all_changesets} ] ; then
-  echo "Changesets made in ${year}: `cat ${all_changesets} | wc -l`"
-  index=0
-  cat ${all_changesets} | while read changeset ; do
-    index=`expr ${index} '+' 1`
-    desc=${tmp}/desc.${changeset}
-    rm -f ${desc}
-    echo "------------------------------------------------"
-    "${vcs_changeset_message[@]}" "${changeset}" > ${desc}
-    printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`"
-    if [ "${year}" = "2010" ] ; then
-      if cat ${desc} | grep -i -F "Added tag" > /dev/null ; then
-        printf "  EXCLUDED tag changeset.\n"
-      elif cat ${desc} | grep -i -F rebrand > /dev/null ; then
-        printf "  EXCLUDED rebrand changeset.\n"
-      elif cat ${desc} | grep -i -F copyright > /dev/null ; then
-        printf "  EXCLUDED copyright changeset.\n"
-      else
-        updateChangesetFiles ${changeset}
-      fi
-    else
-      if cat ${desc} | grep -i -F "Added tag" > /dev/null ; then
-        printf "  EXCLUDED tag changeset.\n"
-      elif cat ${desc} | grep -i -F "copyright year" > /dev/null ; then
-        printf "  EXCLUDED copyright year changeset.\n"
-      else
-        updateChangesetFiles ${changeset}
-      fi
-    fi
-    rm -f ${desc}
-  done
-fi
-
-if [ ${total} -gt 0 ] ; then
-   echo "---------------------------------------------"
-   echo "Updated the copyright year on a total of ${total} files."
-   if [ ${previous} -eq 0 ] ; then
-     echo "This count should match the count of modified files in the repository: ${vcs_status[*]}"
-   else
-     echo "WARNING: This repository contained previously edited working set files."
-   fi
-   echo "  ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`"
-else
-   echo "---------------------------------------------"
-   echo "No files were changed"
-   if [ ${previous} -ne 0 ] ; then
-     echo "WARNING: This repository contained previously edited working set files."
-   fi
-   echo "  ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`"
-fi
-
-# Cleanup
-rm -f -r ${tmp}
-exit 0
--- a/bin/update_pch.sh
+++ b/bin/update_pch.sh
@@ -1,111 +0,0 @@
-#!/bin/sh
-# Copyright (c) 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# 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.
-
-# The output of this script may require some degree of human curation:
-# - Redundant headers, e.g. both x.hpp, x.inline.hpp are included;
-# - Headers relative to a non-default feature should be protected by an
-#   appropriate 'if' clause to make sure all variants can build without
-#   errors.
-
-source_path="$(dirname ${0})"
-this_script_dir="$(cd -- "${source_path}" > /dev/null && pwd)"
-if test -z "${this_script_dir}"; then
-  echo "Error: Could not determine location of this script"
-  exit 1
-fi
-
-# Work in top directory
-cd $this_script_dir/..
-
-# Time threshold for header compilation, if the time exceeds the
-# threshold the header will be precompiled.
-if [ -z "$MIN_MS" ]; then
-  MIN_MS=100000
-fi
-
-if [ -z "$CLEAN" ]; then
-  CLEAN=true
-elif [ "$CLEAN" != "true" ] && [ "$CLEAN" != "false" ]; then
-  echo "Expected either 'true' or 'false' for CLEAN"
-fi
-
-# CBA_PATH should point to a valid ClangBuildAnalyzer executable.
-# Build steps:
-# git clone --depth 1 git@github.com:aras-p/ClangBuildAnalyzer.git
-# cd ClangBuildAnalyzer
-# make -f projects/make/Makefile
-if [ -z "$CBA_PATH" ]; then
-  CBA_PATH="./ClangBuildAnalyzer/build/ClangBuildAnalyzer"
-fi
-
-set -eux
-
-PRECOMPILED_HPP="src/hotspot/share/precompiled/precompiled.hpp"
-CBA_CONFIG="ClangBuildAnalyzer.ini"
-TIMESTAMP="$(date +%Y%m%d-%H%M)"
-RUN_NAME="pch_update_$TIMESTAMP"
-CBA_OUTPUT="cba_out_$TIMESTAMP"
-
-if [ "$CLEAN" = "true" ]; then
-  trap 'rm -rf "build/'"$RUN_NAME"'" "$CBA_OUTPUT" "$CBA_CONFIG"' EXIT
-fi
-
-sh configure --with-toolchain-type=clang \
-             --with-conf-name="$RUN_NAME" \
-             --disable-precompiled-headers \
-             --with-extra-cxxflags="-ftime-trace" \
-             --with-extra-cflags="-ftime-trace"
-
-make clean CONF_NAME="$RUN_NAME"
-make hotspot CONF_NAME="$RUN_NAME"
-"$CBA_PATH" --all "./build/$RUN_NAME/hotspot/variant-server/libjvm/objs" \
-  "$CBA_OUTPUT"
-
-# Preserve license and comments on top
-cat "$PRECOMPILED_HPP" | awk '/^#include/ {exit} {print}' > "$PRECOMPILED_HPP.tmp"
-
-if [ ! -f "$CBA_CONFIG" ]; then
-cat <<EOF > "$CBA_CONFIG"
-[counts]
-header=100
-headerChain=0
-template=0
-function=0
-fileCodegen=0
-fileParse=0
-
-[misc]
-onlyRootHeaders=true
-EOF
-fi
-
-"$CBA_PATH" --analyze "$CBA_OUTPUT" | \
-  grep " ms: " | \
-  # Keep the headers more expensive than ${1}ms
-  awk -v x="$MIN_MS" '$1 < x { exit } { print $3 }' | \
-  # Filter away non-hotspot headers
-  grep hotspot/share | \
-  awk -F "hotspot/share/" '{ printf "#include \"%s\"\n", $2 }' \
-  >> "$PRECOMPILED_HPP.tmp"
-mv "$PRECOMPILED_HPP.tmp" "$PRECOMPILED_HPP"
-
-java test/hotspot/jtreg/sources/SortIncludes.java --update "$PRECOMPILED_HPP"
--- a/0
+++ b/0
--- a/doc/building.html
+++ b/doc/building.html
@@ -282,34 +282,9 @@ possible, use an SSD. The build process is very disk intensive, and
 having slow disk access will significantly increase build times. If you
 need to use a network share for the source code, see below for
 suggestions on how to keep the build artifacts on a local disk.</p></li>
-<li><p>UTF-8 support is needed to compile the JDK. On Unix systems, this
-typically means that the <code>C.UTF-8</code> or
-<code>en_US.UTF-8</code> locale needs to be available. For Windows
-users, please see the section on <a href="#locale-requirements">Locale
-Requirements</a> below.</p></li>
-<li><p>On Windows, extra care must be taken to have a smooth building
-experience:</p>
-<ul>
-<li><p>Make sure that all relevant paths have short names. Short names
-are used by the build system to create space-free alternative paths.
-Short name creation is enabled per volume. The default setting can be
-checked with the command: <code>fsutil 8dot3name query</code>. If short
-name creation was turned off when a directory was created, it will not
-have a short name. Whether a short name exists can be checked by running
-<code>dir /X</code> in the containing directory (in cmd.exe). If a short
-path is present you should see something like 'ASDF~1' being displayed
-in one of the columns of the ouput. If a directory is missing a short
-name, the safest way to get one is to enable short names for that
-particular volume with
-<code>fsutil 8dot3name set &lt;drive   letter&gt;: 0</code> (note that
-you need to run as administrator for this), and then re-create the
-particular directory. A short name should be generated automatically
-then. Another option is to manually assign a short name to the directory
-using
-<code>fsutil file setShortName &lt;path&gt; &lt;short name&gt;</code>.</p></li>
-<li><p>If using <a href="#cygwin">Cygwin</a>, you must make sure the
-file permissions and attributes between Windows and Cygwin are
-consistent. It is recommended that you follow this procedure:</p>
+<li><p>On Windows, if using <a href="#cygwin">Cygwin</a>, extra care
+must be taken to make sure the environment is consistent. It is
+recommended that you follow this procedure:</p>
 <ul>
 <li><p>Create the directory that is going to contain the top directory
 of the JDK clone by using the <code>mkdir</code> command in the Cygwin
@@ -319,9 +294,6 @@ it's children will inherit those attributes.</p></li>
 <li><p>Do not put the JDK clone in a path under your Cygwin home
 directory. This is especially important if your user name contains
 spaces and/or mixed upper and lower case letters.</p></li>
-</ul>
-<p>Failure to follow these procedures might result in hard-to-debug
-build problems.</p></li>
 <li><p>You need to install a git client. You have two choices, Cygwin
 git or Git for Windows. Unfortunately there are pros and cons with each
 choice.</p>
@@ -339,7 +311,9 @@ It does work well with the Skara CLI tooling, however. To alleviate the
 line ending problems, make sure you set <code>core.autocrlf</code> to
 <code>false</code> (this is asked during installation).</p></li>
 </ul></li>
-</ul></li>
+</ul>
+<p>Failure to follow this procedure might result in hard-to-debug build
+problems.</p></li>
 </ul>
 <h2 id="build-hardware-requirements">Build Hardware Requirements</h2>
 <p>The JDK is a massive project, and require machines ranging from
@@ -355,8 +329,8 @@ GB of free disk space is required.</p>
 <p>Even for 32-bit builds, it is recommended to use a 64-bit build
 machine, and instead create a 32-bit target using
 <code>--with-target-bits=32</code>.</p>
-<p>Note: The 32-bit x86 port is deprecated and may be removed in a
-future release.</p>
+<p>Note: The Windows 32-bit x86 port is deprecated and may be removed in
+a future release.</p>
 <h3 id="building-on-aarch64">Building on aarch64</h3>
 <p>At a minimum, a machine with 8 cores is advisable, as well as 8 GB of
 RAM. (The more cores to use, the more memory you need.) At least 6 GB of
@@ -402,7 +376,7 @@ to date at the time of writing.</p>
 </tr>
 <tr class="odd">
 <td>macOS</td>
-<td>macOS 14.x</td>
+<td>macOS 13.x (Ventura)</td>
 </tr>
 <tr class="even">
 <td>Windows</td>
@@ -419,7 +393,8 @@ Build Platforms</a>. From time to time, this is updated by contributors
 to list successes or failures of building on different platforms.</p>
 <h3 id="windows">Windows</h3>
 <p>Windows XP is not a supported platform, but all newer Windows should
-be able to build the JDK.</p>
+be able to build the JDK. (Note: The Windows 32-bit x86 port is
+deprecated and may be removed in a future release.)</p>
 <p>On Windows, it is important that you pay attention to the
 instructions in the <a href="#special-considerations">Special
 Considerations</a>.</p>
@@ -539,8 +514,8 @@ this makes it difficult for a project such as the JDK to keep pace with
 a continuously updated machine running macOS. See the section on <a
 href="#apple-xcode">Apple Xcode</a> on some strategies to deal with
 this.</p>
-<p>It is recommended that you use at least macOS 14 and Xcode 15.4, but
-earlier versions may also work.</p>
+<p>It is recommended that you use at least macOS 13 (Ventura) and Xcode
+14, but earlier versions may also work.</p>
 <p>The standard macOS environment contains the basic tooling needed to
 build, but for external libraries a package manager is recommended. The
 JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but
@@ -612,15 +587,15 @@ to compile successfully without issues.</p>
 <tbody>
 <tr class="odd">
 <td>Linux</td>
-<td>gcc 14.2.0</td>
+<td>gcc 13.2.0</td>
 </tr>
 <tr class="even">
 <td>macOS</td>
-<td>Apple Xcode 15.4 (using clang 15.0.0)</td>
+<td>Apple Xcode 14.3.1 (using clang 14.0.3)</td>
 </tr>
 <tr class="odd">
 <td>Windows</td>
-<td>Microsoft Visual Studio 2022 version 17.13.2</td>
+<td>Microsoft Visual Studio 2022 version 17.6.5</td>
 </tr>
 </tbody>
 </table>
@@ -630,7 +605,7 @@ standard for C, and C++14 for C++.</p>
 <p>The minimum accepted version of gcc is 10.0. Older versions will not
 be accepted by <code>configure</code>.</p>
 <p>The JDK is currently known to compile successfully with gcc version
-14.2 or newer.</p>
+13.2 or newer.</p>
 <p>In general, any version between these two should be usable.</p>
 <h3 id="clang">clang</h3>
 <p>The minimum accepted version of clang is 13. Older versions will not
@@ -639,9 +614,10 @@ 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 13.0.</p>
-<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>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>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>
@@ -889,12 +865,12 @@ href="https://www.gnu.org/software/bash">GNU Bash</a>. No other shells
 are supported.</p>
 <p>At least version 3.2 of GNU Bash must be used.</p>
 <h3 id="graphviz-and-pandoc">Graphviz and Pandoc</h3>
-<p>In order to build man pages and the full docs (see the
+<p>In order to build the full docs (see the
 <code>--enable-full-docs</code> configure option) <a
-href="https://pandoc.org">Pandoc</a> is required. For full docs also <a
-href="https://www.graphviz.org">Graphviz</a> is required. Any recent
-versions should work. For reference, and subject to change, Oracle
-builds use Graphviz 9.0.0 and Pandoc 2.19.2.</p>
+href="https://www.graphviz.org">Graphviz</a> and <a
+href="https://pandoc.org">Pandoc</a> are required. Any recent versions
+should work. For reference, and subject to change, Oracle builds use
+Graphviz 9.0.0 and Pandoc 2.19.2.</p>
 <h2 id="running-configure">Running Configure</h2>
 <p>To build the JDK, you need a "configuration", which consists of a
 directory where to store the build output, coupled with information
@@ -1451,10 +1427,10 @@ of a cross-compiling toolchain and a sysroot environment which can
 easily be used together with the <code>--with-devkit</code> configure
 option to cross compile the JDK. On Linux/x86_64, the following
 command:</p>
-<pre><code>bash configure --with-devkit=&lt;devkit-path&gt; --openjdk-target=ppc64le-linux-gnu &amp;&amp; make</code></pre>
-<p>will configure and build the JDK for Linux/ppc64le assuming that
-<code>&lt;devkit-path&gt;</code> points to a Linux/x86_64 to
-Linux/ppc64le devkit.</p>
+<pre><code>bash configure --with-devkit=&lt;devkit-path&gt; --openjdk-target=ppc64-linux-gnu &amp;&amp; make</code></pre>
+<p>will configure and build the JDK for Linux/ppc64 assuming that
+<code>&lt;devkit-path&gt;</code> points to a Linux/x86_64 to Linux/ppc64
+devkit.</p>
 <p>Devkits can be created from the <code>make/devkit</code> directory by
 executing:</p>
 <pre><code>make [ TARGETS=&quot;&lt;TARGET_TRIPLET&gt;+&quot; ] [ BASE_OS=&lt;OS&gt; ] [ BASE_OS_VERSION=&lt;VER&gt; ]</code></pre>
@@ -1481,22 +1457,22 @@ following targets are known to work:</p>
 <td>arm-linux-gnueabihf</td>
 </tr>
 <tr class="even">
-<td>ppc64le-linux-gnu</td>
+<td>ppc64-linux-gnu</td>
 </tr>
 <tr class="odd">
-<td>riscv64-linux-gnu</td>
+<td>ppc64le-linux-gnu</td>
 </tr>
 <tr class="even">
 <td>s390x-linux-gnu</td>
 </tr>
 </tbody>
 </table>
-<p><code>BASE_OS</code> must be one of <code>OL</code> for Oracle
-Enterprise Linux or <code>Fedora</code>. If the base OS is
-<code>Fedora</code> the corresponding Fedora release can be specified
-with the help of the <code>BASE_OS_VERSION</code> option. If the build
-is successful, the new devkits can be found in the
-<code>build/devkit/result</code> subdirectory:</p>
+<p><code>BASE_OS</code> must be one of "OEL6" for Oracle Enterprise
+Linux 6 or "Fedora" (if not specified "OEL6" will be the default). If
+the base OS is "Fedora" the corresponding Fedora release can be
+specified with the help of the <code>BASE_OS_VERSION</code> option (with
+"27" as default version). If the build is successful, the new devkits
+can be found in the <code>build/devkit/result</code> subdirectory:</p>
 <pre><code>cd make/devkit
 make TARGETS=&quot;ppc64le-linux-gnu aarch64-linux-gnu&quot; BASE_OS=Fedora BASE_OS_VERSION=21
 ls -1 ../../build/devkit/result/
@@ -1748,20 +1724,6 @@ packages in the sysroot, configure the build with
 --with-devkit=$DEVKIT \
 --with-sysroot=$SYSROOT</code></pre>
 <p>and run <code>make</code> normally.</p>
-<h4 id="building-for-windows-aarch64">Building for Windows AArch64</h4>
-<p>The Visual Studio Build Tools can be used for building the JDK
-without a full Visual Studio installation. To set up the Visual Studio
-2022 Build Tools on a Windows AArch64 machine for a native build, launch
-the installer as follows in a Windows command prompt:</p>
-<pre><code>vs_buildtools.exe --quiet --wait --norestart --nocache ^
--installPath &quot;%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools&quot; ^
--add Microsoft.VisualStudio.Component.VC.CoreBuildTools ^
--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 ^
--add Microsoft.VisualStudio.Component.Windows11SDK.22621</code></pre>
-<p>To generate Windows AArch64 builds using Cygwin on a Windows x64
-machine, you must set the proper target platform by adding
-<code>--openjdk-target=aarch64-unknown-cygwin</code> to your configure
-command line.</p>
 <h2 id="build-performance">Build Performance</h2>
 <p>Building the JDK requires a lot of horsepower. Some of the build
 tools can be adjusted to utilize more or less of resources such as
@@ -2055,18 +2017,10 @@ some directory names have spaces. Usually, it assumes those directories
 have <a
 href="https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/fsutil-8dot3name">short
 paths</a>. You can run <code>fsutil file setshortname</code> in
-<code>cmd</code> on directories to assign arbitrary short paths so
-<code>configure</code> can access them. If the result says "Access
-denied", it may be that there are processes running in that directory;
-in this case, you can reboot Windows in safe mode and run the command on
-those directories again.</p>
-<p>The only directories required to have short paths are
-<code>Microsoft Visual Studio</code> and <code>Windows Kits</code>; the
-rest of the "contains space" warnings from <code>configure</code>, such
-as <code>IntelliJ IDEA</code>, can be ignored. You can choose any short
-name; once it is set, <code>configure</code>'s tools like
-<code>cygpath</code> can convert the directory with spaces to your
-chosen short name and pass it to the build system.</p>
+<code>cmd</code> on certain directories, such as
+<code>Microsoft Visual Studio</code> or <code>Windows Kits</code>, to
+assign arbitrary short paths so <code>configure</code> can access
+them.</p>
 <h3 id="getting-help">Getting Help</h3>
 <p>If none of the suggestions in this document helps you, or if you find
 what you believe is a bug in the build system, please contact the Build
--- a/doc/building.md
+++ b/doc/building.md
@@ -83,44 +83,19 @@ on where and how to check out the source code.
  for the source code, see below for suggestions on how to keep the build
  artifacts on a local disk.

-* UTF-8 support is needed to compile the JDK. On Unix systems, this typically
-  means that the `C.UTF-8` or `en_US.UTF-8` locale needs to be available. For
-  Windows users, please see the section on [Locale
-  Requirements](#locale-requirements) below.
+* On Windows, if using [Cygwin](#cygwin), extra care must be taken to make sure
+  the environment is consistent. It is recommended that you follow this
+  procedure:

-* On Windows, extra care must be taken to have a smooth building experience:
+  * Create the directory that is going to contain the top directory of the JDK
+    clone by using the `mkdir` command in the Cygwin bash shell. That is, do
+    *not* create it using Windows Explorer. This will ensure that it will have
+    proper Cygwin attributes, and that it's children will inherit those
+    attributes.

-  * Make sure that all relevant paths have short names. Short names are used by
-    the build system to create space-free alternative paths. Short name
-    creation is enabled per volume. The default setting can be checked with the
-    command: `fsutil 8dot3name query`. If short name creation was turned off
-    when a directory was created, it will not have a short name. Whether a
-    short name exists can be checked by running `dir /X` in the containing
-    directory (in cmd.exe). If a short path is present you should see something
-    like 'ASDF~1' being displayed in one of the columns of the ouput. If a
-    directory is missing a short name, the safest way to get one is to enable
-    short names for that particular volume with `fsutil 8dot3name set <drive
-    letter>: 0` (note that you need to run as administrator for this), and then
-    re-create the particular directory. A short name should be generated
-    automatically then. Another option is to manually assign a short name to
-    the directory using `fsutil file setShortName <path> <short name>`.
-
-  * If using [Cygwin](#cygwin), you must make sure the file permissions and
-    attributes between Windows and Cygwin are consistent. It is recommended
-    that you follow this procedure:
-
-    * Create the directory that is going to contain the top directory of the
-      JDK clone by using the `mkdir` command in the Cygwin bash shell. That is,
-      do *not* create it using Windows Explorer. This will ensure that it will
-      have proper Cygwin attributes, and that it's children will inherit those
-      attributes.
-
-    * Do not put the JDK clone in a path under your Cygwin home directory. This
-      is especially important if your user name contains spaces and/or mixed
-      upper and lower case letters.
-
-    Failure to follow these procedures might result in hard-to-debug build
-    problems.
+  * Do not put the JDK clone in a path under your Cygwin home directory. This
+    is especially important if your user name contains spaces and/or mixed
+    upper and lower case letters.

  * You need to install a git client. You have two choices, Cygwin git or Git
    for Windows. Unfortunately there are pros and cons with each choice.
@@ -138,6 +113,9 @@ on where and how to check out the source code.
      make sure you set `core.autocrlf` to `false` (this is asked during
      installation).

+  Failure to follow this procedure might result in hard-to-debug build
+  problems.
+
 ## Build Hardware Requirements

 The JDK is a massive project, and require machines ranging from decent to
@@ -156,7 +134,8 @@ space is required.
 Even for 32-bit builds, it is recommended to use a 64-bit build machine, and
 instead create a 32-bit target using `--with-target-bits=32`.

-Note: The 32-bit x86 port is deprecated and may be removed in a future release.
+Note: The Windows 32-bit x86 port is deprecated and may be removed in a future
+release.

 ### Building on aarch64

@@ -197,7 +176,7 @@ time of writing.
 | ----------------- | ---------------------------------- |
 | Linux/x64         | Oracle Enterprise Linux 6.4 / 8.x  |
 | Linux/aarch64     | Oracle Enterprise Linux 7.6 / 8.x  |
-| macOS             | macOS 14.x                         |
+| macOS             | macOS 13.x (Ventura)               |
 | Windows           | Windows Server 2016                |

 The double version numbers for Linux are due to the hybrid model used at
@@ -212,7 +191,8 @@ on different platforms.
 ### Windows

 Windows XP is not a supported platform, but all newer Windows should be able to
-build the JDK.
+build the JDK. (Note: The Windows 32-bit x86 port is deprecated and may be
+removed in a future release.)

 On Windows, it is important that you pay attention to the instructions in the
 [Special Considerations](#special-considerations).
@@ -349,7 +329,7 @@ difficult for a project such as the JDK to keep pace with a continuously
 updated machine running macOS. See the section on [Apple Xcode](#apple-xcode)
 on some strategies to deal with this.

-It is recommended that you use at least macOS 14 and Xcode 15.4, but
+It is recommended that you use at least macOS 13 (Ventura) and Xcode 14, but
 earlier versions may also work.

 The standard macOS environment contains the basic tooling needed to build, but
@@ -412,11 +392,11 @@ possible to compile the JDK with both older and newer versions, but the closer
 you stay to this list, the more likely you are to compile successfully without
 issues.

-| Operating system   | Toolchain version                            |
-| ------------------ | -------------------------------------------- |
-| Linux              | gcc 14.2.0                                   |
-| macOS              | Apple Xcode 15.4 (using clang 15.0.0)       |
-| Windows            | Microsoft Visual Studio 2022 version 17.13.2 |
+| Operating system   | Toolchain version                           |
+| ------------------ | ------------------------------------------- |
+| Linux              | gcc 13.2.0                                  |
+| macOS              | Apple Xcode 14.3.1 (using clang 14.0.3)     |
+| Windows            | Microsoft Visual Studio 2022 version 17.6.5 |

 All compilers are expected to be able to handle the C11 language standard for
 C, and C++14 for C++.
@@ -426,7 +406,7 @@ C, and C++14 for C++.
 The minimum accepted version of gcc is 10.0. Older versions will not be accepted
 by `configure`.

-The JDK is currently known to compile successfully with gcc version 14.2 or
+The JDK is currently known to compile successfully with gcc version 13.2 or
 newer.

 In general, any version between these two should be usable.
@@ -442,9 +422,13 @@ To use clang instead of gcc on Linux, use `--with-toolchain-type=clang`.

 The oldest supported version of Xcode is 13.0.

-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.
+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
+```

 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:
@@ -702,9 +686,9 @@ At least version 3.2 of GNU Bash must be used.

 ### Graphviz and Pandoc

-In order to build man pages and the full docs (see the `--enable-full-docs`
-configure option) [Pandoc](https://pandoc.org) is required. For full docs also
-[Graphviz](https://www.graphviz.org) is required. Any recent versions should
+In order to build the full docs (see the `--enable-full-docs`
+configure option) [Graphviz](https://www.graphviz.org) and
+[Pandoc](https://pandoc.org) are required. Any recent versions should
 work. For reference, and subject to change, Oracle builds use Graphviz
 9.0.0 and Pandoc 2.19.2.

@@ -1258,11 +1242,11 @@ toolchain and a sysroot environment which can easily be used together with the
 following command:

 ```
-bash configure --with-devkit=<devkit-path> --openjdk-target=ppc64le-linux-gnu && make
+bash configure --with-devkit=<devkit-path> --openjdk-target=ppc64-linux-gnu && make
 ```

-will configure and build the JDK for Linux/ppc64le assuming that `<devkit-path>`
-points to a Linux/x86_64 to Linux/ppc64le devkit.
+will configure and build the JDK for Linux/ppc64 assuming that `<devkit-path>`
+points to a Linux/x86_64 to Linux/ppc64 devkit.

 Devkits can be created from the `make/devkit` directory by executing:

@@ -1281,14 +1265,16 @@ at least the following targets are known to work:
 | x86_64-linux-gnu         |
 | aarch64-linux-gnu        |
 | arm-linux-gnueabihf      |
+| ppc64-linux-gnu          |
 | ppc64le-linux-gnu        |
-| riscv64-linux-gnu        |
 | s390x-linux-gnu          |

-`BASE_OS` must be one of `OL` for Oracle Enterprise Linux or `Fedora`. If the
-base OS is `Fedora` the corresponding Fedora release can be specified with the
-help of the `BASE_OS_VERSION` option. If the build is successful, the new
-devkits can be found in the `build/devkit/result` subdirectory:
+`BASE_OS` must be one of "OEL6" for Oracle Enterprise Linux 6 or "Fedora" (if
+not specified "OEL6" will be the default). If the base OS is "Fedora" the
+corresponding Fedora release can be specified with the help of the
+`BASE_OS_VERSION` option (with "27" as default version). If the build is
+successful, the new devkits can be found in the `build/devkit/result`
+subdirectory:

 ```
 cd make/devkit
@@ -1477,24 +1463,6 @@ sh ./configure --with-jvm-variants=server \

 and run `make` normally.

-#### Building for Windows AArch64
-The Visual Studio Build Tools can be used for building the JDK without a full
-Visual Studio installation. To set up the Visual Studio 2022 Build Tools on a
-Windows AArch64 machine for a native build, launch the installer as follows
-in a Windows command prompt:
-
-```
-vs_buildtools.exe --quiet --wait --norestart --nocache ^
--installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" ^
--add Microsoft.VisualStudio.Component.VC.CoreBuildTools ^
--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 ^
--add Microsoft.VisualStudio.Component.Windows11SDK.22621
-```
-
-To generate Windows AArch64 builds using Cygwin on a Windows x64 machine,
-you must set the proper target platform by adding
-`--openjdk-target=aarch64-unknown-cygwin` to your configure command line.
-
 ## Build Performance

 Building the JDK requires a lot of horsepower. Some of the build tools can be
@@ -1836,17 +1804,9 @@ temporarily.
 On Windows, when configuring, `fixpath.sh` may report that some directory names
 have spaces. Usually, it assumes those directories have [short
 paths](https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/fsutil-8dot3name).
-You can run `fsutil file setshortname` in `cmd` on directories to assign
-arbitrary short paths so `configure` can access them. If the result says "Access
-denied", it may be that there are processes running in that directory; in this
-case, you can reboot Windows in safe mode and run the command on those directories
-again.
-
-The only directories required to have short paths are `Microsoft Visual Studio`
-and `Windows Kits`; the rest of the "contains space" warnings from `configure`,
-such as `IntelliJ IDEA`, can be ignored. You can choose any short name; once it
-is set, `configure`'s tools like `cygpath` can convert the directory with spaces
-to your chosen short name and pass it to the build system.
+You can run `fsutil file setshortname` in `cmd` on certain directories, such as
+`Microsoft Visual Studio` or `Windows Kits`, to assign arbitrary short paths so
+`configure` can access them.

 ### Getting Help

--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
--- a/doc/hotspot-unit-tests.html
+++ b/doc/hotspot-unit-tests.html
@@ -189,7 +189,7 @@ wants to find) and design tests using those models.</p>
 <p>Prefer having checks inside test code.</p>
 <p>Not only does having test logic outside, e.g. verification method,
 depending on asserts in product code contradict with several items above
-but also decreases test's readability and stability. It is much easier
+but also decreases test’s readability and stability. It is much easier
 to understand that a test is testing when all testing logic is located
 inside a test or nearby in shared test libraries. As a rule of thumb,
 the closer a check to a test, the better.</p>
@@ -198,7 +198,7 @@ the closer a check to a test, the better.</p>
 <p>Prefer <code>EXPECT</code> over <code>ASSERT</code> if possible.</p>
 <p>This is related to the <a href="#informativeness">informativeness</a>
 property of tests, information for other checks can help to better
-localize a defect's root-cause. One should use <code>ASSERT</code> if it
+localize a defect’s root-cause. One should use <code>ASSERT</code> if it
 is impossible to continue test execution or if it does not make much
 sense. Later in the text, <code>EXPECT</code> forms will be used to
 refer to both <code>ASSERT/EXPECT</code>.</p>
@@ -235,7 +235,7 @@ which checks that the absolute value of the difference between
 <code>eps</code>.</p>
 <h3 id="c-string-comparison">C string comparison</h3>
 <p>Use string special macros for C strings comparisons.</p>
-<p><code>EXPECT_EQ</code> just compares pointers' values, which is
+<p><code>EXPECT_EQ</code> just compares pointers’ values, which is
 hardly what one wants comparing C strings. GoogleTest provides
 <code>EXPECT_STREQ</code> and <code>EXPECT_STRNE</code> macros to
 compare C string contents. There are also case-insensitive versions
@@ -245,7 +245,7 @@ compare C string contents. There are also case-insensitive versions
 <p>All GoogleTest asserts print compared expressions and their values,
 so there is no need to have them in error messages. Asserts print only
 compared values, they do not print any of interim variables, e.g.
-<code>ASSERT_TRUE((val1 == val2 &amp;&amp; isFail(foo(8))) || i == 18)</code>
+<code>ASSERT_TRUE((val1 == val2 &amp;&amp; isFail(foo(8)) || i == 18)</code>
 prints only one value. If you use some complex predicates, please
 consider <code>EXPECT_PRED*</code> or <code>EXPECT_FORMAT_PRED</code>
 assertions family, they check that a predicate returns true/success and
@@ -293,7 +293,7 @@ subsystem, etc.</p>
 <p>This naming scheme helps to find tests, filter them and simplifies
 test failure analysis. For example, class <code>Foo</code> - test group
 <code>Foo</code>, compiler logging subsystem - test group
-<code>CompilerLogging</code>, G1 GC - test group <code>G1GC</code>, and
+<code>CompilerLogging</code>, G1 GC — test group <code>G1GC</code>, and
 so forth.</p>
 <h3 id="filename">Filename</h3>
 <p>A test file must have <code>test_</code> prefix and <code>.cpp</code>
@@ -345,7 +345,7 @@ name starts or ends with an underscore are enough to be safe.</p>
 <h3 id="friend-classes">Friend classes</h3>
 <p>All test purpose friends should have either <code>Test</code> or
 <code>Testable</code> suffix.</p>
-<p>It greatly simplifies understanding of friendship's purpose and
+<p>It greatly simplifies understanding of friendship’s purpose and
 allows statically check that private members are not exposed
 unexpectedly. Having <code>FooTest</code> as a friend of
 <code>Foo</code> without any comments will be understood as a necessary
@@ -435,7 +435,7 @@ inapplicable tests.</p>
 <h3 id="flag-restoring">Flag restoring</h3>
 <p>Restore changed flags.</p>
 <p>It is quite common for tests to configure JVM in a certain way
-changing flags' values. GoogleTest provides two ways to set up
+changing flags’ values. GoogleTest provides two ways to set up
 environment before a test and restore it afterward: using either
 constructor and destructor or <code>SetUp</code> and
 <code>TearDown</code> functions. Both ways require to use a test fixture
@@ -444,7 +444,7 @@ class, which sometimes is too wordy. The simpler facilities like
 be used in such cases to restore/set values.</p>
 <p>Caveats:</p>
 <ul>
-<li><p>Changing a flag's value could break the invariants between flags'
+<li><p>Changing a flag’s value could break the invariants between flags'
 values and hence could lead to unexpected/unsupported JVM
 state.</p></li>
 <li><p><code>FLAG_SET_*</code> macros can change more than one flag (in
--- a/doc/hotspot-unit-tests.md
+++ b/doc/hotspot-unit-tests.md
@@ -106,7 +106,7 @@ Prefer having checks inside test code.

 Not only does having test logic outside, e.g. verification method,
 depending on asserts in product code contradict with several items
-above but also decreases test's readability and stability. It is much
+above but also decreases test’s readability and stability. It is much
 easier to understand that a test is testing when all testing logic is
 located inside a test or nearby in shared test libraries. As a rule of
 thumb, the closer a check to a test, the better.
@@ -119,7 +119,7 @@ Prefer `EXPECT` over `ASSERT` if possible.

 This is related to the [informativeness](#informativeness) property of
 tests, information for other checks can help to better localize a
-defect's root-cause. One should use `ASSERT` if it is impossible to
+defect’s root-cause. One should use `ASSERT` if it is impossible to
 continue test execution or if it does not make much sense. Later in
 the text, `EXPECT` forms will be used to refer to both
 `ASSERT/EXPECT`.
@@ -160,7 +160,7 @@ value of the difference between `v1` and `v2` is not greater than `eps`.

 Use string special macros for C strings comparisons.

-`EXPECT_EQ` just compares pointers' values, which is hardly what one
+`EXPECT_EQ` just compares pointers’ values, which is hardly what one
 wants comparing C strings. GoogleTest provides `EXPECT_STREQ` and
 `EXPECT_STRNE` macros to compare C string contents. There are also
 case-insensitive versions `EXPECT_STRCASEEQ`, `EXPECT_STRCASENE`.
@@ -172,7 +172,7 @@ Provide informative, but not too verbose error messages.
 All GoogleTest asserts print compared expressions and their values, so
 there is no need to have them in error messages. Asserts print only
 compared values, they do not print any of interim variables, e.g.
-`ASSERT_TRUE((val1 == val2 && isFail(foo(8))) || i == 18)` prints only
+`ASSERT_TRUE((val1 == val2 && isFail(foo(8)) || i == 18)` prints only
 one value. If you use some complex predicates, please consider
 `EXPECT_PRED*` or `EXPECT_FORMAT_PRED` assertions family, they check that
 a predicate returns true/success and print out all parameters values.
@@ -226,7 +226,7 @@ subsystem, etc.

 This naming scheme helps to find tests, filter them and simplifies
 test failure analysis. For example, class `Foo` - test group `Foo`,
-compiler logging subsystem - test group `CompilerLogging`, G1 GC - test
+compiler logging subsystem - test group `CompilerLogging`, G1 GC — test
 group `G1GC`, and so forth.

 ### Filename
@@ -287,7 +287,7 @@ Fixture classes should be named after tested classes, subsystems, etc

 All test purpose friends should have either `Test` or `Testable` suffix.

-It greatly simplifies understanding of friendship's purpose and allows
+It greatly simplifies understanding of friendship’s purpose and allows
 statically check that private members are not exposed unexpectedly.
 Having `FooTest` as a friend of `Foo` without any comments will be
 understood as a necessary evil to get testability.
@@ -397,7 +397,7 @@ and filter out inapplicable tests.
 Restore changed flags.

 It is quite common for tests to configure JVM in a certain way
-changing flags' values. GoogleTest provides two ways to set up
+changing flags’ values. GoogleTest provides two ways to set up
 environment before a test and restore it afterward: using either
 constructor and destructor or `SetUp` and `TearDown` functions. Both ways
 require to use a test fixture class, which sometimes is too wordy. The
@@ -406,7 +406,7 @@ be used in such cases to restore/set values.

 Caveats:

-* Changing a flag's value could break the invariants between flags' values and hence could lead to unexpected/unsupported JVM state.
+* Changing a flag’s value could break the invariants between flags' values and hence could lead to unexpected/unsupported JVM state.

 * `FLAG_SET_*` macros can change more than one flag (in order to
 maintain invariants) so it is hard to predict what flags will be
--- a/doc/ide.html
+++ b/doc/ide.html
@@ -63,12 +63,11 @@ workspace has been generated. To use it, choose
 <p>The main <code>vscode-project</code> target configures the default
 C++ support in Visual Studio Code. There are also other source indexers
 that can be installed, that may provide additional features. It's
-currently possible to generate configuration for three such indexers, <a
-href="https://clang.llvm.org/extra/clangd/">clangd</a>, <a
-href="https://github.com/MaskRay/ccls/wiki/Visual-Studio-Code">ccls</a>
-and <a href="https://github.com/Andersbakken/rtags">rtags</a>. These can
-be configured by appending the name of the indexer to the make target,
-such as:</p>
+currently possible to generate configuration for two such indexers, <a
+href="https://clang.llvm.org/extra/clangd/">clangd</a> and <a
+href="https://github.com/Andersbakken/rtags">rtags</a>. These can be
+configured by appending the name of the indexer to the make target, such
+as:</p>
 <pre class="shell"><code>make vscode-project-clangd</code></pre>
 <p>Additional instructions for configuring the given indexer will be
 displayed after the workspace has been generated.</p>
--- a/doc/ide.md
+++ b/doc/ide.md
@@ -32,8 +32,7 @@ choose `File -> Open Workspace...` in Visual Studio Code.
 The main `vscode-project` target configures the default C++ support in Visual
 Studio Code. There are also other source indexers that can be installed, that
 may provide additional features. It's currently possible to generate
-configuration for three such indexers, [clangd](https://clang.llvm.org/extra/clangd/),
-[ccls](https://github.com/MaskRay/ccls/wiki/Visual-Studio-Code)
+configuration for two such indexers, [clangd](https://clang.llvm.org/extra/clangd/)
 and [rtags](https://github.com/Andersbakken/rtags). These can be configured by
 appending the name of the indexer to the make target, such as:

--- a/doc/starting-next-release.html
+++ b/doc/starting-next-release.html
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
-<head>
-  <meta charset="utf-8" />
-  <meta name="generator" content="pandoc" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <title>Explanation of start of release changes</title>
-  <style>
-    code{white-space: pre-wrap;}
-    span.smallcaps{font-variant: small-caps;}
-    div.columns{display: flex; gap: min(4vw, 1.5em);}
-    div.column{flex: auto; overflow-x: auto;}
-    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
-    ul.task-list{list-style: none;}
-    ul.task-list li input[type="checkbox"] {
-      width: 0.8em;
-      margin: 0 0.8em 0.2em -1.6em;
-      vertical-align: middle;
-    }
-    .display.math{display: block; text-align: center; margin: 0.5rem auto;}
-  </style>
-  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
-  <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-  <![endif]-->
-</head>
-<body>
-<header id="title-block-header">
-<h1 class="title">Explanation of start of release changes</h1>
-</header>
-<nav id="TOC" role="doc-toc">
-<ul>
-<li><a href="#overview" id="toc-overview">Overview</a></li>
-<li><a href="#details-and-file-updates"
-id="toc-details-and-file-updates">Details and file updates</a>
-<ul>
-<li><a href="#meta-data-files" id="toc-meta-data-files">Meta-data
-files</a></li>
-<li><a href="#src-files" id="toc-src-files"><code>src</code>
-files</a></li>
-<li><a href="#test-files" id="toc-test-files"><code>test</code>
-files</a></li>
-</ul></li>
-</ul>
-</nav>
-<h2 id="overview">Overview</h2>
-<p>The start of release changes, the changes that turn JDK <em>N</em>
-into JDK (<em>N</em>+1), are primarily small updates to various files
-along with new files to store symbol information to allow
-<code>javac --release N ...</code> to run on JDK (<em>N</em>+1).</p>
-<p>The updates include changes to files holding meta-data about the
-release, files under the <code>src</code> directory for API and tooling
-updates, and incidental updates under the <code>test</code>
-directory.</p>
-<h2 id="details-and-file-updates">Details and file updates</h2>
-<p>As a matter of policy, there are a number of semantically distinct
-concepts which get incremented separately at the start of a new
-release:</p>
-<ul>
-<li>Feature value of <code>Runtime.version()</code></li>
-<li>Highest source version modeled by
-<code>javax.lang.model.SourceVersion</code></li>
-<li>Highest class file format major version recognized by the
-platform</li>
-<li>Highest
-<code>-source</code>/<code>-target</code>/<code>--release</code>
-argument recognized by <code>javac</code> and related tools</li>
-</ul>
-<p>The expected file updates are listed below. Additional files may need
-to be updated for a particular release.</p>
-<h3 id="meta-data-files">Meta-data files</h3>
-<ul>
-<li><code>jcheck/conf</code>: update meta-data used by
-<code>jcheck</code> and the Skara tooling</li>
-<li><code>make/conf/version-numbers.conf</code>: update to meta-data
-used in the build</li>
-</ul>
-<h3 id="src-files"><code>src</code> files</h3>
-<ul>
-<li><code>src/hotspot/share/classfile/classFileParser.cpp</code>: add a
-<code>#define</code> for the new version</li>
-<li><code>src/java.base/share/classes/java/lang/classfile/ClassFile.java</code>:
-add a constant for the new class file format version</li>
-<li><code>src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java</code>:
-add an <code>enum</code> constant for the new class file format
-version</li>
-<li><code>src/java.compiler/share/classes/javax/lang/model/SourceVersion.java</code>:
-add an <code>enum</code> constant for the new source version</li>
-<li><code>src/java.compiler/share/classes/javax/lang/model/util/*</code>
-visitors: Update <code>@SupportedSourceVersion</code> annotations to
-latest value. Note this update is done in lieu of introducing another
-set of visitors for each Java SE release.</li>
-<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java</code>:
-add an <code>enum</code> constant for the new source version internal to
-<code>javac</code></li>
-<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java</code>:
-add an <code>enum</code> constant for the new class file format version
-internal to <code>javac</code></li>
-<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java</code>:
-add an <code>enum</code> constant for the new target version internal to
-<code>javac</code></li>
-<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java</code>
-update printing processor to support the new source version</li>
-<li>The symbol information for <code>--release</code> is stored as new
-text files in the <code>src/jdk.compiler/share/data/symbols</code>
-directory, one file per module. The README file in that directory
-contains directions on how to create the files.</li>
-</ul>
-<h3 id="test-files"><code>test</code> files</h3>
-<ul>
-<li><code>test/langtools/tools/javac/api/TestGetSourceVersions.java</code>:
-add new <code>SourceVersion</code> constant to test matrix.</li>
-<li><code>test/langtools/tools/javac/classfiles/ClassVersionChecker.java</code>:
-add new enum constant for the new class file version</li>
-<li><code>test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java</code>
-update annotation processor extended by <code>javac</code> tests to
-cover the new source version</li>
-<li><code>test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out</code>
-and
-<code>test/langtools/tools/javac/preview/classReaderTest/Client.preview.out</code>:
-update expected messages for preview errors and warnings</li>
-</ul>
-</body>
-</html>
--- a/doc/starting-next-release.md
+++ b/doc/starting-next-release.md
@@ -1,68 +0,0 @@
-% Explanation of start of release changes
-
-## Overview
-
-The start of release changes, the changes that turn JDK _N_ into JDK
-(_N_+1), are primarily small updates to various files along with new files to
-store symbol information to allow `javac --release N ...` to run on
-JDK (_N_+1).
-
-The updates include changes to files holding meta-data about the
-release, files under the `src` directory for API and tooling updates,
-and incidental updates under the `test` directory.
-
-## Details and file updates
-
-As a matter of policy, there are a number of semantically distinct
-concepts which get incremented separately at the start of a new
-release:
-
-* Feature value of `Runtime.version()`
-* Highest source version modeled by `javax.lang.model.SourceVersion`
-* Highest class file format major version recognized by the platform
-* Highest `-source`/`-target`/`--release` argument recognized by
-  `javac` and related tools
-
-The expected file updates are listed below. Additional files may need
-to be updated for a particular release.
-
-### Meta-data files
-
-* `jcheck/conf`: update meta-data used by `jcheck` and the Skara tooling
-* `make/conf/version-numbers.conf`: update to meta-data used in the build
-
-### `src` files
-
-* `src/hotspot/share/classfile/classFileParser.cpp`: add a `#define`
-  for the new version
-* `src/java.base/share/classes/java/lang/classfile/ClassFile.java`:
-  add a constant for the new class file format version
-* `src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java`:
-   add an `enum` constant for the new class file format version
-* `src/java.compiler/share/classes/javax/lang/model/SourceVersion.java`:
-  add an `enum` constant for the new source version
-* `src/java.compiler/share/classes/javax/lang/model/util/*` visitors: Update
-  `@SupportedSourceVersion` annotations to latest value. Note this update
-  is done in lieu of introducing another set of visitors for each Java
-  SE release.
-* `src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java`:
-   add an `enum` constant for the new source version internal to `javac`
-* `src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java`:
-   add an `enum` constant for the new class file format version internal to `javac`
-* `src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java`:
-   add an `enum` constant for the new target version internal to `javac`
-* `src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java`
-   update printing processor to support the new source version
-* The symbol information for `--release` is stored as new text files in the
-  `src/jdk.compiler/share/data/symbols` directory, one file per
-  module. The README file in that directory contains directions on how
-  to create the files.
-
-### `test` files
-
-* `test/langtools/tools/javac/api/TestGetSourceVersions.java`: add new `SourceVersion` constant to test matrix.
-* `test/langtools/tools/javac/classfiles/ClassVersionChecker.java`: add new enum constant for the new class file version
-* `test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java`
-   update annotation processor extended by `javac` tests to cover the new source version
-* `test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out` and `test/langtools/tools/javac/preview/classReaderTest/Client.preview.out`: update expected messages for preview errors and warnings
-
--- a/doc/testing.html
+++ b/doc/testing.html
@@ -72,12 +72,6 @@ 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-ahead-of-time-optimizations"
-id="toc-testing-ahead-of-time-optimizations">Testing Ahead-of-time
-Optimizations</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>
@@ -398,8 +392,7 @@ TEST_OPTS keywords.</p>
 <h4 id="jobs">JOBS</h4>
 <p>Currently only applies to JTReg.</p>
 <h4 id="timeout_factor">TIMEOUT_FACTOR</h4>
-<p>Currently only applies to <a href="#timeout_factor-1">JTReg
-timeoutFactor</a>.</p>
+<p>Currently only applies to JTReg.</p>
 <h4 id="java_options">JAVA_OPTIONS</h4>
 <p>Applies to JTReg, GTest and Micro.</p>
 <h4 id="vm_options">VM_OPTIONS</h4>
@@ -415,13 +408,6 @@ instrumentation
 special target <code>jcov-test</code> instead of <code>test</code>, e.g.
 <code>make jcov-test TEST=jdk_lang</code>. This will make sure the JCov
 image is built, and that JCov reporting is enabled.</p>
-<p>To include JCov coverage for just a subset of all modules, you can
-use the <code>--with-jcov-modules</code> arguments to
-<code>configure</code>, e.g.
-<code>--with-jcov-modules=jdk.compiler,java.desktop</code>.</p>
-<p>For more fine-grained control, you can pass arbitrary filters to JCov
-using <code>--with-jcov-filters</code>, and you can specify a specific
-JDK to instrument using <code>--with-jcov-input-jdk</code>.</p>
 <p>The JCov report is stored in
 <code>build/$BUILD/test-results/jcov-output/report</code>.</p>
 <p>Please note that running with JCov reporting can be very memory
@@ -434,9 +420,6 @@ the diff between the specified revision and the repository tip.</p>
 <p>The report is stored in
 <code>build/$BUILD/test-results/jcov-output/diff_coverage_report</code>
 file.</p>
-<h4 id="aot_jdk">AOT_JDK</h4>
-<p>See <a href="#testing-ahead-of-time-optimizations">Testing
-Ahead-of-time optimizations</a>.</p>
 <h3 id="jtreg-keywords">JTReg keywords</h3>
 <h4 id="jobs-1">JOBS</h4>
 <p>The test concurrency (<code>-concurrency</code>).</p>
@@ -445,17 +428,13 @@ otherwise it defaults to JOBS, except for Hotspot, where the default is
 <em>number of CPU cores/2</em>, but never more than <em>memory size in
 GB/2</em>.</p>
 <h4 id="timeout_factor-1">TIMEOUT_FACTOR</h4>
-<p>The <code>TIMEOUT_FACTOR</code> is forwarded to JTReg framework
-itself (<code>-timeoutFactor</code>). Also, some test cases that
-programmatically wait a certain amount of time will apply this factor.
-If we run in forced compilation mode (<code>-Xcomp</code>), the build
-system will automatically adjust this factor to compensate for less
-performance. Defaults to 4.</p>
+<p>The timeout factor (<code>-timeoutFactor</code>).</p>
+<p>Defaults to 4.</p>
 <h4 id="failure_handler_timeout">FAILURE_HANDLER_TIMEOUT</h4>
 <p>Sets the argument <code>-timeoutHandlerTimeout</code> for JTReg. The
 default value is 0. This is only valid if the failure handler is
 built.</p>
-<h4 id="test_thread_factory">TEST_THREAD_FACTORY</h4>
+<h4 id="jtreg_test_thread_factory">JTREG_TEST_THREAD_FACTORY</h4>
 <p>Sets the <code>-testThreadFactory</code> for JTReg. It should be the
 fully qualified classname of a class which implements
 <code>java.util.concurrent.ThreadFactory</code>. One such implementation
@@ -463,12 +442,6 @@ class, named Virtual, is currently part of the JDK build in the
 <code>test/jtreg_test_thread_factory/</code> directory. This class gets
 compiled during the test image build. The implementation of the Virtual
 class creates a new virtual thread for executing each test class.</p>
-<h4 id="jvmti_stress_agent">JVMTI_STRESS_AGENT</h4>
-<p>Executes JTReg tests with JVM TI stress agent. The stress agent is
-the part of test library and located in
-<code>test/lib/jdk/test/lib/jvmti/libJvmtiStressAgent.cpp</code>. The
-value of this argument is set as JVM TI agent options. This mode uses
-ProblemList-jvmti-stress-agent.txt as an additional exclude list.</p>
 <h4 id="test_mode">TEST_MODE</h4>
 <p>The test mode (<code>agentvm</code> or <code>othervm</code>).</p>
 <p>Defaults to <code>agentvm</code>.</p>
@@ -568,12 +541,6 @@ each fork. Same as specifying <code>-wi &lt;num&gt;</code>.</p>
 same values as <code>-rff</code>, i.e., <code>text</code>,
 <code>csv</code>, <code>scsv</code>, <code>json</code>, or
 <code>latex</code>.</p>
-<h4 id="test_jdk">TEST_JDK</h4>
-<p>The path to the JDK that will be used to run the benchmarks.</p>
-<p>Defaults to <code>build/&lt;CONF-NAME&gt;/jdk</code>.</p>
-<h4 id="benchmarks_jar">BENCHMARKS_JAR</h4>
-<p>The path to the JAR containing the benchmarks.</p>
-<p>Defaults to <code>test/micro/benchmarks.jar</code>.</p>
 <h4 id="vm_options-2">VM_OPTIONS</h4>
 <p>Additional VM arguments to provide to forked off VMs. Same as
 <code>-jvmArgs &lt;args&gt;</code></p>
@@ -619,49 +586,6 @@ element of the appropriate <code>@Artifact</code> class. (See
    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-ahead-of-time-optimizations">Testing Ahead-of-time
-Optimizations</h3>
-<p>One way to improve test coverage of ahead-of-time (AOT) optimizations
-in the JDK is to run existing jtreg test cases in a special "AOT_JDK"
-mode. Example:</p>
-<pre><code>$ make test JTREG=&quot;AOT_JDK=onestep&quot; \
-    TEST=open/test/hotspot/jtreg/runtime/invokedynamic</code></pre>
-<p>In this testing mode, we first perform an AOT training run (see
-https://openjdk.org/jeps/483) of a special test program (<a
-href="../test/setup_aot/TestSetupAOT.java">test/setup_aot/TestSetupAOT.java</a>)
-that accesses about 5,0000 classes in the JDK core libraries.
-Optimization artifacts for these classes (such as pre-linked lambda
-expressions, execution profiles, and pre-generated native code) are
-stored into an AOT cache file, which will be used by all the JVMs
-launched by the selected jtreg test cases.</p>
-<p>When the jtreg tests call into the core libraries classes that are in
-the AOT cache, we will be able to test the AOT optimizations that were
-used on those classes.</p>
-<p>Please note that not all existing jtreg test cases can be executed
-with the AOT_JDK mode. See <a
-href="../test/hotspot/jtreg/ProblemList-AotJdk.txt">test/hotspot/jtreg/ProblemList-AotJdk.txt</a>
-and <a
-href="../test/jdk/ProblemList-AotJdk.txt">test/jdk/ProblemList-AotJdk.txt</a>.</p>
-<p>Also, test cases that were written specifically to test AOT, such as
-the tests under <a
-href="../test/hotspot/jtreg/runtime/cds/">test/hotspot/jtreg/runtime/cds</a>,
-cannot be executed with the AOT_JDK mode.</p>
-<p>Valid values for <code>AOT_JDK</code> are <code>onestep</code> and
-<code>twostep</code>. These control how the AOT cache is generated. See
-https://openjdk.org/jeps/514 for details. All other values are
-ignored.</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
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -324,7 +324,7 @@ Currently only applies to JTReg.

 #### TIMEOUT_FACTOR

-Currently only applies to [JTReg -timeoutFactor](#timeout_factor-1).
+Currently only applies to JTReg.

 #### JAVA_OPTIONS

@@ -345,14 +345,6 @@ The simplest way to run tests with JCov coverage report is to use the special
 target `jcov-test` instead of `test`, e.g. `make jcov-test TEST=jdk_lang`. This
 will make sure the JCov image is built, and that JCov reporting is enabled.

-To include JCov coverage for just a subset of all modules, you can use the
-`--with-jcov-modules` arguments to `configure`, e.g.
-`--with-jcov-modules=jdk.compiler,java.desktop`.
-
-For more fine-grained control, you can pass arbitrary filters to JCov using
-`--with-jcov-filters`, and you can specify a specific JDK to instrument
-using `--with-jcov-input-jdk`.
-
 The JCov report is stored in `build/$BUILD/test-results/jcov-output/report`.

 Please note that running with JCov reporting can be very memory intensive.
@@ -367,10 +359,6 @@ between the specified revision and the repository tip.
 The report is stored in
 `build/$BUILD/test-results/jcov-output/diff_coverage_report` file.

-#### AOT_JDK
-
-See [Testing Ahead-of-time optimizations](#testing-ahead-of-time-optimizations).
-
 ### JTReg keywords

 #### JOBS
@@ -383,18 +371,16 @@ never more than *memory size in GB/2*.

 #### TIMEOUT_FACTOR

-The `TIMEOUT_FACTOR` is forwarded to JTReg framework itself
-(`-timeoutFactor`). Also, some test cases that programmatically wait a
-certain amount of time will apply this factor. If we run in forced
-compilation mode (`-Xcomp`), the build system will automatically
-adjust this factor to compensate for less performance. Defaults to 4.
+The timeout factor (`-timeoutFactor`).
+
+Defaults to 4.

 #### FAILURE_HANDLER_TIMEOUT

 Sets the argument `-timeoutHandlerTimeout` for JTReg. The default value is 0.
 This is only valid if the failure handler is built.

-#### TEST_THREAD_FACTORY
+#### JTREG_TEST_THREAD_FACTORY

 Sets the `-testThreadFactory` for JTReg. It should be the fully qualified
 classname of a class which implements `java.util.concurrent.ThreadFactory`. One
@@ -403,13 +389,6 @@ the `test/jtreg_test_thread_factory/` directory. This class gets compiled
 during the test image build. The implementation of the Virtual class creates a
 new virtual thread for executing each test class.

-#### JVMTI_STRESS_AGENT
-
-Executes JTReg tests with JVM TI stress agent. The stress agent is the part of
-test library and located in `test/lib/jdk/test/lib/jvmti/libJvmtiStressAgent.cpp`.
-The value of this argument is set as JVM TI agent options.
-This mode uses ProblemList-jvmti-stress-agent.txt as an additional exclude list.
-
 #### TEST_MODE

 The test mode (`agentvm` or `othervm`).
@@ -558,18 +537,6 @@ Amount of time to spend in each warmup iteration. Same as specifying `-w
 Specify to have the test run save a log of the values. Accepts the same values
 as `-rff`, i.e., `text`, `csv`, `scsv`, `json`, or `latex`.

-#### TEST_JDK
-
-The path to the JDK that will be used to run the benchmarks.
-
-Defaults to `build/<CONF-NAME>/jdk`.
-
-#### BENCHMARKS_JAR
-
-The path to the JAR containing the benchmarks.
-
-Defaults to `test/micro/benchmarks.jar`.
-
 #### VM_OPTIONS

 Additional VM arguments to provide to forked off VMs. Same as `-jvmArgs <args>`
@@ -636,52 +603,6 @@ $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
 For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.

-### Testing Ahead-of-time Optimizations
-
-One way to improve test coverage of ahead-of-time (AOT) optimizations in
-the JDK is to run existing jtreg test cases in a special "AOT_JDK" mode.
-Example:
-
-```
-$ make test JTREG="AOT_JDK=onestep" \
-    TEST=open/test/hotspot/jtreg/runtime/invokedynamic
-```
-
-In this testing mode, we first perform an AOT training run
-(see https://openjdk.org/jeps/483) of a special test program
-([test/setup_aot/TestSetupAOT.java](../test/setup_aot/TestSetupAOT.java))
-that accesses about 5,0000 classes in the JDK core libraries.
-Optimization artifacts for these classes (such as pre-linked
-lambda expressions, execution profiles, and pre-generated native code)
-are stored into an AOT cache file, which will be used by all the JVMs
-launched by the selected jtreg test cases.
-
-When the jtreg tests call into the core libraries classes that are in
-the AOT cache, we will be able to test the AOT optimizations that were
-used on those classes.
-
-Please note that not all existing jtreg test cases can be executed with
-the AOT_JDK mode. See
-[test/hotspot/jtreg/ProblemList-AotJdk.txt](../test/hotspot/jtreg/ProblemList-AotJdk.txt)
-and [test/jdk/ProblemList-AotJdk.txt](../test/jdk/ProblemList-AotJdk.txt).
-
-Also, test cases that were written specifically to test AOT, such as the tests
-under [test/hotspot/jtreg/runtime/cds](../test/hotspot/jtreg/runtime/cds/),
-cannot be executed with the AOT_JDK mode.
-
-Valid values for `AOT_JDK` are `onestep` and `twostep`. These control how
-the AOT cache is generated. See https://openjdk.org/jeps/514 for details.
-All other values are ignored.
-
-### 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
--- a/jb/branchdiff.py
+++ b/jb/branchdiff.py
@@ -1,274 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import os.path
-import sys
-import subprocess
-
-errors_count = 0
-
-
-def fatal(msg):
-    sys.stderr.write(f"[fatal] {msg}\n")
-    sys.exit(1)
-
-
-def error(msg):
-    global errors_count
-    errors_count += 1
-    sys.stderr.write(f"[error] {msg}\n")
-
-
-def verbose(options, *msg):
-    if options.verbose:
-        sys.stderr.write(f"[verbose] ")
-        sys.stderr.write(*msg)
-        sys.stderr.write('\n')
-
-
-def first_line(str):
-    return "" if not str else str.splitlines()[0]
-
-
-class Options:
-    def __init__(self):
-        ap = argparse.ArgumentParser(description="Show commit differences between branches of JBR git repos",
-                                     epilog="Example: %(prog)s  --from origin/jbr17 --to jbr17.b469 --path "
-                                            "src/hotspot --limit 200")
-        ap.add_argument('--jbr', dest='jbrpath', help='path to JBR git root', required=True)
-        ap.add_argument('--from', dest='frombranch', help='branch to take commits from', required=True)
-        ap.add_argument('--to', dest='tobranch', help='branch to apply new commits to', required=True)
-        ap.add_argument('--path', dest='path', help='limit to changes in this path (relative to git root)')
-        ap.add_argument('--limit', dest='limit', help='limit to this many log entries in --jdk repo', type=int,
-                        default=-1)
-        ap.add_argument('--html', dest="ishtml", help="print out HTML rather than plain text", action='store_true')
-        ap.add_argument('-o', dest="output", help="print the list of missing commits to this file"
-                                                  " to be used as exclude list later")
-        ap.add_argument('--exclude', dest='exclude', help='exclude commits listed in the given file '
-                                                          '(can use edited -o output file as input here)')
-        ap.add_argument('-v', dest='verbose', help="verbose output", default=False, action='store_true')
-        args = ap.parse_args()
-
-        if not os.path.isdir(args.jbrpath):
-            fatal(f"{args.jbrpath} not a directory")
-
-        if not git_is_available():
-            fatal("can't run git commands; make sure git is in PATH")
-
-        self.frombranch = args.frombranch
-        self.tobranch = args.tobranch
-        self.jbrpath = args.jbrpath
-        self.path = args.path
-        self.limit = args.limit
-        self.exclude = args.exclude
-        self.output = args.output
-        self.ishtml = args.ishtml
-        self.verbose = args.verbose
-
-
-class GitRepo:
-    def __init__(self, rootpath):
-        self.rootpath = rootpath
-
-    def run_git_cmd(self, git_args):
-        args = ["git", "-C", self.rootpath]
-        args.extend(git_args)
-        # print(f"Runnig git cmd '{' '.join(args)}'")
-        p = subprocess.run(args, capture_output=True, text=True)
-        if p.returncode != 0:
-            fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
-        return p.stdout
-
-    def save_git_cmd(self, fname, git_args):
-        args = ["git", "-C", self.rootpath]
-        args.extend(git_args)
-        # print(f"Runnig git cmd '{' '.join(args)}'")
-        with open(fname, "w") as stdout_file:
-            p = subprocess.run(args, stdout=stdout_file)
-            if p.returncode != 0:
-                fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
-
-    def current_branch(self):
-        branch_name = self.run_git_cmd(["branch", "--show-current"]).strip()
-        return branch_name
-
-    def log(self, branch, path=None, limit=None):
-        cmds = ["log", "--no-decorate", branch]
-        if limit:
-            cmds.extend(["-n", str(limit)])
-        if path:
-            cmds.append(path)
-        full_log = self.run_git_cmd(cmds)
-        return full_log
-
-
-class Commit:
-    def __init__(self, lines):
-        self.sha = lines[0].split()[1]
-        self.message = ""
-        self.fullmessage = ""
-        self.bugid = ""
-
-        # Commit message starts after one blank line
-        read_message = False
-        for l in lines:
-            if read_message:
-                self.fullmessage += l.strip() + "\n"
-            if not read_message and l == "":
-                read_message = True
-
-        if len(self.fullmessage) > 0:
-            self.message = first_line(self.fullmessage).strip()
-            t = self.message.split(' ')
-            if len(t) > 1:
-                bugid = t[0]
-                if bugid.startswith("fixup"):
-                    bugid = t[1]
-                bugid = bugid.strip(":")
-                if bugid.startswith("JBR-") or bugid.isnumeric():
-                    self.bugid = bugid
-
-
-class History:
-    def __init__(self, log):
-        log_itr = iter(log.splitlines())
-        self.commits = []
-        self.unique_fullmessages = set()
-        self.duplicates = set()
-        commit_lines = []
-        for line in log_itr:
-            if line.startswith("commit ") and len(commit_lines) > 0:
-                commit = Commit(commit_lines)
-                self.add_commit(commit)
-                commit_lines = []
-            commit_lines.append(line)
-
-        if len(commit_lines) > 0:
-            commit = Commit(commit_lines)
-            self.add_commit(commit)
-
-    def add_commit(self, commit):
-        self.commits.append(commit)
-        if commit.fullmessage in self.unique_fullmessages:
-            self.duplicates.add(commit.fullmessage)
-        else:
-            self.unique_fullmessages.add(commit.fullmessage)
-
-    def appears_more_than_once(self, commit):
-        return commit.fullmessage in self.duplicates
-
-    def contains(self, commit):
-        return commit.fullmessage in self.unique_fullmessages
-
-    def size(self):
-        return len(self.commits)
-
-
-def print_explanation(options, jbr):
-    verbose(options, f"Reading history from '{jbr.rootpath}'")
-    if options.path:
-        verbose(options, f"\t(only under '{options.path}')")
-    if options.limit > 0:
-        verbose(options, f"\t(up to '{options.limit}' commits)")
-    verbose(options, f"Searching for missing fixes in '{options.tobranch}' compared with '{options.frombranch}'")
-
-
-def git_is_available():
-    p = None
-    try:
-        p = subprocess.run(["git", "--help"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-    except:
-        pass
-    return p is not None and p.returncode == 0
-
-
-def main():
-    check_python_min_requirements()
-    options = Options()
-    jbr = GitRepo(options.jbrpath)
-    print_explanation(options, jbr)
-
-    commits_to_save = []
-    try:
-        log_from = jbr.log(options.frombranch, options.path, options.limit)
-        log_to = jbr.log(options.tobranch, options.path, options.limit)
-        history_from = History(log_from)
-        history_to = History(log_to)
-
-        verbose(options,
-                f"Read {history_from.size()} commits from '{options.frombranch}', {history_to.size()} from {options.tobranch}")
-
-        exclude_list = []
-        if options.exclude:
-            with open(options.exclude, "r") as exclude_file:
-                l = exclude_file.read().split('\n')
-                exclude_list = list(filter(lambda line: not line.startswith("#"), l))
-
-        warned = set()
-        for c in history_from.commits:
-            if c.message:
-                verbose(options, f"Looking for commit '{c.message}'")
-                if c.message in exclude_list:
-                    verbose(options, "...nope, in exclude list")
-                    continue
-
-                if not history_to.contains(c):
-                    commits_to_save.append(c)
-                else:
-                    if history_from.appears_more_than_once(c) and c.fullmessage not in warned:
-                        # Not sure which of those seemingly identical commits are present in the target branch
-                        error(f"Commit '{c.message}' appears more than once in branch '{options.frombranch}'. ")
-                        warned.add(c.fullmessage)
-    except KeyboardInterrupt:
-        fatal("Interrupted")
-
-    print_out_commits(options, commits_to_save)
-    save_commits_to_file(commits_to_save, options)
-    if errors_count > 0:
-        error(f"{errors_count} error(s) generated to stderr. MANUAL CHECK OF COMMITS IS REQUIRED.")
-
-
-def save_commits_to_file(commits_to_save, options):
-    if len(commits_to_save) > 0 and options.output:
-        print()
-        with open(options.output, "w") as out:
-            for i, c in enumerate(reversed(commits_to_save)):
-                print(f"# {c.sha}", file=out)
-                print(c.message, file=out)
-
-
-def print_out_commits(options, commits_to_save):
-    if options.ishtml:
-        print("<html><body>")
-        print(f"<p><b>Commits on <code>{options.frombranch}</code>"
-              f" missing from <code>{options.tobranch}</code></b></p></h1>")
-    if len(commits_to_save) > 0:
-        for c in sorted(commits_to_save, key=lambda commit: commit.bugid):
-            if options.ishtml:
-                msg = c.message
-                bugurl = ""
-                if c.bugid:
-                    if c.bugid.isnumeric():
-                        bugurl = f"https://bugs.openjdk.org/browse/JDK-{c.bugid}"
-                    elif c.bugid.startswith("JBR-"):
-                        bugurl = f"https://youtrack.jetbrains.com/issue/{c.bugid}"
-
-                if len(bugurl) > 0:
-                    msg = msg.replace(c.bugid, f"<a href='{bugurl}'>{c.bugid}</a>")
-
-                sha = f"<a href='https://jetbrains.team/p/jbre/repositories/jbr/commits?commits={c.sha}'>" \
-                      f"{c.sha[0:8]}</a>"
-                print(f"<li>{msg} ({sha})</li>")
-            else:
-                print(f"{c.message} ({c.sha[0:8]})")
-    if options.ishtml:
-        print("</body></html>")
-
-
-def check_python_min_requirements():
-    if sys.version_info < (3, 6):
-        fatal("Minimum version 3.6 is required to run this script")
-
-
-if __name__ == '__main__':
-    main()
--- a/jb/generate-wakefield.sh
+++ b/jb/generate-wakefield.sh
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [[ -z "$1" ]]; then
-	SCANNER=wayland-scanner
-else
-	SCANNER="$1"
-fi
-
-set -ex
-
-"$SCANNER" client-header src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.h
-"$SCANNER" private-code src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.c
--- a/jb/jbr-api.version
+++ b/jb/jbr-api.version
@@ -1 +0,0 @@
-1.0.2
--- a/jb/jdkdiff.py
+++ b/jb/jdkdiff.py
@@ -1,230 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import math
-import os.path
-import sys
-import subprocess
-
-
-def fatal(msg):
-    sys.stderr.write(f"[fatal] {msg}\n")
-    sys.exit(1)
-
-
-def verbose(options, *msg):
-    if options.verbose:
-        sys.stdout.write(f"[verbose] ")
-        sys.stdout.write(*msg)
-        sys.stdout.write('\n')
-
-
-def first_line(str):
-    return "" if not str else str.splitlines()[0]
-
-
-class Options:
-    def __init__(self):
-        ap = argparse.ArgumentParser(description="Show bugfixes differences between JBR and OpenJDK git repos",
-                                     epilog="Example: %(prog)s  --jdk ./jdk11u/ --jbr ./JetBrainsRuntime/ --path src/hotspot --limit 200")
-        ap.add_argument('--jdk', dest='jdkpath', help='path to OpenJDK git repo', required=True)
-        ap.add_argument('--jbr', dest='jbrpath', help='path to JBR git repo', required=True)
-        ap.add_argument('--path', dest='path', help='limit to changes in this path (relative to git root)')
-        ap.add_argument('--limit', dest='limit', help='limit to this many log entries in --jdk repo', type=int, default=-1)
-        ap.add_argument('-o', dest="output_dir", help="save patches to this directory (created if necessary)")
-        ap.add_argument('-v', dest='verbose', help="verbose output", default=False, action='store_true')
-        args = ap.parse_args()
-
-        if not os.path.isdir(args.jdkpath):
-            fatal(f"{args.jdkpath} not a directory")
-
-        if not os.path.isdir(args.jbrpath):
-            fatal(f"{args.jbrpath} not a directory")
-
-        if not git_is_available():
-            fatal("can't run git commands; make sure git is in PATH")
-
-        self.jdkpath = args.jdkpath
-        self.jbrpath = args.jbrpath
-        self.path = args.path
-        self.limit = args.limit
-        self.output_dir = args.output_dir
-        self.verbose = args.verbose
-
-
-class GitRepo:
-    def __init__(self, rootpath):
-        self.rootpath = rootpath
-
-    def run_git_cmd(self, git_args):
-        args = ["git", "-C", self.rootpath]
-        args.extend(git_args)
-        # print(f"Runnig git cmd '{' '.join(args)}'")
-        p = subprocess.run(args, capture_output=True, text=True)
-        if p.returncode != 0:
-            fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
-        return p.stdout
-
-    def save_git_cmd(self, fname, git_args):
-        args = ["git", "-C", self.rootpath]
-        args.extend(git_args)
-        # print(f"Runnig git cmd '{' '.join(args)}'")
-        with open(fname, "w") as stdout_file:
-            p = subprocess.run(args, stdout=stdout_file)
-            if p.returncode != 0:
-                fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
-
-    def current_branch(self):
-        branch_name = self.run_git_cmd(["branch", "--show-current"]).strip()
-        return branch_name
-
-    def log(self, path=None, limit=None):
-        cmds = ["log", "--no-decorate"]
-        if limit:
-            cmds.extend(["-n", str(limit)])
-        if path:
-            cmds.append(path)
-        full_log = self.run_git_cmd(cmds)
-        return full_log
-
-
-class Commit:
-    def __init__(self, lines):
-        self.sha = lines[0].split()[1]
-        self.message = ""
-        self.bugid = None
-
-        # Commit message starts after one blank line
-        read_message = False
-        for l in lines:
-            if read_message:
-                self.message += l + "\n"
-            if not read_message and l == "":
-                read_message = True
-
-        if self.message and self.message != "" and ":" in self.message:
-            maybe_bugid = self.message.split(":")[0].strip()
-            if 10 >= len(maybe_bugid) >= 4:
-                self.bugid = maybe_bugid
-
-
-class History:
-    def __init__(self, log):
-        log_itr = iter(log.splitlines())
-        self.commits = []
-        commit_lines = []
-        for line in log_itr:
-            if line.startswith("commit ") and len(commit_lines) > 0:
-                commit = Commit(commit_lines)
-                self.commits.append(commit)
-                commit_lines = []
-            commit_lines.append(line)
-
-        if len(commit_lines) > 0:
-            commit = Commit(commit_lines)
-            self.commits.append(commit)
-
-    def contains(self, str):
-        return any(str in commit.message for commit in self.commits)
-
-    def size(self):
-        return len(self.commits)
-
-
-def print_explanation(options, jdk, jbr):
-    verbose(options, f"Reading history from '{jdk.rootpath}' on branch '{jdk.current_branch()}'")
-    if options.path:
-        verbose(options, f"\t(only under '{options.path}')")
-    verbose(options, f"Searching for same fixes in '{jbr.rootpath}' on branch '{jbr.current_branch()}'")
-
-
-def git_is_available():
-    p = None
-    try:
-        p = subprocess.run(["git", "--help"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-    except:
-        pass
-    return p is not None and p.returncode == 0
-
-
-def main():
-    check_python_min_requirements()
-
-    options = Options()
-
-    jdk = GitRepo(options.jdkpath)
-    jbr = GitRepo(options.jbrpath)
-
-    print_explanation(options, jdk, jbr)
-
-    commits_to_save = []
-    try:
-        jdk_log = jdk.log(options.path, options.limit)
-        jdk_history = History(jdk_log)
-
-        jbr_log = jbr.log(options.path)
-        jbr_history = History(jbr_log)
-
-        verbose(options, f"Read {jdk_history.size()} commits in JDK, {jbr_history.size()} in JBR")
-
-        for c in jdk_history.commits:
-            if c.bugid:
-                verbose(options, f"Looking for bugfix for {c.bugid}")
-                if not jbr_history.contains(c.bugid):
-                    commits_to_save.append(c)
-                    print(f"[note] Fix for {c.bugid} not found in JBR ({jbr.rootpath})")
-                    print(f"    commit {c.sha}")
-                    print(f"    {first_line(c.message).strip()}")
-    except KeyboardInterrupt:
-        fatal("Interrupted")
-
-    if len(commits_to_save) > 0 and options.output_dir:
-        print()
-        if not os.path.exists(options.output_dir):
-            verbose(options, f"Creating output directory {options.output_dir}")
-            os.makedirs(options.output_dir)
-        nzeroes = len(str(len(commits_to_save)))
-        for i, c in enumerate(reversed(commits_to_save)):
-            fname = os.path.join(options.output_dir, f"{str(i).zfill(nzeroes)}-{c.bugid}.patch")
-            print(f"[note] {c.bugid} saved as {fname}")
-            fname = os.path.abspath(fname)
-            jdk.save_git_cmd(fname, ["format-patch", "-1", c.sha, "--stdout"])
-
-        script_fname = os.path.join(options.output_dir, "apply.sh")
-        with open(script_fname, "w") as script_file:
-            print(apply_script_code.format(os.path.abspath(jbr.rootpath), os.path.abspath(options.output_dir)),
-                  file=script_file)
-            print(f"[note] Execute 'bash {script_fname}' to apply patches to {jbr.rootpath}")
-
-
-def check_python_min_requirements():
-    if sys.version_info < (3, 6):
-        fatal("Minimum version 3.6 is required to run this script")
-
-
-apply_script_code = """
-#!/bin/bash
-
-GITROOT={0}
-PATCHROOT={1}
-
-cd $PATCHROOT || exit 1
-PATCHES=$(find $PATCHROOT -name '*.patch' | sort -n)
-
-for P in $PATCHES; do
-    git -C $GITROOT am $P
-    if [ $? != 0 ]; then
-        mv "$P" "$P.failed"
-        echo "[ERROR] Patch $P did not apply cleanly. Try applying it manually."
-        echo "[NOTE]  Execute this script to apply the remaining patches."
-        exit 1
-    else
-        mv "$P" "$P.done"
-    fi
-done
-
-echo "[NOTE] Done applying patches; check $PATCHROOT for .patch and .patch.failed to see if all have been applied."
-"""
-
-if __name__ == '__main__':
-    main()
--- a/jb/project/idea-project-files/jdk-clion/.idea/.name
+++ b/jb/project/idea-project-files/jdk-clion/.idea/.name
@@ -1 +0,0 @@
-JetBrainsRuntime
--- a/jb/project/idea-project-files/jdk-clion/.idea/vcs.xml
+++ b/jb/project/idea-project-files/jdk-clion/.idea/vcs.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="IssueNavigationConfiguration">
-    <option name="links">
-      <list>
-        <IssueNavigationLink>
-          <option name="issueRegexp" value="(?:^|\s|\p{Punct})([A-Z]+\-\d+)(?=$|\s|\p{Punct})" />
-          <option name="linkRegexp" value="https://youtrack.jetbrains.com/issue/$1" />
-        </IssueNavigationLink>
-        <IssueNavigationLink>
-          <option name="issueRegexp" value="(?:^|\s|\p{Punct})(?:JDK-)?(\d{7})(?=$|\s|\p{Punct})" />
-          <option name="linkRegexp" value="https://bugs.openjdk.java.net/browse/JDK-$1" />
-        </IssueNavigationLink>
-      </list>
-    </option>
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>
--- a/jb/project/idea-project-files/modules.xml
+++ b/jb/project/idea-project-files/modules.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/jdk.iml" filepath="$PROJECT_DIR$/.idea/jdk.iml" />
-      ###MODULE_IMLS###
-      <module fileurl="file://$PROJECT_DIR$/.idea/test.iml" filepath="$PROJECT_DIR$/.idea/test.iml" />
-    </modules>
-  </component>
-</project>
-
--- a/jb/project/idea-project-files/vcs.xml
+++ b/jb/project/idea-project-files/vcs.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="IssueNavigationConfiguration">
-    <option name="links">
-      <list>
-        <IssueNavigationLink>
-          <option name="issueRegexp" value="(?:^|\s|\p{Punct})([A-Z]+\-\d+)(?=$|\s|\p{Punct})" />
-          <option name="linkRegexp" value="https://youtrack.jetbrains.com/issue/$1" />
-        </IssueNavigationLink>
-        <IssueNavigationLink>
-          <option name="issueRegexp" value="(?:^|\s|\p{Punct})(?:JDK-)?(\d{7})(?=$|\s|\p{Punct})" />
-          <option name="linkRegexp" value="https://bugs.openjdk.java.net/browse/JDK-$1" />
-        </IssueNavigationLink>
-      </list>
-    </option>
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/jb/project/java-gradle/build.gradle
+++ b/jb/project/java-gradle/build.gradle
@@ -1,135 +0,0 @@
-apply plugin: 'java'
-import org.gradle.internal.os.OperatingSystem
-
-repositories {
-    mavenCentral()
-}
-
-def test_jvm = {
-    if (project.hasProperty('jbsdkhome')) {
-        file(jbsdkhome + (OperatingSystem.current().isWindows()?"/bin/java.exe" : "/bin/java")).absolutePath
-    } else {
-        if (OperatingSystem.current().isMacOsX()) {
-            file('../../../build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-11.0.4.jdk/Contents/Home/bin/java').absolutePath
-        } else if (OperatingSystem.current().isLinux()) {
-            file('../../../build/linux-x86_64-normal-server-release/images/jdk/bin/java').absolutePath
-        } else {
-            file('../../../build/windows-x86_64-normal-server-release/images/jdk/bin/java.exe').absolutePath
-        }
-    }
-}
-
-dependencies {
-    testCompile('junit:junit:4.12'){
-        exclude group: 'org.hamcrest'
-    }
-    testCompile 'org.hamcrest:hamcrest-library:1.3'
-    testCompile 'net.java.dev.jna:jna:4.4.0'
-    testCompile 'com.twelvemonkeys.imageio:imageio-tiff:3.3.2'
-    testCompile 'org.apache.commons:commons-lang3:3.0'
-}
-
-def jdk_modules = ["java.base", "java.logging", "java.prefs",
-               "java.se.ee", "java.sql", "java.datatransfer",
-               "java.management", "java.rmi", "java.security.jgss",
-               "java.sql.rowset", "java.desktop", "java.management.rmi",
-               "java.scripting", "java.security.sasl", "java.transaction",
-               "java.instrument", "java.naming", "java.se",
-               "java.smartcardio", "java.xml.crypto"]
-
-def jdk_class_dirs = []
-
-jdk_modules.collect(jdk_class_dirs) {
-    new File("../../../src/" + it + "/share/classes")
-}
-
-if (OperatingSystem.current().isMacOsX())
-    jdk_modules.collect(jdk_class_dirs) {
-        "../../../src/" + it + "/macosx/classes"
-    }
-else if (OperatingSystem.current().isLinux()) {
-    jdk_modules.collect(jdk_class_dirs) {
-        "../../../src/" + it + "/solaris/classes"
-    }
-    jdk_modules.collect(jdk_class_dirs) {
-        "../../../src/" + it + "/unix/classes"
-    }
-} else
-    jdk_modules.collect(jdk_class_dirs) {
-        "../../../src/" + it + "/windows/classes"
-    }
-
-sourceSets.main.java.srcDirs = jdk_class_dirs
-
-sourceSets {
-    test {
-        java {
-            srcDir "../../../test/jdk/jbu"
-        }
-    }
-}
-
-test.dependsOn.clear()
-
-test.dependsOn tasks.compileTestJava
-
-test {
-    systemProperty "jb.java2d.metal", "true"
-    systemProperty "testdata", file('../../../test/jdk/jbu/testdata').absolutePath
-
-//  Generate golden images for DroidFontTest and MixedTextTest
-//    systemProperty "gentestdata", ""
-
-//  Enable Java2D logging (https://confluence.jetbrains.com/display/JRE/Java2D+Rendering+Logging)
-//  systemProperty "sun.java2d.trace", "log"
-//  systemProperty "sun.java2d.trace", "log,pimpl"
-
-    outputs.upToDateWhen { false }
-    executable = test_jvm()
-
-//  Enable async/dtrace profiler
-    jvmArgs  "-XX:+PreserveFramePointer"
-//  Enable native J2D logging (only in debug build)
-//  Can be turned on for J2D by adding "#define DEBUG 1" into jdk/src/share/native/sun/java2d/Trace.h
-
-//    environment 'J2D_TRACE_LEVEL', '4'
-}
-
-def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile.parentFile
-
-def make_cmd = "make"
-if (OperatingSystem.current().isWindows()) {
-    def cyg_make_cmd = new File("c:/cygwin64/bin/make.exe")
-    if (cyg_make_cmd.exists()) make_cmd = cyg_make_cmd.absolutePath
-}
-def test_run = false
-task make_images {
-    doLast {
-        if (!test_run) {
-            def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "images")
-            def proc = pb.redirectErrorStream(true).start()
-            proc.inputStream.eachLine { println it }
-            assert proc.waitFor() == 0
-        }
-    }
-}
-
-task make_clean {
-    doLast {
-        def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "clean")
-        def proc = pb.redirectErrorStream(true).start()
-        proc.inputStream.eachLine { println it }
-        assert proc.waitFor() == 0
-    }
-}
-
-task run_test {
-    doLast {
-        test_run = true
-    }
-}
-
-tasks.cleanTest.dependsOn tasks.run_test
-classes.dependsOn.clear()
-classes.dependsOn tasks.make_images
-tasks.cleanClasses.dependsOn tasks.make_clean
--- a/jb/project/tools/common/modules.list
+++ b/jb/project/tools/common/modules.list
@@ -1,53 +0,0 @@
-java.base,
-java.compiler,
-java.datatransfer,
-java.desktop,
-java.instrument,
-java.logging,
-java.management,
-java.management.rmi,
-java.naming,
-java.net.http,
-java.prefs,
-java.rmi,
-java.scripting,
-java.se,
-java.security.jgss,
-java.security.sasl,
-java.smartcardio,
-java.sql,
-java.sql.rowset,
-java.transaction.xa,
-java.xml,
-java.xml.crypto,
-jdk.accessibility,
-jdk.attach,
-jdk.charsets,
-jdk.compiler,
-jdk.crypto.cryptoki,
-jdk.crypto.ec,
-jdk.dynalink,
-jdk.httpserver,
-jdk.internal.ed,
-jdk.internal.le,
-jdk.internal.vm.ci,
-jdk.javadoc,
-jdk.jdi,
-jdk.jdwp.agent,
-jdk.jfr,
-jdk.localedata,
-jdk.management,
-jdk.management.agent,
-jdk.management.jfr,
-jdk.naming.dns,
-jdk.naming.rmi,
-jdk.net,
-jdk.sctp,
-jdk.security.auth,
-jdk.security.jgss,
-jdk.unsupported,
-jdk.unsupported.desktop,
-jdk.xml.dom,
-jdk.zipfs,
-jdk.hotspot.agent,
-jdk.jcmd
--- a/jb/project/tools/common/scripts/common.sh
+++ b/jb/project/tools/common/scripts/common.sh
@@ -1,190 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-function check_bundle_type_maketest() {
-  # check whether last char is 't', if so remove it
-  if [ "${bundle_type: -1}" == "t" ] && [ "${bundle_type: -2}" != "ft" ]; then
-    bundle_type="${bundle_type%?}"
-    do_maketest=1
-  else
-    do_maketest=0
-  fi
-}
-
-function getVersionProp() {
-  grep "^${1}" make/conf/version-numbers.conf | cut -d'=' -f2
-}
-
-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))
-
-if [[ $# -lt 2 ]]; then
-  echo "Required at least two arguments: build_number bundle_type"
-  exit 1
-fi
-
-build_number=$1
-bundle_type=$2
-# shellcheck disable=SC2034
-architecture=${3:-x64} # aarch64 or x64
-
-check_bundle_type_maketest
-
-VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
-VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
-VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")
-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}']"
-tag_prefix="jdk-"
-OPENJDK_TAG=$(git tag -l | grep "$tag_prefix$JBSDK_VERSION" | grep -v ga | sort -t "-" -k 2 -V -f | tail -n 1)
-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."
-VENDOR_VERSION_STRING="JBR-${JBSDK_VERSION}+${JDK_BUILD_NUMBER}-${build_number}"
-[ -z "$bundle_type" ] || VENDOR_VERSION_STRING="${VENDOR_VERSION_STRING}-${bundle_type}"
-
-do_reset_changes=0
-do_reset_dcevm=0
-HEAD_REVISION=0
-
-STATIC_CONF_ARGS=""
-common_conf_props_file="jb/project/tools/common/static_conf_args.txt"
-if [[ -f "$common_conf_props_file" ]]; then
-    STATIC_CONF_ARGS=$(<$common_conf_props_file)
-fi
-OS_NAME=$(uname -s)
-# Enable reproducible builds
-TZ=UTC
-export TZ
-SOURCE_DATE_EPOCH="$(git log -1 --pretty=%ct)"
-export SOURCE_DATE_EPOCH
-
-COPYRIGHT_YEAR=""
-BUILD_TIME=""
-TOUCH_TIME=""
-REPRODUCIBLE_TAR_OPTS=""
-case "$OS_NAME" in
-    Linux)
-        COPYRIGHT_YEAR="$(date --utc --date=@$SOURCE_DATE_EPOCH +%Y)"
-        BUILD_TIME="$(date --utc --date=@$SOURCE_DATE_EPOCH +%F)"
-        REPRODUCIBLE_TAR_OPTS="--mtime=@$SOURCE_DATE_EPOCH --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
-        ;;
-    CYGWIN*)
-        COPYRIGHT_YEAR="$(date --utc --date=@$SOURCE_DATE_EPOCH +%Y)"
-        BUILD_TIME="$(date --utc --date=@$SOURCE_DATE_EPOCH +%F)"
-        REPRODUCIBLE_TAR_OPTS="--mtime=@$SOURCE_DATE_EPOCH --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
-        ;;
-    Darwin)
-        COPYRIGHT_YEAR="$(date -u -r $SOURCE_DATE_EPOCH +%Y)"
-        BUILD_TIME="$(date -u -r $SOURCE_DATE_EPOCH +%F)"
-        TOUCH_TIME="$(date -u -r $SOURCE_DATE_EPOCH +%Y%m%d%H%M.%S)"
-        REPRODUCIBLE_TAR_OPTS="--uid 0 --gid 0 --numeric-owner"
-        ;;
-esac
-
-WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS="--with-native-debug-symbols=zipped"
-
-if [ "$bundle_type" == "nomodft" ]; then
-  WITH_BUNDLED_FREETYPE="--with-freetype=bundled"
-else
-  WITH_BUNDLED_FREETYPE=""
-fi
-
-REPRODUCIBLE_BUILD_OPTS="--with-source-date=$SOURCE_DATE_EPOCH
-  --with-hotspot-build-time=$BUILD_TIME
-  --with-copyright-year=$COPYRIGHT_YEAR
-  --disable-absolute-paths-in-output
-  --with-build-user=builduser"
-
-function zip_native_debug_symbols() {
-  image_bundle_path=$(echo $1 | cut -d"/" -f-4)
-  jdk_name=$(echo $1 | cut -d"/" -f5)
-  jbr_diz_name=$2
-
-  [ -d "dizfiles" ] && rm -rf dizfiles
-  mkdir dizfiles
-
-  rsync_target="../../../../dizfiles"
-  [ -z "$jdk_name" ] && rsync_target=$rsync_target"/"$jbr_diz_name
-  (cd $image_bundle_path && find . -name '*.diz' -exec rsync -R {} $rsync_target \;)
-  [ ! -z "$jdk_name" ] && mv dizfiles/$jdk_name dizfiles/$jbr_diz_name
-
-  (cd dizfiles && find $jbr_diz_name -print0 | COPYFILE_DISABLE=1 \
-    tar --no-recursion --null -T - -czf ../"$jbr_diz_name".tar.gz) || do_exit $?
-}
-
-function do_exit() {
-  exit_code=$1
-  [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
-  if [ $do_reset_dcevm -eq 1 ]; then
-    [ ! -z $HEAD_REVISION ] && git reset --hard $HEAD_REVISION
-  fi
-  exit "$exit_code"
-}
-
-function update_jsdk_mods() {
-  __jsdk=$1
-  __jcef_mods=$2
-  __orig_jsdk_mods=$3
-  __updated_jsdk_mods=$4
-  
-  # re-create java.desktop.jmod with updated module-info.class
-  tmp=.java.desktop.$$.tmp
-  mkdir "$tmp" || exit $?
-  "$__jsdk"/bin/jmod extract --dir "$tmp" "$__orig_jsdk_mods"/java.desktop.jmod || exit $?
-  "$__jsdk"/bin/javac \
-      --patch-module java.desktop="$__orig_jsdk_mods"/java.desktop.jmod \
-      --module-path "$__jcef_mods" -d "$tmp"/classes src/java.desktop/share/classes/module-info.java || exit $?
-  "$__jsdk"/bin/jmod \
-      create --class-path "$tmp"/classes --config "$tmp"/conf --header-files "$tmp"/include --legal-notice "$tmp"/legal --libs "$tmp"/lib \
-      java.desktop.jmod || exit $?
-  mv java.desktop.jmod "$__updated_jsdk_mods" || exit $?
-  rm -rf "$tmp"
-  
-  # re-create java.base.jmod with updated hashes
-  tmp=.java.base.$$.tmp
-  mkdir "$tmp" || exit $?
-  hash_modules=$("$__jsdk"/bin/jmod describe "$__orig_jsdk_mods"/java.base.jmod | grep hashes | awk '{print $2}' | tr '\n' '|' | sed s/\|$//) || exit $?
-  "$__jsdk"/bin/jmod extract --dir "$tmp" "$__orig_jsdk_mods"/java.base.jmod || exit $?
-  rm "$__updated_jsdk_mods"/java.base.jmod || exit $? # temp exclude from path
-  "$__jsdk"/bin/jmod \
-      create --module-path "$__updated_jsdk_mods" --hash-modules "$hash_modules" \
-      --class-path "$tmp"/classes --cmds "$tmp"/bin --config "$tmp"/conf --header-files "$tmp"/include --legal-notice "$tmp"/legal --libs "$tmp"/lib \
-      java.base.jmod || exit $?
-  mv java.base.jmod "$__updated_jsdk_mods" || exit $?
-  rm -rf "$tmp"
-}
-
-function get_mods_list() {
-  __mods=$1
-  echo $(ls $__mods) | sed s/\.jmod/,/g | sed s/,$//g | sed s/' '//g
-}
-
-function copy_jmods() {
-  __mods_list=$1
-  __jmods_from=$2
-  __jmods_to=$3
-
-  mkdir -p $__jmods_to
-
-  echo "${__mods_list}," | while read -d, mod; do cp $__jmods_from/$mod.jmod $__jmods_to/; done
-}
--- a/jb/project/tools/common/static_conf_args.txt
+++ b/jb/project/tools/common/static_conf_args.txt
@@ -1,4 +0,0 @@
--with-vendor-url=https://www.jetbrains.com/
--with-vendor-bug-url=https://youtrack.jetbrains.com/issues/JBR
--with-vendor-vm-bug-url=https://youtrack.jetbrains.com/issues/JBR
-
--- a/jb/project/tools/linux/scripts/mkimages_aarch64.sh
+++ b/jb/project/tools/linux/scripts/mkimages_aarch64.sh
@@ -1,185 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
-#
-# This script makes test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
-#
-# Environment variables:
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
-#               to configure
-#               By default JDK_BUILD_NUMBER is set zero
-#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
-#               By default JCEF binaries should be located in ./jcef_linux_aarch64
-
-source jb/project/tools/common/scripts/common.sh
-
-JCEF_PATH=${JCEF_PATH:=./jcef_linux_aarch64}
-
-function do_configure {
-
-  GTK_SHELL_PATH=/gtk-shell.xml
-
-  if [ ! -e $GTK_SHELL_PATH ]; then
-    echo $GTK_SHELL_PATH" does not exist"
-    GTK_SHELL_PATH=`pwd`/gtk-shell.xml
-    if [ ! -e $GTK_SHELL_PATH ]; then
-      echo $GTK_SHELL_PATH" does not exist"
-      curl -O https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
-    fi
-  fi
-
-  sh configure \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build="$JDK_BUILD_NUMBER" \
-    --with-version-opt=b"$build_number" \
-    --with-boot-jdk="$BOOT_JDK" \
-    --enable-cds=yes \
-    --with-gtk-shell1-protocol=$GTK_SHELL_PATH \
-    --with-vulkan \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $STATIC_CONF_ARGS \
-    $REPRODUCIBLE_BUILD_OPTS \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    $WITH_BUNDLED_FREETYPE \
-    || do_exit $?
-}
-
-function is_musl {
-  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
-  if [ -z $libc ]; then
-    # This is not Musl, return 1 == false
-    return 1
-  fi
-  return 0
-}
-
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
-
-  libc_type_suffix=''
-  fastdebug_infix=''
-  __cds_opt=''
-
-  if is_musl; then libc_type_suffix='musl-' ; 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}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix:-}b${build_number}
-
-  echo Running jlink....
-  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
-  $JSDK/bin/jlink \
-    --module-path "$__modules_path" --no-man-pages --compress=2 \
-    $__cds_opt --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
-    mv release "$IMAGES_DIR"/"$__root_dir"/release
-    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
-  fi
-
-  # 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 ...
-
-  (cd "$IMAGES_DIR" &&
-    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
-    tar $REPRODUCIBLE_TAR_OPTS \
-      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
-  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
-  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
-  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
-  gzip "$JBR".tar || do_exit $?
-  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=linux-aarch64-server-release
-
-jbr_name_postfix=""
-
-case "$bundle_type" in
-  "jcef")
-    do_reset_changes=1
-    jbr_name_postfix="_${bundle_type}"
-    do_maketest=1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    ;;
-  "nomodft" | "")
-    jbr_name_postfix="_ft"
-    ;;
-  "fd")
-    do_reset_changes=1
-    jbr_name_postfix="_${bundle_type}"
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=linux-aarch64-server-fastdebug
-    ;;
-esac
-
-if [ -z "${INC_BUILD:-}" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$RELEASE_NAME || do_exit $?
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
-JBRSDK_BUNDLE=jbrsdk
-
-echo Fixing permissions
-chmod -R a+r $JSDK
-
-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
-  cat $JCEF_PATH/jcef.version >> $JSDK/release
-fi
-
-# create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
-
-# 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" == "$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 $?
-
-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 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 $?
-fi
-
-do_exit 0
--- a/jb/project/tools/linux/scripts/mkimages_x64.sh
+++ b/jb/project/tools/linux/scripts/mkimages_x64.sh
@@ -1,210 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
-#
-# This script makes test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
-#
-# Environment variables:
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
-#               to configure
-#               By default JDK_BUILD_NUMBER is set zero
-#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
-#               By default JCEF binaries should be located in ./jcef_linux_x64
-
-source jb/project/tools/common/scripts/common.sh
-
-JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
-
-function do_configure {
-  if is_musl; then
-    LINUX_TARGET=""
-  else
-    LINUX_TARGET="\
-      --build=x86_64-unknown-linux-gnu \
-      --openjdk-target=x86_64-unknown-linux-gnu"
-  fi
-
-  GTK_SHELL_PATH=/gtk-shell.xml
-
-  if [ ! -e $GTK_SHELL_PATH ]; then
-    echo $GTK_SHELL_PATH" does not exist"
-    GTK_SHELL_PATH=`pwd`/gtk-shell.xml
-    if [ ! -e $GTK_SHELL_PATH ]; then
-      echo $GTK_SHELL_PATH" does not exist"
-      curl -O https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
-    fi
-  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" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build="$JDK_BUILD_NUMBER" \
-    --with-version-opt=b"$build_number" \
-    --with-boot-jdk="$BOOT_JDK" \
-    --enable-cds=yes \
-    --with-gtk-shell1-protocol=$GTK_SHELL_PATH \
-    $WITH_VULKAN \
-    $LINUX_TARGET \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $STATIC_CONF_ARGS \
-    $REPRODUCIBLE_BUILD_OPTS \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    $WITH_BUNDLED_FREETYPE \
-    || do_exit $?
-}
-
-function is_musl {
-  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
-  if [ -z $libc ]; then
-    # This is not Musl, return 1 == false
-    return 1
-  fi
-  return 0
-}
-
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
-
-  libc_type_suffix=''
-  fastdebug_infix=''
-  __cds_opt=''
-
-  if is_musl; then
-    libc_type_suffix='musl-'
-  else
-    LINUX_TARGET="\
-      --build=x86_64-unknown-linux-gnu \
-      --openjdk-target=x86_64-unknown-linux-gnu"
-  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}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix:-}b${build_number}
-
-  echo Running jlink....
-  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
-  $JSDK/bin/jlink \
-    --module-path "$__modules_path" --no-man-pages --compress=2 \
-    $__cds_opt --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
-    mv release "$IMAGES_DIR"/"$__root_dir"/release
-    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
-  fi
-
-  # 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 ...
-
-  (cd "$IMAGES_DIR" &&
-    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
-    tar $REPRODUCIBLE_TAR_OPTS \
-      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
-  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
-  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
-  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
-  gzip "$JBR".tar || do_exit $?
-  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=linux-x86_64-server-release
-
-jbr_name_postfix=""
-
-case "$bundle_type" in
-  "jcef")
-    do_reset_changes=1
-    jbr_name_postfix="_${bundle_type}"
-    jbrsdk_name_postfix="_${bundle_type}"
-    do_maketest=1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    jbrsdk_name_postfix="_${bundle_type}"
-    ;;
-  "nomodft" | "")
-    jbr_name_postfix="_ft"
-    jbrsdk_name_postfix="_ft"
-    ;;
-  "fd")
-    do_reset_changes=1
-    jbr_name_postfix="_${bundle_type}"
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=linux-x86_64-server-fastdebug
-    ;;
-esac
-
-if [ -z "${INC_BUILD:-}" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$RELEASE_NAME || do_exit $?
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
-JBRSDK_BUNDLE=jbrsdk
-
-echo Fixing permissions
-chmod -R a+r $JSDK
-
-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
-  cat $JCEF_PATH/jcef.version >> $JSDK/release
-fi
-
-# create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
-
-# 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" == "$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 $?
-
-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 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 $?
-fi
-
-do_exit 0
--- a/jb/project/tools/linux/scripts/mkimages_x86.sh
+++ b/jb/project/tools/linux/scripts/mkimages_x86.sh
@@ -1,146 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
-#
-
-source jb/project/tools/common/scripts/common.sh
-
-function do_configure {
-  linux32 bash configure \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build="$JDK_BUILD_NUMBER" \
-    --with-version-opt=b"$build_number" \
-    --with-boot-jdk="$BOOT_JDK" \
-    $STATIC_CONF_ARGS \
-    --enable-cds=yes \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $REPRODUCIBLE_BUILD_OPTS \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    || do_exit $?
-}
-
-function is_musl {
-  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
-  if [ -z $libc ]; then
-    # This is not Musl, return 1 == false
-    return 1
-  fi
-  return 0
-}
-
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
-
-  libc_type_suffix=''
-  fastdebug_infix=''
-  __cds_opt=''
-
-  if is_musl; then libc_type_suffix='musl-' ; 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}x86-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix:-}b${build_number}
-
-  echo Running jlink....
-  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
-  $JSDK/bin/jlink \
-    --module-path "$__modules_path" --no-man-pages --compress=2 \
-    $__cds_opt --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
-    mv release "$IMAGES_DIR"/"$__root_dir"/release
-    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
-  fi
-
-  # 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
-
-  echo Creating "$JBR".tar.gz ...
-
-  (cd "$IMAGES_DIR" &&
-    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
-    tar $REPRODUCIBLE_TAR_OPTS \
-      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
-  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
-  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
-  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
-  gzip "$JBR".tar || do_exit $?
-  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=linux-x86-server-release
-
-case "$bundle_type" in
-  "jcef")
-    echo "not implemented" && do_exit 1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    ;;
-  "fd")
-    do_reset_changes=1
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=linux-x86-server-fastdebug
-    ;;
-esac
-
-if [ -z "${INC_BUILD:-}" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$RELEASE_NAME || do_exit $?
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
-JBRSDK_BUNDLE=jbrsdk
-
-echo Fixing permissions
-chmod -R a+r $JSDK
-
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
-fi
-
-# create runtime image bundle
-modules=$(grep -v "jdk.internal.vm" jb/project/tools/common/modules.list | xargs | sed s/" "//g) || do_exit $?
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
-
-# 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 $?
-create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
-
-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 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 $?
-fi
-
-do_exit 0
--- a/jb/project/tools/mac/scripts/codesign.sh
+++ b/jb/project/tools/mac/scripts/codesign.sh
@@ -1,63 +0,0 @@
-#!/bin/bash
-SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
-
-source "$SCRIPT_DIR/jetsign-common.sh" || exit 1
-
-function isMacOsBinary() {
-  file "$1" | grep -q 'Mach-O'
-}
-
-function isSigned() {
-  codesign --verify "$1" >/dev/null 2>&1 && ! grep -q Signature=adhoc < <(codesign --display --verbose "$1" 2>&1)
-}
-
-# last argument is a path to be signed
-pathToBeSigned="$(pwd)/${*: -1}"
-jetSignArgs=("${@:1:$#-1}")
-if [[ ! -f "$pathToBeSigned" ]]; then
-  echo "$pathToBeSigned is missing or not a file"
-  exit 1
-elif isSigned "$pathToBeSigned" && ! isForced "${jetSignArgs[@]}" ; then
-  echo "Already signed: $pathToBeSigned"
-elif [[ "$JETSIGN_CLIENT" == "null" ]]; then
-  echo "JetSign client is missing, cannot proceed with signing"
-  exit 1
-elif ! isMacOsBinary "$pathToBeSigned" && [[ "$pathToBeSigned" != *.sit ]] && [[ "$pathToBeSigned" != *.tar.gz ]]; then
-  echo "$pathToBeSigned won't be signed, assumed not to be a macOS executable"
-else
-  if isMacOsBinary "$pathToBeSigned" && ! isSigned "$pathToBeSigned" ; then
-    echo "Unsigned macOS binary: $pathToBeSigned"
-  fi
-  workDir=$(dirname "$pathToBeSigned")
-  pathSigned="$workDir/signed/${pathToBeSigned##*/}"
-  jetSignExtensions=$(jetSignExtensions "${jetSignArgs[@]}")
-  contentType=$(jetSignContentType "$pathToBeSigned")
-  (
-    cd "$workDir" || exit 1
-    
-    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
-      isSigned "$pathSigned"
-    fi
-    rm "$pathToBeSigned"
-    mv "$pathSigned" "$pathToBeSigned"
-    rm -rf "$workDir/signed"
-  )
-fi
--- a/jb/project/tools/mac/scripts/entitlements.xml
+++ b/jb/project/tools/mac/scripts/entitlements.xml
@@ -1,16 +0,0 @@
-<?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>
-        <true/>
-        <key>com.apple.security.cs.allow-dyld-environment-variables</key>
-        <true/>
-        <key>com.apple.security.cs.disable-library-validation</key>
-        <true/>
-        <key>com.apple.security.cs.disable-executable-page-protection</key>
-        <true/>
-    </dict>
-</plist>
--- a/jb/project/tools/mac/scripts/entitlements_jcef.xml
+++ b/jb/project/tools/mac/scripts/entitlements_jcef.xml
@@ -1,16 +0,0 @@
-<?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>
-        <false/>
-        <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>
--- a/jb/project/tools/mac/scripts/jetsign-common.sh
+++ b/jb/project/tools/mac/scripts/jetsign-common.sh
@@ -1,63 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-function isForced() {
-  for arg in "$@"; do
-    if [[ "$arg" == --force ]]; then
-      return 0
-    fi
-  done
-  return 1
-}
-
-function jetSignExtensions() {
-  args=("$@")
-  ((lastElementIndex=${#args[@]}-1))
-  for index in "${!args[@]}"; do
-    arg=${args[$index]}
-    case "$arg" in
-    --sign | -s)
-      echo -n 'mac_codesign_identity='
-      continue
-      ;;
-    --entitlements)
-      echo -n 'mac_codesign_entitlements='
-      continue
-      ;;
-    --options=runtime)
-      echo -n 'mac_codesign_options=runtime'
-      ;;
-    --force)
-      echo -n 'mac_codesign_force=true'
-      ;;
-    --timestamp | --verbose | -v)
-      continue
-      ;;
-    *)
-      echo -n "$arg"
-      ;;
-    esac
-    if [[ $index != "$lastElementIndex" ]]; then
-      echo -n ","
-    fi
-  done
-}
-
-# See jetbrains.sign.util.FileUtil.contentType
-function jetSignContentType() {
-  case "${1##*/}" in
-  *.sit)
-    echo -n 'application/x-mac-app-zip'
-    ;;
-  *.tar.gz)
-    echo -n 'application/x-mac-app-targz'
-    ;;
-  *.pkg)
-    echo -n 'application/x-mac-pkg'
-    ;;
-  *)
-    echo -n 'application/x-mac-app-bin'
-    ;;
-  esac
-}
-
--- a/jb/project/tools/mac/scripts/mkimages.sh
+++ b/jb/project/tools/mac/scripts/mkimages.sh
@@ -1,192 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
-#
-# This script makes test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
-#
-# Environment variables:
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
-#               to configure
-#               By default JDK_BUILD_NUMBER is set zero
-#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
-#               By default JCEF binaries should be located in ./jcef_mac
-
-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 \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-macosx-bundle-name-base=${VENDOR_VERSION_STRING} \
-    --with-macosx-bundle-id-base="com.jetbrains.jbr" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build="$JDK_BUILD_NUMBER" \
-    --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 $?
-}
-
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
-
-  fastdebug_infix=''
-  __cds_opt=''
-  __cds_opt="--generate-cds-archive"
-
-  tmp=.bundle.$$.tmp
-  mkdir "$tmp" || do_exit $?
-
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
-
-  JRE_CONTENTS=$tmp/$__root_dir/Contents
-  mkdir -p "$JRE_CONTENTS" || do_exit $?
-
-  echo Running jlink...
-  "$JSDK"/bin/jlink \
-    --module-path "$__modules_path" --no-man-pages --compress=2 \
-    $__cds_opt --add-modules "$__modules" --output "$JRE_CONTENTS/Home" || do_exit $?
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$JRE_CONTENTS/Home/release"
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
-    mv release $JRE_CONTENTS/Home/release
-    cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/src.zip $JRE_CONTENTS/Home/lib
-    copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
-  fi
-
-  if [ "$bundle_type" == "jcef" ]; then
-    cat $JCEF_PATH/jcef.version >> "$JRE_CONTENTS/Home/release"
-  fi
-
-  cp -R "$JSDK"/../MacOS "$JRE_CONTENTS"
-  cp "$JSDK"/../Info.plist "$JRE_CONTENTS"
-
-  [ -n "$bundle_type" ] && (cp -a $JCEF_PATH/Frameworks "$JRE_CONTENTS" || do_exit $?)
-
-  echo Creating "$JBR".tar.gz ...
-  # Normalize timestamp
-  find "$tmp"/"$__root_dir" -print0 | xargs -0 touch -c -h -t "$TOUCH_TIME"
-
-  (cd "$tmp" &&
-      find "$__root_dir" -print0 | LC_ALL=C sort -z | \
-      COPYFILE_DISABLE=1 tar $REPRODUCIBLE_TAR_OPTS  --no-recursion --null -T - \
-                             -czf "$JBR".tar.gz --exclude='*.dSYM' --exclude='man') || do_exit $?
-  mv "$tmp"/"$JBR".tar.gz  "$JBR".tar.gz
-  rm -rf "$tmp"
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-CONF_ARCHITECTURE=x86_64
-if [[ "${architecture}" == *aarch64* ]]; then
-  CONF_ARCHITECTURE=aarch64
-fi
-RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-release
-
-case "$bundle_type" in
-  "jcef")
-    do_reset_changes=1
-    do_maketest=1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    ;;
-  "fd")
-    do_reset_changes=1
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-fastdebug
-    JBSDK=macosx-${architecture}-server-release
-    ;;
-esac
-
-if [ -z "${INC_BUILD:-}" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$RELEASE_NAME || do_exit $?
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-
-JSDK=$IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
-JBRSDK_BUNDLE=jbrsdk
-
-# test/jdk/jb/java/awt/Focus/FullScreenFocusStealing.java test/jdk/java/awt/color/ICC_ColorSpace/MTTransformReplacedProfile.java test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorRemoteTest.java test/jdk/java/awt/Robot/NonEmptyErrorStream.java
-
-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
-  fi
-
-  jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
-fi
-
-# create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
-
-# 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" == "$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 $?
-
-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 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
-
-do_exit 0
--- a/jb/project/tools/mac/scripts/notarize.sh
+++ b/jb/project/tools/mac/scripts/notarize.sh
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-#immediately exit script with an error if a command fails
-set -euo pipefail
-[[ "${SCRIPT_VERBOSE:-}" == "1" ]] && set -x
-
-APP_PATH=$1
-
-if [[ -z "$APP_PATH" ]]; then
-  echo "Usage: $0 AppPath"
-  exit 1
-fi
-if [[ ! -f "$APP_PATH" ]]; then
-  echo "AppName '$APP_PATH' does not exist or not a file"
-  exit 1
-fi
-
-function log() {
-  echo "$(date '+[%H:%M:%S]') $*"
-}
-
-
-# check required parameters
-: "${APPLE_ISSUER_ID}"
-: "${APPLE_KEY_ID}"
-: "${APPLE_PRIVATE_KEY}"
-
-# shellcheck disable=SC2064
-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 --wait| tee "notarytool.submit.out"
-REQUEST_ID="$(grep -e " id: " "notarytool.submit.out" | grep -oE '([0-9a-f-]{36})'| head -n1)"
-
-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"
--- a/jb/project/tools/mac/scripts/productsign.sh
+++ b/jb/project/tools/mac/scripts/productsign.sh
@@ -1,41 +0,0 @@
-#!/bin/bash
-SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
-
-source "$SCRIPT_DIR/jetsign-common.sh" || exit 1
-
-function isSigned() {
-  pkgutil --check-signature "$1" >/dev/null 2>&1 && grep -q "signed by a developer certificate" < <(pkgutil --check-signature "$1" 2>&1)
-}
-
-# second last argument is a path to be signed
-pathToBeSigned="$(pwd)/${*:(-2):1}"
-# last argument is a path to signed file
-pathOut="$(pwd)/${*:(-1)}"
-jetSignArgs=("${@:1:$#-2}")
-if [[ ! -f "$pathToBeSigned" ]]; then
-  echo "$pathToBeSigned is missing or not a file"
-  exit 1
-elif isSigned "$pathToBeSigned" && ! isForced "${jetSignArgs[@]}" ; then
-  echo "Already signed: $pathToBeSigned"
-elif [[ "$JETSIGN_CLIENT" == "null" ]]; then
-  echo "JetSign client is missing, cannot proceed with signing"
-  exit 1
-elif [[ "$pathToBeSigned" != *.pkg ]]; then
-  echo "$pathToBeSigned won't be signed, assumed not to be a macOS package"
-else
-  if ! isSigned "$pathToBeSigned" ; then
-    echo "Unsigned macOS package: $pathToBeSigned"
-  fi
-  workDir=$(dirname "$pathToBeSigned")
-  pathSigned="$workDir/signed/${pathToBeSigned##*/}"
-  jetSignExtensions=$(jetSignExtensions "${jetSignArgs[@]}")
-  contentType=$(jetSignContentType "$pathToBeSigned")
-  (
-    cd "$workDir" || exit 1
-    "$JETSIGN_CLIENT" -log-format text -denoted-content-type "$contentType" -extensions "$jetSignExtensions" "$pathToBeSigned"
-    isSigned "$pathSigned"
-    rm -f "$pathOut"
-    mv "$pathSigned" "$pathOut"
-    rm -rf "$workDir/signed"
-  )
-fi
--- a/jb/project/tools/mac/scripts/sign.sh
+++ b/jb/project/tools/mac/scripts/sign.sh
@@ -1,241 +0,0 @@
-#!/bin/bash
-
-#immediately exit script with an error if a command fails
-set -euo pipefail
-[[ "${SCRIPT_VERBOSE:-}" == "1" ]] && set -x
-
-if [[ $# -lt 5  ]]; then
-  echo "Usage: $0 AppDirectory AppName BundleId CertificateID InstallerCertificateID"
-  exit 1
-fi
-
-APPLICATION_PATH=$1
-PKG_NAME=$2
-BUNDLE_ID=$3
-JB_DEVELOPER_CERT=$4
-JB_INSTALLER_CERT=$5
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
-
-# Use JetBrains sign utility if it's available
-if [[ "${JETSIGN_CLIENT:=}" == "null" ]] || [[ "$JETSIGN_CLIENT" == "" ]]; then
-  JB_SIGN=false
-  SIGN_UTILITY="codesign"
-  PRODUCTSIGN_UTILITY="productsign"
-else
-  JB_SIGN=true
-  SIGN_UTILITY="$SCRIPT_DIR/codesign.sh"
-  PRODUCTSIGN_UTILITY="$SCRIPT_DIR/productsign.sh"
-fi
-
-if [[ ! -d "$APPLICATION_PATH" ]]; then
-  echo "AppDirectory '$APPLICATION_PATH' does not exist or not a directory"
-  exit 1
-fi
-
-function log() {
-  echo "$(date '+[%H:%M:%S]') $*"
-}
-
-# Cleanup files left from previous sign attempt (if any)
-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"; 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 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="$APPLICATION_PATH/Contents/Home/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 jnativescan -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
-# `-e` prevents `grep -q && printf` loginc
-# with `-o pipefail` there's no input for 'while' loop
-find "$APPLICATION_PATH" -name '*.jar' \
-  -exec sh -c "set -u; unzip -l \"\$0\" | grep -q -e '\.dylib\$' -e '\.jnilib\$' -e '\.so\$' -e '\.tbd\$' -e '^jattach\$' && printf \"\$0\0\" " {} \; |
-  while IFS= read -r -d $'\0' file; do
-    log "Processing libraries in $file"
-
-    rm -rf jarfolder jar.jar
-    mkdir jarfolder
-    filename="${file##*/}"
-    log "Filename: $filename"
-    cp "$file" jarfolder && (cd jarfolder && jar xf "$filename" && rm "$filename")
-
-    find jarfolder \
-      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -name "jattach" \) \
-      -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"
-  done
-
-rm -rf jarfolder jar.jar
-
-log "Signing other files..."
-# shellcheck disable=SC2043
-for f in \
-  "Contents/Home/bin"; 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 -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.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/Frameworks"; do
-  if [ -d "$APPLICATION_PATH/$f" ]; then
-    find "$APPLICATION_PATH/$f" \( -name '*.framework' -o -name '*.app' \) -maxdepth 1 | while read -r line
-      do
-        log "Signing '$line':"
-        tar -pczf tmp-to-sign.tar.gz -C "$(dirname "$line")" "$(basename "$line")"
-        "$SIGN_UTILITY" --timestamp \
-            -v -s "$JB_DEVELOPER_CERT" --options=runtime \
-            --force \
-            --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
-      done
-  fi
-done; fi
-
-log "Checking framework signatures..."
-
-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
-  tar -pczf tmp-to-sign.tar.gz --exclude='man' -C "$(dirname "$APPLICATION_PATH")" "$(basename "$APPLICATION_PATH")"
-  "$SIGN_UTILITY" --timestamp \
-    -v -s "$JB_DEVELOPER_CERT" --options=runtime \
-    --force \
-    --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
-else
-  "$SIGN_UTILITY" --timestamp \
-    -v -s "$JB_DEVELOPER_CERT" --options=runtime \
-    --force \
-    --entitlements "$SCRIPT_DIR/entitlements.xml" "$APPLICATION_PATH" || exit 1
-fi
-
-BUILD_NAME="$(basename "$APPLICATION_PATH")"
-
-log "Creating $PKG_NAME..."
-rm -rf "$PKG_NAME"
-
-mkdir -p unsigned
-pkgbuild --identifier $BUNDLE_ID --root $APPLICATION_PATH \
-    --install-location /Library/Java/JavaVirtualMachines/${BUILD_NAME} unsigned/${PKG_NAME}
-log "Signing $PKG_NAME..."
-"$PRODUCTSIGN_UTILITY" --timestamp --sign "$JB_INSTALLER_CERT" unsigned/${PKG_NAME} ${PKG_NAME}
-
-log "Verifying java is not broken"
-find "$APPLICATION_PATH" \
-  -type f -name 'java' -perm +111 -exec {} -version \;
--- a/jb/project/tools/mac/scripts/signapp.sh
+++ b/jb/project/tools/mac/scripts/signapp.sh
@@ -1,155 +0,0 @@
-#!/bin/bash
-
-#immediately exit script with an error if a command fails
-set -euo pipefail
-[[ "${SCRIPT_VERBOSE:-}" == "1" ]] && set -x
-
-export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
-export COPYFILE_DISABLE=true
-
-INPUT_FILE=$1
-EXPLODED=$2.exploded
-USERNAME=$3
-PASSWORD=$4
-CODESIGN_STRING=$5
-JB_INSTALLER_CERT=$6
-NOTARIZE=$7
-BUNDLE_ID=$8
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
-
-function log() {
-  echo "$(date '+[%H:%M:%S]') $*"
-}
-
-log "Deleting $EXPLODED ..."
-if test -d "$EXPLODED"; then
-  find "$EXPLODED" -mindepth 1 -maxdepth 1 -exec chmod -R u+wx '{}' \;
-fi
-rm -rf "$EXPLODED"
-mkdir "$EXPLODED"
-
-log "Unzipping $INPUT_FILE to $EXPLODED ..."
-tar -xzvf "$INPUT_FILE" --directory $EXPLODED
-BUILD_NAME="$(ls "$EXPLODED")"
-#sed -i '' s/BNDL/APPL/ $EXPLODED/$BUILD_NAME/Contents/Info.plist
-rm -f $EXPLODED/$BUILD_NAME/Contents/CodeResources
-mv "$INPUT_FILE" "$INPUT_FILE".origin
-
-log "$INPUT_FILE extracted and removed"
-
-APP_NAME=$(basename "$INPUT_FILE" | awk -F".tar" '{ print $1 }')
-PKG_NAME="$APP_NAME.pkg"
-APPLICATION_PATH=$EXPLODED/$(ls $EXPLODED)
-
-find "$APPLICATION_PATH/Contents/Home/bin" \
-  -maxdepth 1 -type f -name '*.jnilib' -print0 |
-  while IFS= read -r -d $'\0' file; do
-    if [ -f "$file" ]; then
-      log "Linking $file"
-      b="$(basename "$file" .jnilib)"
-      ln -sf "$b.jnilib" "$(dirname "$file")/$b.dylib"
-    fi
-  done
-
-find "$APPLICATION_PATH/Contents/" \
-  -maxdepth 1 -type f -name '*.txt' -print0 |
-  while IFS= read -r -d $'\0' file; do
-    if [ -f "$file" ]; then
-      log "Moving $file"
-      mv "$file" "$APPLICATION_PATH/Contents/Resources"
-    fi
-  done
-
-non_plist=$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist' | wc -l)
-if [[ $non_plist -gt 0 ]]; then
-  log "Only Info.plist file is allowed in Contents directory but found $non_plist file(s):"
-  log "$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist')"
-  exit 1
-fi
-
-if [[ "${JETSIGN_CLIENT:=}" == "null" ]] || [[ "$JETSIGN_CLIENT" == "" ]]; then
-  log "Unlocking keychain..."
-  # Make sure *.p12 is imported into local KeyChain
-  security unlock-keychain -p "$PASSWORD" "/Users/$USERNAME/Library/Keychains/login.keychain"
-fi
-
-attempt=1
-limit=1
-ec=0
-set +e
-while [[ $attempt -le $limit ]]; do
-  log "Signing (attempt $attempt) $APPLICATION_PATH ..."
-  "$SCRIPT_DIR/sign.sh" "$APPLICATION_PATH" "$PKG_NAME" "$BUNDLE_ID" "$CODESIGN_STRING" "$JB_INSTALLER_CERT"
-  ec=$?
-  ((attempt += 1))
-  if [[ $ec -ne 0 ]]; then
-    log "Signing failed, wait for 30 sec and try to sign again"
-    sleep 30
-  else
-    log "Signing done"
-    codesign -v "$APPLICATION_PATH" -vvvvv
-    log "Check sign done"
-    spctl -a -v $APPLICATION_PATH
-  fi
-done
-
-set -e
-
-if [[ $ec -ne 0 ]]; then
-  log "Signing failed, restore original input file"
-  mv "$INPUT_FILE".origin "$INPUT_FILE"
-fi
-
-if [ "$NOTARIZE" = "yes" ]; then
-  log "Notarizing..."
-  "$SCRIPT_DIR/notarize.sh" "$PKG_NAME"
-
-  log "Stapling..."
-  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"
-fi
-
-log "Zipping $BUILD_NAME to $INPUT_FILE ..."
-(
-  if [[ "$APPLICATION_PATH" != "$EXPLODED/$BUILD_NAME" ]]; then
-    mv $APPLICATION_PATH $EXPLODED/$BUILD_NAME
-  else
-    echo "No move, source == destination: $APPLICATION_PATH"
-  fi
-
-  tar -pczvf $INPUT_FILE --exclude='man' -C $EXPLODED $BUILD_NAME
-  log "Finished zipping"
-)
-rm -rf "$EXPLODED"
-log "Done"
--- a/jb/project/tools/patches/add_jcef_module.patch
+++ b/jb/project/tools/patches/add_jcef_module.patch
@@ -1,30 +0,0 @@
-diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
-index 522acb7cb43..c40e689d5de 100644
--- jb/project/tools/common/modules.list
-+++ jb/project/tools/common/modules.list
-@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
- jdk.xml.dom,
- jdk.zipfs,
- jdk.hotspot.agent,
-jdk.jcmd
-+jdk.jcmd,
-+jcef,
-+gluegen.rt,
-+jogl.all
-diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
-index 897647ee368..781d1809493 100644
--- src/java.desktop/share/classes/module-info.java
-+++ src/java.desktop/share/classes/module-info.java
-@@ -116,7 +116,11 @@ module java.desktop {
-     // see make/GensrcModuleInfo.gmk
-     exports sun.awt to
-         jdk.accessibility,
-        jdk.unsupported.desktop;
-+        jdk.unsupported.desktop,
-+        jcef,
-+        jogl.all;
-+
-+    exports java.awt.peer to jcef;
- 
-     exports java.awt.dnd.peer to jdk.unsupported.desktop;
-     exports sun.awt.dnd to jdk.unsupported.desktop;
--- a/jb/project/tools/patches/add_jcef_module_aarch64.patch
+++ b/jb/project/tools/patches/add_jcef_module_aarch64.patch
@@ -1,30 +0,0 @@
-diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
-index 522acb7..c40e689 100644
--- jb/project/tools/common/modules.list
-+++ jb/project/tools/common/modules.list
-@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
- jdk.xml.dom,
- jdk.zipfs,
- jdk.hotspot.agent,
-jdk.jcmd
-+jdk.jcmd,
-+jcef,
-+gluegen.rt,
-+jogl.all
-diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
-index 897647e..781d180 100644
--- src/java.desktop/share/classes/module-info.java
-+++ src/java.desktop/share/classes/module-info.java
-@@ -116,7 +116,11 @@ module java.desktop {
-     // see make/GensrcModuleInfo.gmk
-     exports sun.awt to
-         jdk.accessibility,
-        jdk.unsupported.desktop;
-+        jdk.unsupported.desktop,
-+        jcef,
-+        jogl.all;
-+
-+    exports java.awt.peer to jcef;
-
-     exports java.awt.dnd.peer to jdk.unsupported.desktop;
-     exports sun.awt.dnd to jdk.unsupported.desktop;
--- a/jb/project/tools/perf/j2dbopts_poly250-AA-rand_col.txt
+++ b/jb/project/tools/perf/j2dbopts_poly250-AA-rand_col.txt
@@ -1,267 +0,0 @@
-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
--- a/jb/project/tools/perf/j2dbopts_poly250-rand_col.txt
+++ b/jb/project/tools/perf/j2dbopts_poly250-rand_col.txt
@@ -1,267 +0,0 @@
-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
--- a/jb/project/tools/perf/j2dbopts_poly250.txt
+++ b/jb/project/tools/perf/j2dbopts_poly250.txt
@@ -1,267 +0,0 @@
-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
--- a/jb/project/tools/perf/run_dc.sh
+++ b/jb/project/tools/perf/run_dc.sh
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-#set -euo pipefail
-set -x
-
-BASE_DIR=$(dirname "$0")
-source $BASE_DIR/run_inc.sh
-
-if [ -z "$DACAPOTEST_DIR" ]; then
-  DACAPOTEST_DIR="./"
-fi
-
-DACAPOTEST=${DACAPOTEST:='dacapo-9.12-bach.jar'}
-if [ -z "$DACAPOTEST" ]; then
-  if [ ! -f "$DACAPOTEST_DIR/$DACAPOTEST" ]; then
-    echo "ERR### cannot find $DACAPOTEST_DIR/$DACAPOTEST"
-    exit 2
-  fi
-fi
-
-
-TRACE=false
-
-if [[ ($# -eq 1 && "$1" == "-help") ]] ; then
-  echo "Usage: run_dc.sh [rendering_options]"
-  echo "$RENDER_OPS_DOC"
-  exit 3
-fi
-
-OPTS=""
-# use time + repeat
-OPTS="$OPTS -no-validation $1"
-
-echo "OPTS: $OPTS"
-
-echo "Unit: Milliseconds (not FPS), lower is better"
-
-for i in `seq $N` ; do 
-  if [ $i -eq 1 ]; then
-    echo x
-  fi
-
-  $JAVA \
-  -jar $DACAPOTEST $OPTS 2>&1 | tee dacapo_$1$MODE_$i.log | grep "PASSED" | awk '{print $7 }'
-
-  if [ $i -ne $N ]; then
-    sleep $ST
-  fi
-done | $DATAMASH_CMD | expand -t12 > dacapo_$1.log
--- a/jb/project/tools/perf/run_inc.sh
+++ b/jb/project/tools/perf/run_inc.sh
@@ -1,127 +0,0 @@
-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)
-  -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
-        ;;
-    -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"
--- a/jb/project/tools/perf/run_j2b.sh
+++ b/jb/project/tools/perf/run_j2b.sh
@@ -1,53 +0,0 @@
-#!/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
--- a/jb/project/tools/perf/run_rp.sh
+++ b/jb/project/tools/perf/run_rp.sh
@@ -1,88 +0,0 @@
-#!/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
--- a/jb/project/tools/perf/run_sm.sh
+++ b/jb/project/tools/perf/run_sm.sh
@@ -1,39 +0,0 @@
-#!/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
--- a/jb/project/tools/test/check_jbr_size.sh
+++ b/jb/project/tools/test/check_jbr_size.sh
@@ -1,162 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-TC_PRINT=0
-# Always print TeamCity service messages if running under TeamCity
-[[ -n "${TEAMCITY_VERSION:-}" ]] && TC_PRINT=1
-
-while getopts ":t" o; do
-    case "${o}" in
-        t) TC_PRINT=1 ;;
-        *);;
-    esac
-done
-shift $((OPTIND-1))
-
-NEWFILEPATH="$1"
-CONFIGID="$2"
-BUILDID="$3"
-TOKEN="$4"
-
-if [ ! -f "$NEWFILEPATH" ]; then
-  echo "File not found: $NEWFILEPATH"
-  exit 1
-fi
-#
-# Get the size of new artifact
-#
-
-unameOut="$(uname -s)"
-case "${unameOut}" in
-    Linux*)
-      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
-      ;;
-    Darwin*)
-      NEWFILESIZE=$(stat -f%z "$NEWFILEPATH")
-      ;;
-    CYGWIN*)
-      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
-      ;;
-    MINGW*)
-      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
-      ;;
-    *)
-      echo "Unknown machine: ${unameOut}"
-      exit 1
-esac
-FILENAME=$(basename "${NEWFILEPATH}")
-
-#
-# Get pattern of artifact name
-# Base filename pattern: <BUNDLE_TYPE>-<JDK_VERSION>-<OS>-<ARCH>-b<BUILD>.tar.gz: jbr_dcevm-17.0.2-osx-x64-b1234.tar.gz
-# BUNDLE_TYPE: jbr, jbrsdk, jbr_dcevm, jbrsdk_jcef etc.
-# OS_ARCH_PATTERN - <os_architecture>: osx-x64, linux-aarch64, linux-musl-x64, windows-x64 etc.
-
-BUNDLE_TYPE=jbrsdk
-OS_ARCH_PATTERN=""
-FILE_EXTENSION=tar.gz
-
-re='(jbr[a-z_]*).*-[0-9_\.]+-(.+)-b[0-9]+(.+)'
-if [[ $FILENAME =~ $re ]]; then
-  BUNDLE_TYPE=${BASH_REMATCH[1]}
-  OS_ARCH_PATTERN=${BASH_REMATCH[2]}
-  FILE_EXTENSION=${BASH_REMATCH[3]}
-else
-  echo "File name $FILENAME does not match regex $re"
-  exit 1
-fi
-
-function test_started_msg() {
-  if [ $TC_PRINT -eq 1 ]; then
-    echo "##teamcity[testStarted name='$1']"
-  fi
-}
-
-function test_failed_msg() {
-  if [ $TC_PRINT -eq 1 ]; then
-    echo "##teamcity[testFailed name='$1' message='$2']"
-  fi
-}
-
-function test_finished_msg() {
-  if [ $TC_PRINT -eq 1 ]; then
-    echo "##teamcity[testFinished name='$1']"
-  fi
-}
-
-test_name="${BUNDLE_TYPE}_${OS_ARCH_PATTERN//\-/_}${FILE_EXTENSION//\./_}"
-test_started_msg "$test_name"
-
-echo "BUNDLE_TYPE: $BUNDLE_TYPE"
-echo "OS_ARCH_PATTERN: $OS_ARCH_PATTERN"
-echo "FILE_EXTENSION: $FILE_EXTENSION"
-echo "Size of $FILENAME is $NEWFILESIZE bytes"
-
-#
-# Get previous successful build ID
-# Example:
-# CONFIGID=IntellijCustomJdk_Jdk17_Master_LinuxX64jcef
-# BUILDID=12345678
-#
-# expected return value
-# id="123".number="567"
-#
-CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/?locator=buildType:(id:$CONFIGID),status:success,count:1,finishDate:(build:$BUILDID,condition:before)")
-re='id=\"([0-9]+)\".+number=\"([0-9\.]+)\"'
-
-# ID: Previous successful build id
-ID=0
-if [[ $CURL_RESPONSE =~ $re ]]; then
-  ID=${BASH_REMATCH[1]}
-  echo "Previous build ID: $ID"
-  echo "Previous build number: ${BASH_REMATCH[2]}"
-else
-  msg="ERROR: cannot find previous build"
-  echo "$msg"
-  echo "$CURL_RESPONSE"
-  test_failed_msg "$test_name" "$msg"
-  test_finished_msg "$test_name"
-  exit 1
-fi
-
-#
-# Get artifacts from previous successful build
-#
-# expected return value
-# name="jbrsdk_jcef*.tar.gz size="123'
-#
-CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/$ID?fields=id,number,artifacts(file(name,size))")
-echo "Artifacts of the previous build:"
-echo "$CURL_RESPONSE"
-
-# Find binary size (in response) with reg exp
-re="name=\"(${BUNDLE_TYPE}[^\"]+${OS_ARCH_PATTERN}[^\"]+${FILE_EXTENSION})\" size=\"([0-9]+)\""
-
-if [[ $CURL_RESPONSE =~ $re ]]; then
-  prevFileName=${BASH_REMATCH[1]}
-  echo "Previous artifact name: $prevFileName"
-  prevFileSize=${BASH_REMATCH[2]}
-  echo "Previous artifact size: $prevFileSize"
-
-  ((allowedSize=prevFileSize+prevFileSize/20)) # use 5% threshold
-  echo "Allowed size: $allowedSize"
-  if [[ "$NEWFILESIZE" -gt "$allowedSize" ]]; then
-    msg="ERROR: new size is significantly greater than previous size (need to investigate)"
-    echo "$msg"
-    test_failed_msg "$test_name" "$msg"
-    test_finished_msg "$test_name"
-    exit 1
-  else
-    echo "PASSED"
-    test_finished_msg "$test_name"
-  fi
-else
-  msg="ERROR: cannot find string with size in xml response:"
-  echo "Regex: $re"
-  echo "$msg"
-  echo "$CURL_RESPONSE"
-  test_failed_msg "$test_name" "$msg"
-  test_finished_msg "$test_name"
-  exit 1
-fi
--- a/jb/project/tools/test/perfcmp.sh
+++ b/jb/project/tools/test/perfcmp.sh
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-usage ()
-{
-echo "Usage: perfcmp.sh [options] <test_results_cur> <test_results_ref> <results> <test_prefix> <noHeaders>"
-echo "Options:"
-echo -e " -h, --help\tdisplay this help"
-echo -e " -tc\tprint teacmity statistic"
-echo -e "test_results_cur - the file with  metrics values for the current measuring"
-echo -e "test_results_ref - the file with metrics values for the reference measuring"
-echo -e "results - results of comaprison"
-echo -e "test_prefix - specifys measuring type, makes sense for enabled -tc, by default no prefixes"
-echo -e "noHeaders - by default 1-st line contains headers"
-echo -e ""
-echo -e "test_results_* files content should be in csv format with header and tab separator:"
-echo -e "The 1-st column is the test name"
-echo -e "The 2-st column is the test value"
-echo -e ""
-echo -e "Example:"
-echo -e "Test           Value"
-echo -e "Testname       51.54"
-}
-
-while [ -n "$1" ]
-do
-case "$1" in
-h | --help) usage
-exit 1 ;;
-tc) tc=1
-  shift
-  break  ;;
-*) break;;
-esac
-done
-
-if [[ "$#" < "3" ]]; then
-    echo "Error: Invalid arguments"
-    usage
-    exit 1
-fi
-
-curFile=$1
-refFile=$2
-resFile=$3
-testNamePrefix=$4
-noHeaders=$5
-echo $curFile
-echo $refFile
-echo $resFile
-
-curValues=`cat "$curFile" | cut -f 2 | tr -d '\t'`
-if [ -z $noHeaders ]; then
-  curValuesHeader=`echo "$curValues" | head -n +1`_cur
-  header=`cat "$refFile" | head -n +1 | awk -F'\t' -v x=$curValuesHeader '{print "  "$1"\t"$2"_ref\t"x"\tratio"}'`
-  testContent=`paste -d '\t' $refFile <(echo "$curValues") | tail -n +2`
-else
-  testContent=`paste -d '\t' $refFile <(echo "$curValues") | tail -n +1`
-fi
-
-testContent=`echo "$testContent" | tr "," "." | awk -F'\t' '{
-  if ($3>$2+$2*0.1) {
-    print "* "$1"\t"$2"\t"$3"\t"(($2>0)?$3/$2:"-")
-  } else {
-    print "  "$1"\t"$2"\t"$3"\t"(($2>0)?$3/$2:"-")
-  }
-}'`
-if [ -z $noHeaders ]; then
-  echo "$header" > $resFile
-fi
-echo "$testContent" >> $resFile
-cat "$resFile" | tr '\t' ';' | column -t -s ';' | tee $resFile
-
-if [ -z $tc ]; then
-exit 0
-fi
-
-failed=0
-echo "$testContent" 2>&1 | (
-    while read -r s; do
-        testname=`echo "$s" | cut -f 1 | tr -d "[:space:]" |  tr -d "*"`
-        duration=`echo "$s" | cut -f 3`
-        echo "$s" | cut -c1 | grep -c "*" && failed=1
-        echo \#\#teamcity[testStarted name=\'$testNamePrefix$testname\']
-        echo "===>$s"
-        echo \#\#teamcity[buildStatisticValue key=\'$testNamePrefix$testname\' value=\'$duration\']
-        [ $failed -eq 1 ] && echo \#\#teamcity[testFailed name=\'$testNamePrefix$testname\' message=\'$s\']
-        echo \#\#teamcity[testFinished name=\'$testNamePrefix$testname\' duration=\'$duration\']
-        failed=0
-    done
-)
--- a/jb/project/tools/windows/scripts/mkimages_aarch64.sh
+++ b/jb/project/tools/windows/scripts/mkimages_aarch64.sh
@@ -1,155 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
-#
-# This script makes test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
-#
-# Environment variables:
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
-#               to configure
-#               By default JDK_BUILD_NUMBER is set zero
-#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
-#               By default JCEF binaries should be located in ./jcef_win_aarch64
-
-if [ -z "$BUILD_JDK" ]; then
-  echo "BUILD_JDK environment variable must be specified and point to a JDK built from the current sources" \
-       " and is able to run on the build system. See OpenJDK documentation for --with-build-jdk for more info."
-  exit 1
-fi
-
-source jb/project/tools/common/scripts/common.sh
-
-WORK_DIR=$(pwd)
-JCEF_PATH=${JCEF_PATH:=$WORK_DIR/jcef_win_aarch64}
-NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
-
-function do_configure {
-  sh ./configure \
-    --enable-option-checking=fatal \
-    --openjdk-target=aarch64-unknown-cygwin \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=$JDK_BUILD_NUMBER \
-    --with-version-opt=b${build_number} \
-    --with-toolchain-version=$TOOLCHAIN_VERSION \
-    --with-boot-jdk=$BOOT_JDK \
-    --with-build-jdk=$BUILD_JDK \
-    --with-nvdacontrollerclient=$NVDA_PATH \
-    --disable-ccache \
-    --enable-cds=yes \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $STATIC_CONF_ARGS \
-    $REPRODUCIBLE_BUILD_OPTS \
-    || do_exit $?
-}
-
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
-
-  fastdebug_infix=''
-
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
-
-  echo Running jlink ...
-  ${BUILD_JDK}/bin/jlink \
-    --module-path $__modules_path --no-man-pages --compress=2 \
-    --add-modules $__modules --output $__root_dir || do_exit $?
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
-    mv release $__root_dir/release
-    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
-    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
-      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
-    done
-    copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
-  fi
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=windows-aarch64-server-release
-
-case "$bundle_type" in
-  "jcef")
-    do_reset_changes=0
-    do_maketest=1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    ;;
-  "fd")
-    do_reset_changes=0
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=windows-aarch64-server-fastdebug
-    ;;
-esac
-
-if [ -z "${INC_BUILD:-}" ]; then
-  do_configure || do_exit $?
-  if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME clean || 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 clean || do_exit $?
-    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
-  fi
-else
-  if [ $do_maketest -eq 1 ]; then
-    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
-fi
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
-JBRSDK_BUNDLE=jbrsdk
-
-where cygpath
-if [ $? -eq 0 ]; then
-  JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
-fi
-
-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 "$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}"
-else
-  jbr_name_postfix=""
-fi
-
-# create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
-modules+=",jdk.crypto.mscapi"
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
-
-# 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" == "$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 $?
-
-do_exit 0
--- a/jb/project/tools/windows/scripts/mkimages_x64.sh
+++ b/jb/project/tools/windows/scripts/mkimages_x64.sh
@@ -1,148 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
-#
-# This script makes test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
-#
-# Environment variables:
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
-#               to configure
-#               By default JDK_BUILD_NUMBER is set zero
-#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
-#               By default JCEF binaries should be located in ./jcef_win_x64
-
-source jb/project/tools/common/scripts/common.sh
-
-WORK_DIR=$(pwd)
-JCEF_PATH=${JCEF_PATH:=$WORK_DIR/jcef_win_x64}
-NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
-
-function do_configure {
-  sh ./configure \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=$JDK_BUILD_NUMBER \
-    --with-version-opt=b${build_number} \
-    --with-toolchain-version=$TOOLCHAIN_VERSION \
-    --with-boot-jdk=$BOOT_JDK \
-    --with-nvdacontrollerclient=$NVDA_PATH \
-    --disable-ccache \
-    --enable-cds=yes \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $STATIC_CONF_ARGS \
-    $REPRODUCIBLE_BUILD_OPTS \
-    || do_exit $?
-}
-
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
-
-  fastdebug_infix=''
-  __cds_opt=''
-  __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}
-
-  echo Running jlink ...
-  ${JSDK}/bin/jlink \
-    --module-path $__modules_path --no-man-pages --compress=2 \
-    $__cds_opt --add-modules $__modules --output $__root_dir || do_exit $?
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
-    mv release $__root_dir/release
-    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
-    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
-      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
-    done
-    copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
-  fi
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=windows-x86_64-server-release
-
-case "$bundle_type" in
-  "jcef")
-    do_reset_changes=0
-    do_maketest=1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    ;;
-  "fd")
-    do_reset_changes=0
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=windows-x86_64-server-fastdebug
-    ;;
-esac
-
-if [ -z "${INC_BUILD:-}" ]; then
-  do_configure || do_exit $?
-  if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME clean || 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 clean || do_exit $?
-    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
-  fi
-else
-  if [ $do_maketest -eq 1 ]; then
-    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
-fi
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
-JBRSDK_BUNDLE=jbrsdk
-
-where cygpath
-if [ $? -eq 0 ]; then
-  JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
-fi
-
-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 unchanged
-    cat $JCEF_PATH/jcef.version >> $JSDK/release
-  fi
-  jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
-fi
-
-# create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
-modules+=",jdk.crypto.mscapi"
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
-
-# 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" == "$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 $?
-
-do_exit 0
--- a/jb/project/tools/windows/scripts/mkimages_x86.sh
+++ b/jb/project/tools/windows/scripts/mkimages_x86.sh
@@ -1,138 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-
-source jb/project/tools/common/scripts/common.sh
-
-WORK_DIR=$(pwd)
-NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
-
-
-function do_configure {
-  sh ./configure \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=$JDK_BUILD_NUMBER \
-    --with-version-opt=b${build_number} \
-    --with-toolchain-version=$TOOLCHAIN_VERSION \
-    --with-boot-jdk=$BOOT_JDK \
-    --with-nvdacontrollerclient=$NVDA_PATH \
-    --disable-ccache \
-    --enable-cds=yes \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $STATIC_CONF_ARGS \
-    $REPRODUCIBLE_BUILD_OPTS \
-    || do_exit $?
-}
-
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
-
-  fastdebug_infix=''
-  __cds_opt=''
-  __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}
-
-  echo Running jlink ...
-  ${JSDK}/bin/jlink \
-    --module-path $__modules_path --no-man-pages --compress=2 \
-    $__cds_opt --add-modules $__modules --output $__root_dir || do_exit $?
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
-    mv release $__root_dir/release
-    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
-    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
-      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
-    done
-    copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
-  fi
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=windows-x86_64-server-release
-
-case "$bundle_type" in
-  "jcef")
-    echo "not implemented" && do_exit 1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    ;;
-  "fd")
-    do_reset_changes=0
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=windows-x86_64-server-fastdebug
-    ;;
-esac
-
-if [ -z "${INC_BUILD:-}" ]; then
-  do_configure || do_exit $?
-  if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME clean || 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 clean || do_exit $?
-    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_VERSION=TEST || do_exit $?
-  else
-    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
-  fi
-fi
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
-JBRSDK_BUNDLE=jbrsdk
-
-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 unchanged
-  fi
-
-  jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
-fi
-
-# create runtime image bundle
-modules=$(grep -v "jdk.internal.vm" jb/project/tools/common/modules.list | xargs | sed s/" "//g) || do_exit $?
-modules+=",jdk.crypto.mscapi"
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
-
-# 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
-  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 $?
-
-do_exit 0
--- a/jb/project/tools/windows/scripts/pack_aarch64.sh
+++ b/jb/project/tools/windows/scripts/pack_aarch64.sh
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
-#
-# This script packs test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
-#
-
-source jb/project/tools/common/scripts/common.sh
-
-[ "$bundle_type" == "jcef" ] && do_maketest=1
-
-function pack_jbr {
-  __bundle_name=$1
-  __arch_name=$2
-
-  fastdebug_infix=''
-
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
-  __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=""
-
-JBRSDK_BUNDLE=jbrsdk
-RELEASE_NAME=windows-aarch64-server-release
-IMAGES_DIR=build/$RELEASE_NAME/images
-BASE_DIR=.
-
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
-  jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
-fi
-
-pack_jbr jbr${jbr_name_postfix} jbr
-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
-  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
--- a/jb/project/tools/windows/scripts/pack_x64.sh
+++ b/jb/project/tools/windows/scripts/pack_x64.sh
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
-#
-# This script packs test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
-#
-
-source jb/project/tools/common/scripts/common.sh
-
-[ "$bundle_type" == "jcef" ] && do_maketest=1
-
-function pack_jbr {
-  __bundle_name=$1
-  __arch_name=$2
-
-  fastdebug_infix=''
-
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${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=""
-
-JBRSDK_BUNDLE=jbrsdk
-RELEASE_NAME=windows-x86_64-server-release
-IMAGES_DIR=build/$RELEASE_NAME/images
-BASE_DIR=.
-
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
-  jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
-fi
-
-pack_jbr jbr${jbr_name_postfix} jbr
-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
-  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
--- a/jb/project/tools/windows/scripts/pack_x86.sh
+++ b/jb/project/tools/windows/scripts/pack_x86.sh
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               fd - the fastdebug bundles which also include the jcef module
-#
-
-source jb/project/tools/common/scripts/common.sh
-
-[ "$bundle_type" == "jcef" ] && echo "not implemented" && do_exit 1
-
-function pack_jbr {
-  __bundle_name=$1
-  __arch_name=$2
-
-  fastdebug_infix=''
-
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${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=""
-
-JBRSDK_BUNDLE=jbrsdk
-RELEASE_NAME=windows-x86_64-server-release
-IMAGES_DIR=build/$RELEASE_NAME/images
-BASE_DIR=.
-
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
-  jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
-fi
-
-pack_jbr jbr${jbr_name_postfix} jbr
-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
-  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
--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, 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
@@ -23,9 +23,10 @@
 # questions.
 #

-include MakeFileStart.gmk
+default: all

-################################################################################
+include $(SPEC)
+include MakeBase.gmk

 include CopyFiles.gmk
 include MakeIO.gmk
@@ -42,6 +43,8 @@ ifeq ($(call isBuildOs, windows), true)
  TAR_IGNORE_EXIT_VALUE := || test "$$$$?" = "1"
 endif

+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
 ################################################################################
 # BUNDLE : Name of bundle to create
 # FILES : Files in BASE_DIRS to add to bundle
@@ -174,11 +177,9 @@ else
  JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
  JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
  JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
-  STATIC_JDK_BUNDLE_SUBDIR := static-jdk-$(VERSION_NUMBER)
  ifneq ($(DEBUG_LEVEL), release)
    JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
    JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
-    STATIC_JDK_BUNDLE_SUBDIR := $(STATIC_JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
  endif
  # In certain situations, the JDK_IMAGE_DIR points to an image without the
  # the symbols and demos. If so, the symobls and demos can be found in a
@@ -244,10 +245,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
      )

  JDK_SYMBOLS_BUNDLE_FILES := \
-      $(filter-out \
-          %.stripped.pdb, \
-          $(call FindFiles, $(SYMBOLS_IMAGE_DIR)) \
-      )
+      $(call FindFiles, $(SYMBOLS_IMAGE_DIR))

  TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \
      $(ALL_JDK_DEMOS_FILES))
@@ -286,7 +284,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
  ifeq ($(MACOSX_CODESIGN_MODE), hardened)
    # Macosx release build and code signing available.

-    ############################################################################
+    ################################################################################
    # JDK bundle
    $(eval $(call SetupCopyFiles, CREATE_JDK_BUNDLE_DIR_SIGNED, \
        SRC := $(JDK_IMAGE_DIR), \
@@ -301,7 +299,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
 	$(call LogWarn, Signing $(JDK_BUNDLE_NAME))
 	$(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" \
 	    --timestamp --options runtime --deep --force \
-	    $(JDK_MACOSX_BUNDLE_DIR_SIGNED)/$(JDK_MACOSX_BUNDLE_TOP_SUBDIR) $(LOG_DEBUG)
+	    $(JDK_MACOSX_BUNDLE_DIR_SIGNED)/$(JDK_MACOSX_BUNDLE_TOP_DIR) $(LOG_DEBUG)
 	$(TOUCH) $@

    $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
@@ -315,7 +313,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )

    PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)

-    ############################################################################
+    ################################################################################
    # JRE bundle
    $(eval $(call SetupCopyFiles, CREATE_JRE_BUNDLE_DIR_SIGNED, \
        SRC := $(JRE_IMAGE_DIR), \
@@ -330,7 +328,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
 	$(call LogWarn, Signing $(JRE_BUNDLE_NAME))
 	$(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" \
 	    --timestamp --options runtime --deep --force \
-	    $(JRE_MACOSX_BUNDLE_DIR_SIGNED)/$(JRE_MACOSX_BUNDLE_TOP_SUBDIR) $(LOG_DEBUG)
+	    $(JRE_MACOSX_BUNDLE_DIR_SIGNED)/$(JRE_MACOSX_BUNDLE_TOP_DIR) $(LOG_DEBUG)
 	$(TOUCH) $@

    $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
@@ -502,20 +500,10 @@ ifneq ($(filter static-libs-graal-bundles, $(MAKECMDGOALS)), )
  STATIC_LIBS_GRAAL_TARGETS += $(BUILD_STATIC_LIBS_GRAAL_BUNDLE)
 endif

-#################################################################################
+################################################################################

-ifneq ($(filter static-jdk-bundles, $(MAKECMDGOALS)), )
-  STATIC_JDK_BUNDLE_FILES := $(call FindFiles, $(STATIC_JDK_IMAGE_DIR))
-
-  $(eval $(call SetupBundleFile, BUILD_STATIC_JDK_BUNDLE, \
-      BUNDLE_NAME := $(STATIC_JDK_BUNDLE_NAME), \
-      FILES := $(STATIC_JDK_BUNDLE_FILES), \
-      BASE_DIRS := $(STATIC_JDK_IMAGE_DIR), \
-      SUBDIR := $(STATIC_JDK_BUNDLE_SUBDIR), \
-  ))
-
-  STATIC_JDK_TARGETS += $(BUILD_STATIC_JDK_BUNDLE)
-endif
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Bundles.gmk))

 ################################################################################

@@ -527,13 +515,8 @@ docs-javase-bundles: $(DOCS_JAVASE_TARGETS)
 docs-reference-bundles: $(DOCS_REFERENCE_TARGETS)
 static-libs-bundles: $(STATIC_LIBS_TARGETS)
 static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_TARGETS)
-static-jdk-bundles: $(STATIC_JDK_TARGETS)
 jcov-bundles: $(JCOV_TARGETS)

-.PHONY: product-bundles test-bundles \
+.PHONY: all default product-bundles test-bundles \
    docs-jdk-bundles docs-javase-bundles docs-reference-bundles \
-    static-libs-bundles static-libs-graal-bundles static-jdk-bundles jcov-bundles
-
-################################################################################
-
-include MakeFileEnd.gmk
+    static-libs-bundles static-libs-graal-bundles jcov-bundles
--- a/make/CompileCommands.gmk
+++ b/make/CompileCommands.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, 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
@@ -23,9 +23,10 @@
 # questions.
 #

-include MakeFileStart.gmk
+default: all

-################################################################################
+include $(SPEC)
+include MakeBase.gmk

 # When FIXPATH is set, let it process the file to make sure all paths are usable
 # by system native tools. The FIXPATH tool assumes arguments preceded by an @
@@ -49,6 +50,6 @@ $(OUTPUTDIR)/compile_commands.json: $(wildcard $(MAKESUPPORT_OUTPUTDIR)/compile-

 TARGETS += $(OUTPUTDIR)/compile_commands.json

-################################################################################
+all: $(TARGETS)

-include MakeFileEnd.gmk
+.PHONY: all
--- a/make/CompileDemos.gmk
+++ b/make/CompileDemos.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,17 +23,23 @@
 # questions.
 #

-include MakeFileStart.gmk
-
 ################################################################################
 # Build demos for the JDK into $(SUPPORT_OUTPUTDIR)/demos/image.
 ################################################################################

+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
 include CopyFiles.gmk
 include JavaCompilation.gmk
 include TextFileProcessing.gmk
 include ZipArchive.gmk

+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, CompileDemos-pre.gmk))
+
 # Prepare the find cache.
 DEMO_SRC_DIRS += $(TOPDIR)/src/demo

@@ -126,19 +132,12 @@ define SetupBuildDemoBody
        JARMAIN := $$($1_MAIN_CLASS), \
        MANIFEST := $(DEMO_MANIFEST), \
        EXTRA_MANIFEST_ATTR := $$($1_EXTRA_MANIFEST_ATTR), \
+        SRCZIP := $(SUPPORT_OUTPUTDIR)/demos/image/$$($1_DEMO_SUBDIR)/$1/src.zip, \
        EXCLUDE_FILES := $$($1_EXCLUDE_FILES), \
        DISABLED_WARNINGS := $$($1_DISABLED_WARNINGS), \
    ))

    $1 += $$(BUILD_DEMO_$1)
-
-    $$(eval $$(call SetupZipArchive, ZIP_SRC_DEMO_$1, \
-        SRC := $$($1_MAIN_SRC) $$($1_EXTRA_SRC_DIR), \
-        ZIP := $(SUPPORT_OUTPUTDIR)/demos/image/$$($1_DEMO_SUBDIR)/$1/src.zip, \
-        EXCLUDE_FILES := $$($1_EXCLUDE_FILES), \
-    ))
-
-    $1 += $$(ZIP_SRC_DEMO_$1)
  endif

  # Copy files. Sort is needed to remove duplicates.
@@ -258,8 +257,11 @@ ifneq ($(filter images, $(MAKECMDGOALS)), )
  IMAGES_TARGETS := $(COPY_TO_TEST_IMAGE)
 endif

+################################################################################
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, CompileDemos-post.gmk))
+
+all: $(TARGETS)
 images: $(IMAGES_TARGETS)

-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: all
--- a/make/CompileInterimLangtools.gmk
+++ b/make/CompileInterimLangtools.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, 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
@@ -23,9 +23,11 @@
 # questions.
 #

-include MakeFileStart.gmk
+# This must be the first rule
+default: all

-################################################################################
+include $(SPEC)
+include MakeBase.gmk

 include CopyFiles.gmk
 include JavaCompilation.gmk
@@ -63,7 +65,7 @@ $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.ja
 	$(SED) $(INTERIM_TOOL_PROVIDER_PATTERN) $< > $@

 java.compiler.interim_EXTRA_FILES := \
-    $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java
+     $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java

 TARGETS += $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java

@@ -95,16 +97,14 @@ define SetupInterimModule
      SRC := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim \
          $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$1) \
          $(TOPDIR)/src/$1/share/classes, \
-      EXCLUDES := sun, \
+      EXCLUDES := sun javax/tools/snippet-files, \
      EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
          $(TOPDIR)/src/$1/share/classes/javax/tools/ToolProvider.java \
          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/Main.java \
-          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryClassLoader.java \
          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryContext.java \
          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java \
          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java \
          Standard.java, \
-      EXCLUDE_PATTERNS := -files, \
      EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java \
          $($1.interim_EXTRA_FILES), \
      COPY := .gif .png .xml .css .svg .js .js.template .txt .woff .woff2 javax.tools.JavaCompilerTool, \
@@ -148,4 +148,5 @@ TARGETS += $(BUILD_JAVAC_SERVER)

 ################################################################################

-include MakeFileEnd.gmk
+
+all: $(TARGETS)
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, 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
@@ -23,12 +23,13 @@
 # questions.
 #

-include MakeFileStart.gmk
+# This must be the first rule
+default: all

-################################################################################
-
-include JavaCompilation.gmk
+include $(SPEC)
+include MakeBase.gmk
 include Modules.gmk
+include JavaCompilation.gmk

 ################################################################################
 # If this is an imported module that has prebuilt classes, only compile
@@ -74,26 +75,18 @@ $(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.pr

 CreateHkTargets = \
    $(call FilterExcludedTranslations, \
-        $(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
-            $(subst /share/classes,, \
-                $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \
-            ) \
-        ), \
-        .properties \
+       $(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
+         $(subst /share/classes,, \
+            $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \
+         ) \
+       ), \
+       .properties \
    )

 ################################################################################
 # Include module specific build settings

-THIS_SNIPPET := $(call GetModuleSnippetName, Java)
-
-ifneq ($(wildcard $(THIS_SNIPPET)), )
-  include MakeSnippetStart.gmk
-
-  include $(THIS_SNIPPET)
-
-  include MakeSnippetEnd.gmk
-endif
+-include Java.gmk

 ################################################################################
 # Setup the main compilation
@@ -107,16 +100,13 @@ $(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), \
    DISABLED_WARNINGS := $(DISABLED_WARNINGS_java), \
    EXCLUDES := $(EXCLUDES), \
    EXCLUDE_FILES := $(EXCLUDE_FILES), \
-    EXCLUDE_PATTERNS := -files, \
    KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
-    TARGET_RELEASE := $(TARGET_RELEASE), \
    JAVAC_FLAGS := \
        $(DOCLINT) \
        $(JAVAC_FLAGS) \
@@ -158,4 +148,6 @@ endif

 ################################################################################

-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all
--- a/make/CompileModuleTools.gmk
+++ b/make/CompileModuleTools.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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
@@ -23,12 +23,14 @@
 # questions.
 #

-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk

 ################################################################################

-include JavaCompilation.gmk
-
 TOOLS_CLASSES_DIR := $(BUILDTOOLS_OUTPUTDIR)/tools_jigsaw_classes

 # When using an external BUILDJDK, make it possible to shortcut building of
@@ -62,4 +64,4 @@ TARGETS += $(BUILD_JIGSAW_TOOLS)

 ################################################################################

-include MakeFileEnd.gmk
+all: $(TARGETS)
--- a/make/CompileToolsHotspot.gmk
+++ b/make/CompileToolsHotspot.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, 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
@@ -23,12 +23,19 @@
 # questions.
 #

-include MakeFileStart.gmk
+# This must be the first rule
+default: all

-################################################################################
+include $(SPEC)
+include MakeBase.gmk

 include JavaCompilation.gmk

+TARGETS :=
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, hotspot/CompileTools.gmk))
+
 ################################################################################
 # Build tools needed for the JFR source code generation

@@ -44,6 +51,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_HOTSPOT, \

 TARGETS += $(BUILD_TOOLS_HOTSPOT)

-################################################################################

-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, 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
@@ -23,14 +23,21 @@
 # questions.
 #

-include MakeFileStart.gmk
+default: all

-################################################################################
+include $(SPEC)
+include MakeBase.gmk

 include CopyFiles.gmk
 include JavaCompilation.gmk
 include TextFileProcessing.gmk

+################################################################################
+
+$(eval $(call IncludeCustomExtension, CompileTools.gmk))
+
+################################################################################
+
 # Use += to be able to add to this from a custom extension
 BUILD_TOOLS_SRC_DIRS += \
    $(TOPDIR)/make/jdk/src/classes \
@@ -45,7 +52,8 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
        build/tools/deps \
        build/tools/docs \
        build/tools/jigsaw \
-        build/tools/depend, \
+        build/tools/depend \
+        , \
    BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
    DISABLED_WARNINGS := dangling-doc-comments options, \
    JAVAC_FLAGS := \
@@ -58,19 +66,17 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \

 TARGETS += $(BUILD_TOOLS_JDK)

-$(eval $(call SetupCopyFiles, COPY_NIMBUS_TEMPLATES, \
+$(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \
    SRC := $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus, \
    DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources, \
-    FILES := $(wildcard $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template), \
-))
+    FILES := $(wildcard $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template)))

 TARGETS += $(COPY_NIMBUS_TEMPLATES)

-$(eval $(call SetupCopyFiles, COPY_CLDRCONVERTER_PROPERTIES, \
+$(eval $(call SetupCopyFiles,COPY_CLDRCONVERTER_PROPERTIES, \
    SRC := $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter, \
    DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/cldrconverter, \
-    FILES := $(wildcard $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter/*.properties), \
-))
+    FILES := $(wildcard $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter/*.properties)))

 TARGETS += $(COPY_CLDRCONVERTER_PROPERTIES)

@@ -80,7 +86,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
    TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
    SRC := $(TOPDIR)/make/jdk/src/classes, \
    INCLUDES := build/tools/depend, \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/plugins, \
+    BIN := $(BUILDTOOLS_OUTPUTDIR)/depend, \
    DISABLED_WARNINGS := options, \
    JAVAC_FLAGS := \
        --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
@@ -93,21 +99,13 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
        --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim, \
 ))

-$(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 := $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services/com.sun.source.util.Plugin

-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)
+$(DEPEND_SERVICE_PROVIDER):
+	$(call MakeDir, $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services)
 	$(ECHO) build.tools.depend.Depend > $@
-	$(ECHO) build.tools.jbrapi.JBRApiPlugin >> $@

-TARGETS += $(COMPILE_DEPEND) $(COMPILE_JBR_API_PLUGIN) $(PLUGINS_SERVICE_PROVIDER)
+TARGETS += $(COMPILE_DEPEND) $(DEPEND_SERVICE_PROVIDER)

 ################################################################################

@@ -161,6 +159,4 @@ ifeq ($(ENABLE_PANDOC), true)
  TARGETS += $(PANDOC_HTML_MANPAGE_FILTER_SETUP)
 endif

-################################################################################
-
-include MakeFileEnd.gmk
+all: $(TARGETS)
--- a/make/CopyImportModules.gmk
+++ b/make/CopyImportModules.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, 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
@@ -23,12 +23,13 @@
 # questions.
 #

-include MakeFileStart.gmk
-
-################################################################################
 # This makefile is called for every imported module to copy the non class
 # contents into the exploded jdk image.
-################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk

 include CopyFiles.gmk

@@ -102,6 +103,4 @@ ifneq ($(CONF_DIR), )
  TARGETS += $(COPY_CONF)
 endif

-################################################################################
-
-include MakeFileEnd.gmk
+all: $(TARGETS)
--- a/make/CopyInterimTZDB.gmk
+++ b/make/CopyInterimTZDB.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 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
@@ -23,12 +23,15 @@
 # questions.
 #

-include MakeFileStart.gmk
+default: all

-################################################################################
+include $(SPEC)
+include MakeBase.gmk

 include CopyFiles.gmk

+##########################################################################################
+
 ### TZDB tool needs files from java.time.zone package

 define tzdb_copyfiles
@@ -38,17 +41,12 @@ define tzdb_copyfiles
        < $(<) > $@
 endef

-$(eval $(call SetupCopyFiles, COPY_INTERIM_TZDB, \
+$(eval $(call SetupCopyFiles,COPY_INTERIM_TZDB, \
    SRC := $(TOPDIR)/src/java.base/share/classes/java/time/zone, \
    DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_tzdb_classes/build/tools/tzdb, \
    FILES := ZoneRules.java ZoneOffsetTransition.java ZoneOffsetTransitionRule.java Ser.java, \
-    MACRO := tzdb_copyfiles, \
-))
+    MACRO := tzdb_copyfiles))

-################################################################################
+##########################################################################################

 all: $(COPY_INTERIM_TZDB)
-
-################################################################################
-
-include MakeFileEnd.gmk
--- a/Show More
+++ b/Show More