JBR-5194 move jbr-api.jar into test artefact

.github/README.md

@@ -0,0 +1,196 @@
+[![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 includes a number of enhancements in font rendering, ligatures, HiDPI support, windowing/focus subsystems, performance improvements, and bugfixes.
+
+> **_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:
+ * [jbr11](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr11) (JDK 11)
+ * [jbr17](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr17) (JDK 17)
+ 
+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 17
+
+| IDE Version | Latest JBR                                                                                             | Date Released |
+|-------------|--------------------------------------------------------------------------------------------------------|---------------|
+| 2023.1      | [17.0.6-b829.1](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b829.1)   | 14-Feb-2023   |
+| 2022.3      | [17.0.6-b653.32](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b653.32) | 14-Feb-2023   |
+| 2022.2      | [17.0.5-b469.71](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.5b469.71) | 14-Nov-2022   |
+
+## 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   |
+
+## Contents
+- [Welcome to JetBrains Runtime](#welcome-to-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)
+
+## 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)
+Create a container:
+```
+$ cd jb/project/docker
+$ docker build .
+...
+Successfully built 942ea9900054
+```
+Run these commands in the new container:
+```
+$ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
+# cd /JetBrainsRuntime
+# sh ./configure
+# make images CONF=linux-x86_64-normal-server-release
+```
+
+### 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
+```
+Get Java 18 (for instance, [Azul Zulu Builds of OpenJDK 18](https://www.azul.com/downloads/?version=java-18-sts&os=linux&package=jdk)).
+
+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 18 (for instance, [Azul Zulu Builds of OpenJDK 18](https://www.azul.com/downloads/?version=java-18-sts&os=windows&package=jdk)).
+  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/`.
+
+### macOS
+Install the following:
+* Xcode command line developer tools and `autoconf` via [Homebrew](https://brew.sh/).
+* Java 18 (for instance, [Azul Zulu Builds of OpenJDK 18](https://www.azul.com/downloads/?version=java-18-sts&os=macos&package=jdk)).
+
+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
+We are happy to receive your pull requests! 
+Before you submit one, please sign our [Contributor License Agreement (CLA)](https://www.jetbrains.com/agreements/cla/).
+
+## 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/).

.github/workflows/main.yml

@@ -26,6 +26,10 @@
 name: 'OpenJDK GHA Sanity Checks'
 
 on:
+  push:
+    branches-ignore:
+      - master
+      - pr/*
   workflow_dispatch:
     inputs:
       platforms:
@@ -55,8 +59,7 @@ jobs:
     outputs:
       linux-x64: ${{ steps.include.outputs.linux-x64 }}
       linux-x86: ${{ steps.include.outputs.linux-x86 }}
-      # additional build options for linux-x64 are disabled
-      # linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
+      linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
       linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
       macos-x64: ${{ steps.include.outputs.macos-x64 }}
       macos-aarch64: ${{ steps.include.outputs.macos-aarch64 }}

.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

.github/workflows/test.yml

@@ -64,7 +64,6 @@ jobs:
           - 'hs/tier1 gc'
           - 'hs/tier1 runtime'
           - 'hs/tier1 serviceability'
-          - 'lib-test/tier1'
 
         include:
           - test-name: 'jdk/tier1 part 1'
@@ -99,10 +98,6 @@ jobs:
             test-suite: 'test/hotspot/jtreg/:tier1_serviceability'
             debug-suffix: -debug
 
-          - test-name: 'lib-test/tier1'
-            test-suite: 'test/lib-test/:tier1'
-            debug-suffix: -debug
-
     steps:
       - name: 'Checkout the JDK source'
         uses: actions/checkout@v3

.gitignore

@@ -18,8 +18,5 @@ NashornProfile.txt
 /src/utils/LogCompilation/target/
 /.project/
 /.settings/
-/.project
-/.classpath
-/.cproject
-/compile_commands.json
-/.cache
+*.class
+.idea/workspace.xml

README.md

@@ -1,216 +1,14 @@
 [![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 
-# Welcome to JetBrains Runtime!
+# Welcome to the JDK!
 
-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.
+For build instructions please see the
+[online documentation](https://openjdk.org/groups/build/doc/building.html),
+or either of these files:
 
-> **_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:
- * [jbr11](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr11) (JDK 11)
- * [jbr17](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr17) (JDK 17)
- 
-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).
+- [doc/building.html](doc/building.html) (html version)
+- [doc/building.md](doc/building.md) (markdown version)
 
-## Releases based on JDK 17
-
-| IDE Version | Latest JBR                                                                                             | Date Released |
-|-------------|--------------------------------------------------------------------------------------------------------|---------------|
-| 2023.1      | [17.0.6-b829.5](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b829.5)   | 01-Mar-2023   |
-| 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   |
-
-## 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.
-
-## 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
-cd JetBrainsRuntime
-git checkout jbr21
-```
-
-### Windows
-<a name="sources-windows"></a>
-```
-git config --global core.autocrlf false
-git clone git@github.com:JetBrains/JetBrainsRuntime.git
-cd JetBrainsRuntime
-git checkout jbr21
-```
-
-## 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)
-Create a container:
-```
-$ cd jb/project/docker
-$ docker build .
-...
-Successfully built 942ea9900054
-```
-Run these commands in the new container:
-```
-$ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
-# cd /JetBrainsRuntime
-# sh ./configure
-# make images CONF=linux-x86_64-normal-server-release
-```
-
-### 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
-```
-Get Java 19 (for instance, [Azul Zulu Builds of OpenJDK 19](https://www.azul.com/downloads/?version=java-19-sts&os=linux&package=jdk)).
-
-Then run the following:
-```
-$ cd JetBrainsRuntime
-$ git checkout main
-$ sh ./configure
-$ make images
-```
-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 19 (for instance, [Azul Zulu Builds of OpenJDK 19](https://www.azul.com/downloads/?version=java-19-sts&os=windows&package=jdk)).
-  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/`.
-
-### macOS
-Install the following:
-* Xcode command line developer tools and `autoconf` via [Homebrew](https://brew.sh/).
-* Java 19 (for instance, [Azul Zulu Builds of OpenJDK 19](https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk)).
-
-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
-We are happy to receive your pull requests! 
-Before you submit one, please sign our [Contributor License Agreement (CLA)](https://www.jetbrains.com/agreements/cla/).
-
-## 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/).
+See <https://openjdk.org/> for more information about the OpenJDK
+Community and the JDK and see <https://bugs.openjdk.org> for JDK issue
+tracking.

bin/jib.sh

@@ -130,7 +130,7 @@ install_jib() {
     fi
     # Want to check the filetype using file, to see if we got served a HTML error page.
     # This is sensitive to the filename containing a specific string, but good enough.
-    file "${installed_jib_script}.gz" | grep "gzip compressed data" > /dev/null
+    file ${installed_jib_script}.gz | grep "gzip compressed data" > /dev/null
     if [ $? -ne 0 ]; then 
         echo "Warning: ${installed_jib_script}.gz is not a gzip file."
         echo "If you are behind a proxy you may need to configure exceptions using no_proxy."

doc/building.html

@@ -134,8 +134,6 @@ id="toc-cross-compiling-with-debian-sysroots">Cross compiling with
 Debian sysroots</a></li>
 <li><a href="#building-for-armaarch64"
 id="toc-building-for-armaarch64">Building for ARM/aarch64</a></li>
-<li><a href="#building-for-risc-v" id="toc-building-for-risc-v">Building
-for RISC-V</a></li>
 <li><a href="#building-for-musl" id="toc-building-for-musl">Building for
 musl</a></li>
 <li><a href="#verifying-the-build"
@@ -1378,10 +1376,10 @@ No such file or directory cp: cannot stat
 Debian sysroots</h3>
 <p>Fortunately, you can create sysroots for foreign architectures with
 tools provided by your OS. On Debian/Ubuntu systems, one could use
-<code>debootstrap</code> to create the <em>target</em> system chroot,
-which would have the native libraries and headers specific to that
-<em>target</em> system. After that, we can use the cross-compiler on the
-<em>build</em> system, pointing into chroot to get the build
+<code>qemu-deboostrap</code> to create the <em>target</em> system
+chroot, which would have the native libraries and headers specific to
+that <em>target</em> system. After that, we can use the cross-compiler
+on the <em>build</em> system, pointing into chroot to get the build
 dependencies right. This allows building for foreign architectures with
 native compilation speed.</p>
 <p>For example, cross-compiling to AArch64 from x86_64 could be done
@@ -1391,7 +1389,7 @@ like this:</p>
 <code>apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu</code></p></li>
 <li><p>Create chroot on the <em>build</em> system, configuring it for
 <em>target</em> system:
-<code>sudo debootstrap \       --arch=arm64 \       --verbose \       --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev,libffi-dev \       --resolve-deps \       buster \       ~/sysroot-arm64 \       http://httpredir.debian.org/debian/     # If the target architecture is `riscv64`,     # the path should be `debian-ports` instead of `debian`.</code></p></li>
+<code>sudo qemu-debootstrap \       --arch=arm64 \       --verbose \       --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev,libffi-dev \       --resolve-deps \       buster \       ~/sysroot-arm64 \       http://httpredir.debian.org/debian/</code></p></li>
 <li><p>Make sure the symlinks inside the newly created chroot point to
 proper locations:
 <code>sudo chroot ~/sysroot-arm64 symlinks -cr .</code></p></li>
@@ -1518,13 +1516,6 @@ are:</p>
 <td style="text-align: left;">sh4-linux-gnu</td>
 <td>zero</td>
 </tr>
-<tr class="even">
-<td style="text-align: left;">riscv64</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">riscv64</td>
-<td style="text-align: left;">riscv64-linux-gnu</td>
-<td>(all)</td>
-</tr>
 </tbody>
 </table>
 <h3 id="building-for-armaarch64">Building for ARM/aarch64</h3>
@@ -1534,21 +1525,6 @@ profiles are available using <code>--with-abi-profile</code>:
 arm-vfp-sflt, arm-vfp-hflt, arm-sflt, armv5-vfp-sflt, armv6-vfp-hflt.
 Note that soft-float ABIs are no longer properly supported by the
 JDK.</p>
-<h3 id="building-for-risc-v">Building for RISC-V</h3>
-<p>The RISC-V community provides a basic <a
-href="https://github.com/riscv-collab/riscv-gnu-toolchain">GNU compiler
-toolchain</a>, but the <a href="#External-Library-Requirements">external
-libraries</a> required by OpenJDK complicate the building process. The
-placeholder <code>&lt;toolchain-installed-path&gt;</code> shown below is
-the path where you want to install the toolchain.</p>
-<ul>
-<li><p>Install the RISC-V GNU compiler toolchain:
-<code>git clone --recursive https://github.com/riscv-collab/riscv-gnu-toolchain     cd riscv-gnu-toolchain     ./configure --prefix=&lt;toolchain-installed-path&gt;     make linux     export PATH=&lt;toolchain-installed-path&gt;/bin:$PATH</code></p></li>
-<li><p>Cross-compile all the required libraries:
-<code># An example for libffi     git clone https://github.com/libffi/libffi     cd libffi     ./configure --host=riscv64-unknown-linux-gnu --prefix=&lt;toolchain-installed-path&gt;/sysroot/usr     make     make install</code></p></li>
-<li><p>Configure and build OpenJDK:
-<code>bash configure \       --with-boot-jdk=$BOOT_JDK \       --openjdk-target=riscv64-linux-gnu \       --with-sysroot=&lt;toolchain-installed-path&gt;/sysroot \       --with-toolchain-path=&lt;toolchain-installed-path&gt;/bin \       --with-extra-path=&lt;toolchain-installed-path&gt;/bin     make images</code></p></li>
-</ul>
 <h3 id="building-for-musl">Building for musl</h3>
 <p>Just like it's possible to cross-compile for a different CPU, it's
 possible to cross-compile for musl libc on a glibc-based <em>build</em>

doc/building.md

@@ -1147,7 +1147,7 @@ Note that X11 is needed even if you only want to build a headless JDK.
 ### Cross compiling with Debian sysroots
 
 Fortunately, you can create sysroots for foreign architectures with tools
-provided by your OS. On Debian/Ubuntu systems, one could use `debootstrap` to
+provided by your OS. On Debian/Ubuntu systems, one could use `qemu-deboostrap` to
 create the *target* system chroot, which would have the native libraries and headers
 specific to that *target* system. After that, we can use the cross-compiler on the *build*
 system, pointing into chroot to get the build dependencies right. This allows building
@@ -1162,7 +1162,7 @@ For example, cross-compiling to AArch64 from x86_64 could be done like this:
 
   * Create chroot on the *build* system, configuring it for *target* system:
     ```
-    sudo debootstrap \
+    sudo qemu-debootstrap \
       --arch=arm64 \
       --verbose \
       --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev,libffi-dev \
@@ -1170,8 +1170,6 @@ For example, cross-compiling to AArch64 from x86_64 could be done like this:
       buster \
       ~/sysroot-arm64 \
       http://httpredir.debian.org/debian/
-    # If the target architecture is `riscv64`,
-    # the path should be `debian-ports` instead of `debian`.
     ```
 
   * Make sure the symlinks inside the newly created chroot point to proper locations:
@@ -1219,7 +1217,6 @@ Architectures that are known to successfully cross-compile like this are:
   m68k          sid          m68k          m68k-linux-gnu           zero
   alpha         sid          alpha         alpha-linux-gnu          zero
   sh4           sid          sh4           sh4-linux-gnu            zero
-  riscv64       sid          riscv64       riscv64-linux-gnu        (all)
 
 ### Building for ARM/aarch64
 
@@ -1229,44 +1226,6 @@ available using `--with-abi-profile`: arm-vfp-sflt, arm-vfp-hflt, arm-sflt,
 armv5-vfp-sflt, armv6-vfp-hflt. Note that soft-float ABIs are no longer
 properly supported by the JDK.
 
-### Building for RISC-V
-
-The RISC-V community provides a basic
-[GNU compiler toolchain](https://github.com/riscv-collab/riscv-gnu-toolchain),
-but the [external libraries](#External-Library-Requirements) required by OpenJDK
-complicate the building process. The placeholder `<toolchain-installed-path>`
-shown below is the path where you want to install the toolchain.
-
-  * Install the RISC-V GNU compiler toolchain:
-    ```
-    git clone --recursive https://github.com/riscv-collab/riscv-gnu-toolchain
-    cd riscv-gnu-toolchain
-    ./configure --prefix=<toolchain-installed-path>
-    make linux
-    export PATH=<toolchain-installed-path>/bin:$PATH
-    ```
-
-  * Cross-compile all the required libraries:
-    ```
-    # An example for libffi
-    git clone https://github.com/libffi/libffi
-    cd libffi
-    ./configure --host=riscv64-unknown-linux-gnu --prefix=<toolchain-installed-path>/sysroot/usr
-    make
-    make install
-    ```
-
-  * Configure and build OpenJDK:
-    ```
-    bash configure \
-      --with-boot-jdk=$BOOT_JDK \
-      --openjdk-target=riscv64-linux-gnu \
-      --with-sysroot=<toolchain-installed-path>/sysroot \
-      --with-toolchain-path=<toolchain-installed-path>/bin \
-      --with-extra-path=<toolchain-installed-path>/bin
-    make images
-    ```
-
 ### Building for musl
 
 Just like it's possible to cross-compile for a different CPU, it's possible to

doc/hotspot-style.html

@@ -598,17 +598,10 @@ conventions might appear jarring and reduce readability.</p></li>
 <code>std::nothrow</code>, and <code>std::nothrow_t</code>.</li>
 <li><code>#include &lt;limits&gt;</code> to use
 <code>std::numeric_limits</code>.</li>
-<li><code>#include &lt;type_traits&gt;</code> with some restrictions,
-listed below.</li>
+<li><code>#include &lt;type_traits&gt;</code>.</li>
 <li><code>#include &lt;cstddef&gt;</code> to use
 <code>std::nullptr_t</code> and <code>std::max_align_t</code>.</li>
 </ul>
-<p>Certain restrictions apply to the declarations provided by
-<code>&lt;type_traits&gt;</code>.</p>
-<ul>
-<li>The <code>alignof</code> operator should be used rather than
-<code>std::alignment_of&lt;&gt;</code>.</li>
-</ul>
 <p>TODO: Rather than directly #including (permitted) Standard Library
 headers, use a convention of #including wrapper headers (in some
 location like hotspot/shared/stdcpp). This provides a single place for
@@ -1093,8 +1086,6 @@ function name and the parameter list.</li>
 <h3 id="additional-permitted-features">Additional Permitted
 Features</h3>
 <ul>
-<li><p><code>alignof</code> (<a
-href="https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2341.pdf">n2341</a>)</p></li>
 <li><p><code>constexpr</code> (<a
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf">n2235</a>)
 (<a

doc/hotspot-style.md

@@ -572,13 +572,9 @@ There are a few exceptions to this rule.
 
 * `#include <new>` to use placement `new`, `std::nothrow`, and `std::nothrow_t`.
 * `#include <limits>` to use `std::numeric_limits`.
-* `#include <type_traits>` with some restrictions, listed below.
+* `#include <type_traits>`.
 * `#include <cstddef>` to use `std::nullptr_t` and `std::max_align_t`.
 
-Certain restrictions apply to the declarations provided by `<type_traits>`.
-
-* The `alignof` operator should be used rather than `std::alignment_of<>`.
-
 TODO: Rather than directly \#including (permitted) Standard Library
 headers, use a convention of \#including wrapper headers (in some
 location like hotspot/shared/stdcpp).  This provides a single place
@@ -1086,9 +1082,6 @@ The following attributes are expressly forbidden:
 
 ### Additional Permitted Features
 
-* `alignof`
-([n2341](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2341.pdf))
-
 * `constexpr`
 ([n2235](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf))
 ([n3652](https://isocpp.org/files/papers/N3652.html))

doc/ide.html

@@ -79,45 +79,6 @@ native source. After configuring, the project is generated using:</p>
 <code>ide\hotspot-visualstudio</code> subfolder of the build output
 folder. The file can be opened in Visual Studio via
 <code>File -&gt; Open -&gt; Project/Solution</code>.</p>
-<h4 id="eclipse-cdt">Eclipse CDT</h4>
-<p>The make system can generate an Eclipse CDT Workspace that enables
-Eclipse indexing for the C and C++ sources throughout the entire
-codebase, as well as registering all common make targets to be runnable
-from the Eclipse explorer. This can be done after configuring by
-running:</p>
-<pre><code>make eclipse-native-env</code></pre>
-<p>After this is run, simply open and import the workspace in Eclipse
-through
-<code>File -&gt; Import -&gt; Projects from Folder or Archive</code> and
-at <code>Import source</code> click on the directory
-<code>ide\eclipse</code>, which can be found in the build output
-folder.</p>
-<p>If this doesn't work, you can also try
-<code>File -&gt; Import -&gt; Existing Projects into Workspace</code>
-instead.</p>
-<p>Setting up an Eclipse Workspace is relatively lightweight compared to
-other supported IDEs, but requires that your CDT installation has Cross
-GCC support enabled at the moment, even if you aren't cross compiling.
-The Visual C++ compiler is, at present, not supported as an indexer.</p>
-<p>If desired, you can instead request make to only include indexing
-support for just the Java Virtual Machine instead of the entire native
-codebase, by running:</p>
-<pre><code>make eclipse-hotspot-env</code></pre>
-<p>If you think your particular Eclipse installation can handle the
-strain, the make system also supports generating a combined Java and
-C/C++ Workspace for Eclipse which can then conveniently switch between
-Java and C/C++ natures during development by running:</p>
-<pre><code>make eclipse-mixed-env</code></pre>
-<p>Do note that this generates all features that come with both Java and
-C/C++ natures.</p>
-<p>By default, the Eclipse Workspace is located in the ide subdirectory
-in the build output. To share the JDK's source directory with the
-Eclipse Workspace, you can instead run:</p>
-<pre><code>make eclipse-shared-&lt;ENV&gt;-env</code></pre>
-<p>Eclipse support in the JDK is relatively new, so do keep in mind that
-not everything may work at the moment. As such, the resulting Workspace
-also has compilation database parsing support enabled, so you can pass
-Eclipse the compile commands file (see below) if all else fails.</p>
 <h4 id="compilation-database">Compilation Database</h4>
 <p>The make system can generate generic native code indexing support in
 the form of a <a
@@ -144,28 +105,5 @@ select the folder where you ran the above script.</p>
 <p>In order to run the tests from the IDE, you can use the JTReg plugin.
 Instructions for building and using the plugin can be found <a
 href="https://github.com/openjdk/jtreg/tree/master/plugins/idea">here</a>.</p>
-<h4 id="eclipse">Eclipse</h4>
-<p>Eclipse JDT is a widely used Java IDE and has been for a very long
-time, being a popular choice alongside IntelliJ IDEA for Java
-development. Likewise, the JDK now includes support for developing its
-Java sources with Eclipse, which can be achieved by setting up a Java
-Workspace by running:</p>
-<pre><code>make eclipse-java-env</code></pre>
-<p>After the workspace has been generated you can import it in the same
-way as you would with Eclipse CDT:</p>
-<p>Follow
-<code>File -&gt; Import -&gt; Projects from Folder or Archive</code> and
-select the <code>ide\eclipse</code> directory in the build output folder
-to import the newly created Java Workspace.</p>
-<p>If doing so results in an error, you can also import the JDK via
-<code>File -&gt; Import -&gt; Existing Projects into Workspace</code> as
-a last resort.</p>
-<p>Alternatively, if you want a Java Workspace inside the JDK's source
-directory, you can instead run:</p>
-<pre><code>make eclipse-shared-java-env</code></pre>
-<p>As mentioned above for Eclipse CDT, you can create a combined Java
-and C/C++ Workspace which can conveniently switch between Java and C/C++
-natures during development by running:</p>
-<pre><code>make eclipse-mixed-env</code></pre>
 </body>
 </html>

doc/ide.md

@@ -56,63 +56,6 @@ This creates a file named `jvm.vcxproj` in `ide\hotspot-visualstudio`
 subfolder of the build output folder. The file can be opened in Visual Studio
 via `File -> Open -> Project/Solution`.
 
-#### Eclipse CDT
-
-The make system can generate an Eclipse CDT Workspace that enables Eclipse
-indexing for the C and C++ sources throughout the entire codebase, as well as
-registering all common make targets to be runnable from the Eclipse explorer.
-This can be done after configuring by running:
-
-```
-make eclipse-native-env
-```
-
-After this is run, simply open and import the workspace in Eclipse through
-`File -> Import -> Projects from Folder or Archive` and at
-`Import source` click on the directory `ide\eclipse`, which can be
-found in the build output folder.
-
-If this doesn't work, you can also try
-`File -> Import -> Existing Projects into Workspace`
-instead.
-
-Setting up an Eclipse Workspace is relatively lightweight compared to other
-supported IDEs, but requires that your CDT installation has Cross GCC support
-enabled at the moment, even if you aren't cross compiling. The Visual C++
-compiler is, at present, not supported as an indexer.
-
-If desired, you can instead request make to only include indexing support for
-just the Java Virtual Machine instead of the entire native codebase, by running:
-
-```
-make eclipse-hotspot-env
-```
-
-If you think your particular Eclipse installation can handle the strain, the
-make system also supports generating a combined Java and C/C++ Workspace for
-Eclipse which can then conveniently switch between Java and C/C++ natures
-during development by running:
-
-```
-make eclipse-mixed-env
-```
-
-Do note that this generates all features that come with both Java and C/C++
-natures.
-
-By default, the Eclipse Workspace is located in the ide subdirectory in the
-build output. To share the JDK's source directory with the Eclipse Workspace,
-you can instead run:
-
-```
-make eclipse-shared-<ENV>-env
-```
-
-Eclipse support in the JDK is relatively new, so do keep in mind that not
-everything may work at the moment. As such, the resulting Workspace also
-has compilation database parsing support enabled, so you can pass Eclipse
-the compile commands file (see below) if all else fails.
-
 #### Compilation Database
 
 The make system can generate generic native code indexing support in the form of
@@ -153,40 +96,3 @@ as the SDK to use.
 In order to run the tests from the IDE, you can use the JTReg plugin.
 Instructions for building and using the plugin can be found
 [here](https://github.com/openjdk/jtreg/tree/master/plugins/idea).
-
-#### Eclipse
-
-Eclipse JDT is a widely used Java IDE and has been for a very long time, being
-a popular choice alongside IntelliJ IDEA for Java development. Likewise, the
-JDK now includes support for developing its Java sources with Eclipse, which
-can be achieved by setting up a Java Workspace by running:
-
-```
-make eclipse-java-env
-```
-
-After the workspace has been generated you can import it in the same way as
-you would with Eclipse CDT:
-
-Follow `File -> Import -> Projects from Folder or Archive` and select the
-`ide\eclipse` directory in the build output folder to import the newly created
-Java Workspace.
-
-If doing so results in an error, you can also import the JDK via
-`File -> Import -> Existing Projects into Workspace`
-as a last resort.
-
-Alternatively, if you want a Java Workspace inside the JDK's source directory,
-you can instead run:
-
-```
-make eclipse-shared-java-env
-```
-
-As mentioned above for Eclipse CDT, you can create a combined Java and C/C++
-Workspace which can conveniently switch between Java and C/C++ natures during
-development by running:
-
-```
-make eclipse-mixed-env
-```

make/Bundles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2023, 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
@@ -449,7 +449,7 @@ ifneq ($(filter jcov-bundles, $(MAKECMDGOALS)), )
       BUNDLE_NAME := $(JCOV_BUNDLE_NAME), \
       FILES := $(JCOV_BUNDLE_FILES), \
       BASE_DIRS := $(JCOV_IMAGE_DIR), \
-      SUBDIR := jdk-$(VERSION_NUMBER), \
+      SUBDIR := $(JDK_BUNDLE_SUBDIR), \
   ))
 
   JCOV_TARGETS += $(BUILD_JCOV_BUNDLE)

make/CompileDemos.gmk

@@ -171,41 +171,41 @@ $(BUILD_DEMO_CodePointIM_JAR): $(CODEPOINT_METAINF_SERVICE_FILE)
 
 $(eval $(call SetupBuildDemo, FileChooserDemo, \
     DEMO_SUBDIR := jfc, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked, \
 ))
 
 $(eval $(call SetupBuildDemo, SwingSet2, \
     DEMO_SUBDIR := jfc, \
     EXTRA_COPY_TO_JAR := .java, \
     EXTRA_MANIFEST_ATTR := SplashScreen-Image: resources/images/splash.png, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked static serial cast this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked static serial cast, \
 ))
 
 $(eval $(call SetupBuildDemo, Font2DTest, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, J2Ddemo, \
     DEMO_SUBDIR := jfc, \
     MAIN_CLASS := java2d.J2Ddemo, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked cast lossy-conversions this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked cast lossy-conversions, \
     JAR_NAME := J2Ddemo, \
 ))
 
 $(eval $(call SetupBuildDemo, Metalworks, \
-    DISABLED_WARNINGS := rawtypes unchecked this-escape, \
+    DISABLED_WARNINGS := rawtypes unchecked, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, Notepad, \
-    DISABLED_WARNINGS := rawtypes this-escape, \
+    DISABLED_WARNINGS := rawtypes, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, Stylepad, \
     DEMO_SUBDIR := jfc, \
-    DISABLED_WARNINGS := rawtypes unchecked this-escape, \
+    DISABLED_WARNINGS := rawtypes unchecked, \
     EXTRA_SRC_DIR := $(DEMO_SHARE_SRC)/jfc/Notepad, \
     EXCLUDE_FILES := $(DEMO_SHARE_SRC)/jfc/Notepad/README.txt, \
 ))
@@ -215,12 +215,11 @@ $(eval $(call SetupBuildDemo, SampleTree, \
 ))
 
 $(eval $(call SetupBuildDemo, TableExample, \
-    DISABLED_WARNINGS := rawtypes unchecked deprecation this-escape, \
+    DISABLED_WARNINGS := rawtypes unchecked deprecation, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, TransparentRuler, \
-    DISABLED_WARNINGS := this-escape, \
     DEMO_SUBDIR := jfc, \
     MAIN_CLASS := transparentruler.Ruler, \
 ))

make/CompileModuleTools.gmk

@@ -53,7 +53,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JIGSAW_TOOLS, \
                 build/tools/jigsaw, \
     COPY := .properties .html, \
     BIN := $(TOOLS_CLASSES_DIR), \
-    DISABLED_WARNINGS := fallthrough this-escape, \
+    DISABLED_WARNINGS := fallthrough, \
     JAVAC_FLAGS := \
         --add-modules jdk.jdeps \
         --add-exports java.base/jdk.internal.module=ALL-UNNAMED \

make/Docs.gmk

@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -110,17 +110,13 @@ JAVA_WARNINGS_ARE_ERRORS ?= -Werror
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
     -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
-    --enable-preview -source $(JDK_SOURCE_TARGET_VERSION) \
-    --override-methods=summary \
-    --no-external-specs-page
+    --override-methods=summary
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
     -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
-    --enable-preview -source $(JDK_SOURCE_TARGET_VERSION) \
-    -html5 -javafx --expand-requires transitive \
-    --no-external-specs-page
+    -html5 -javafx --expand-requires transitive
 
 # Should we add DRAFT stamps to the generated javadoc?
 ifeq ($(VERSION_IS_GA), true)

make/JBRApi.gmk

@@ -42,7 +42,7 @@ JBR_API_GENSRC_FILES := $(foreach f, $(call FindFiles, $(JBR_API_SRC_DIR)), \
     $(JBR_API_GENSRC_DIR)/$(call RelativePath, $f, $(JBR_API_SRC_DIR)))
 
 ifeq ($(JBR_API_JBR_VERSION),)
-  JBR_API_JBR_VERSION := DEVELOPMENT
+  JBR_API_JBR_VERSION := <DEVELOPMENT>
   JBR_API_FAIL_ON_HASH_MISMATCH := false
 else
   .PHONY: $(JBR_API_VERSION_PROPERTIES)
@@ -90,4 +90,4 @@ ifneq ($(JBR_API_CONF_FILE),)
 	$(ECHO) "SOURCES_JAR=$(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar" >> $(JBR_API_CONF_FILE)
   jbr-api: $(JBR_API_CONF_FILE)
   .PHONY: $(JBR_API_CONF_FILE)
-endif
+endif

make/Main.gmk

@@ -257,46 +257,6 @@ $(eval $(call SetupTarget, hotspot-ide-project, \
     ARGS := -I$(TOPDIR)/make/hotspot, \
 ))
 
-$(eval $(call SetupTarget, eclipse-java-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=java SHARED=false, \
-))
-
-$(eval $(call SetupTarget, eclipse-hotspot-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=hotspot SHARED=false, \
-))
-
-$(eval $(call SetupTarget, eclipse-native-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=native SHARED=false, \
-))
-
-$(eval $(call SetupTarget, eclipse-mixed-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make SHARED=false, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-java-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=java SHARED=true, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-hotspot-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=hotspot SHARED=true, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-native-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=native SHARED=true, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-mixed-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make SHARED=true, \
-))
-
 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
     $(HOTSPOT_VARIANT_LIBS_TARGETS)
 

make/RunTests.gmk

@@ -592,16 +592,7 @@ define SetupRunMicroTestBody
   endif
 
   # Set library path for native dependencies
-  $1_JMH_JVM_ARGS := -Djava.library.path=$$(TEST_IMAGE_DIR)/micro/native \
-        --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.instruction=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.java.lang.constant=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.components=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.impl=ALL-UNNAMED
+  $1_JMH_JVM_ARGS := -Djava.library.path=$$(TEST_IMAGE_DIR)/micro/native
 
   ifneq ($$(MICRO_VM_OPTIONS)$$(MICRO_JAVA_OPTIONS), )
     $1_JMH_JVM_ARGS += $$(MICRO_VM_OPTIONS) $$(MICRO_JAVA_OPTIONS)

make/autoconf/basic.m4

@@ -477,11 +477,7 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
     # df on AIX does not understand -l. On modern AIXes it understands "-T local" which
     # is the same. On older AIXes we just continue to live with a "not local build" warning.
     if test "x$OPENJDK_TARGET_OS" = xaix; then
-      if "$DF -T local > /dev/null 2>&1"; then
-        DF_LOCAL_ONLY_OPTION='-T local'
-      else # AIX may use GNU-utils instead
-        DF_LOCAL_ONLY_OPTION='-l'
-      fi
+      DF_LOCAL_ONLY_OPTION='-T local'
     elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1"; then
       # In WSL1, we can only build on a drvfs file system (that is, a mounted real Windows drive)
       DF_LOCAL_ONLY_OPTION='-t drvfs'

make/autoconf/flags-cflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -189,10 +189,6 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       WARNINGS_ENABLE_ALL_CXXFLAGS="$WARNINGS_ENABLE_ALL_CFLAGS $WARNINGS_ENABLE_ADDITIONAL_CXX"
 
       DISABLED_WARNINGS="unused-parameter unused"
-      # gcc10/11 on ppc generate lots of abi warnings about layout of aggregates containing vectors
-      if test "x$OPENJDK_TARGET_CPU_ARCH" = "xppc"; then
-        DISABLED_WARNINGS="$DISABLED_WARNINGS psabi"
-      fi
       ;;
 
     clang)
@@ -480,7 +476,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
         -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DIAL"
     ALWAYS_DEFINES_JVM="-DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
-        -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE"
+        -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE \
+        -D_WINSOCK_DEPRECATED_NO_WARNINGS"
   fi
 
   ###############################################################################
@@ -637,7 +634,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   STATIC_LIBS_CFLAGS="-DSTATIC_BUILD=1"
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -ffunction-sections -fdata-sections \
-      -DJNIEXPORT='__attribute__((visibility(\"default\")))'"
+      -DJNIEXPORT='__attribute__((visibility(\"hidden\")))'"
   else
     STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -DJNIEXPORT="
   fi

make/autoconf/flags-ldflags.m4

@@ -70,7 +70,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
       fi
     fi
 
-    BASIC_LDFLAGS_JVM_ONLY=""
+    BASIC_LDFLAGS_JVM_ONLY="-Wl,-O1"
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 \

make/autoconf/jvm-features.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -247,14 +247,8 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_CDS],
 AC_DEFUN_ONCE([JVM_FEATURES_CHECK_DTRACE],
 [
   JVM_FEATURES_CHECK_AVAILABILITY(dtrace, [
-    AC_MSG_CHECKING([for dtrace tool and platform support])
-    if test "x$OPENJDK_TARGET_CPU_ARCH" = "xppc"; then
-      AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU_ARCH])
-      AVAILABLE=false
-    elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xs390"; then
-      AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU_ARCH])
-      AVAILABLE=false
-    elif test "x$DTRACE" != "x" && test -x "$DTRACE"; then
+    AC_MSG_CHECKING([for dtrace tool])
+    if test "x$DTRACE" != "x" && test -x "$DTRACE"; then
       AC_MSG_RESULT([$DTRACE])
     else
       AC_MSG_RESULT([no])

make/autoconf/lib-tests.m4

@@ -61,7 +61,7 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_GTEST],
 
         # Verify that the version is the required one.
         # This is a simplified version of TOOLCHAIN_CHECK_COMPILER_VERSION
-        gtest_version="`$GREP GOOGLETEST_VERSION $GTEST_FRAMEWORK_SRC/CMakeLists.txt | $SED -e 's/set(GOOGLETEST_VERSION \(.*\))/\1/'`"
+        gtest_version="`$GREP GOOGLETEST_VERSION $GTEST_FRAMEWORK_SRC/CMakeLists.txt | $SED -E -e 's/set\(GOOGLETEST_VERSION (.*)\)/\1/'`"
         comparable_actual_version=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$gtest_version"`
         comparable_minimum_version=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$GTEST_MINIMUM_VERSION"`
         if test $comparable_actual_version -lt $comparable_minimum_version ; then

make/autoconf/lib-wayland.m4

@@ -1,162 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2023, JetBrains s.r.o.. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# Setup wayland
-################################################################################
-AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
-[
-  AC_ARG_WITH(wayland, [AS_HELP_STRING([--with-wayland],
-      [specify prefix directory for the wayland package
-      (expecting the headers under PATH/include)])])
-  AC_ARG_WITH(wayland-include, [AS_HELP_STRING([--with-wayland-include],
-      [specify directory for the wayland include files])])
-
-  if test "x$NEEDS_LIB_WAYLAND" = xfalse; then
-    if (test "x${with_wayland}" != x && test "x${with_wayland}" != xno) || \
-        (test "x${with_wayland_include}" != x && test "x${with_wayland_include}" != xno); then
-      AC_MSG_WARN([[wayland not used, so --with-wayland[-*] is ignored]])
-    fi
-    WAYLAND_CFLAGS=
-    WAYLAND_LIBS=
-    VULKAN_FLAGS=
-    VULKAN_ENABLED=false
-  else
-    WAYLAND_FOUND=no
-
-    if test "x${with_wayland}" = xno || test "x${with_wayland_include}" = xno; then
-      AC_MSG_ERROR([It is not possible to disable the use of wayland. Remove the --without-wayland option.])
-    fi
-
-    if test "x${with_wayland}" != x; then
-      AC_MSG_CHECKING([for wayland headers])
-      if test -s "${with_wayland}/include/wayland-client.h" && test -s "${with_wayland}/include/wayland-cursor.h"; then
-        WAYLAND_CFLAGS="-I${with_wayland}/include"
-        WAYLAND_LIBS="-L${with_wayland}/lib -lwayland-client -lwayland-cursor"
-
-        WAYLAND_FOUND=yes
-        AC_MSG_RESULT([$WAYLAND_FOUND])
-      else
-        AC_MSG_ERROR([Can't find 'include/wayland-client.h' and 'include/wayland-cursor.h' under ${with_wayland} given with the --with-wayland option.])
-      fi
-    fi
-    if test "x${with_wayland_include}" != x; then
-      AC_MSG_CHECKING([for wayland headers])
-      if test -s "${with_wayland_include}/wayland-client.h" && test -s "${with_wayland_include}/wayland-cursor.h"; then
-        WAYLAND_CFLAGS="-I${with_wayland_include}"
-        WAYLAND_FOUND=yes
-        AC_MSG_RESULT([$WAYLAND_FOUND])
-      else
-        AC_MSG_ERROR([Can't find 'wayland-client.h' and 'wayland-cursor.h' under ${with_wayland_include} given with the --with-wayland-include option.])
-      fi
-    fi
-    if test "x$WAYLAND_FOUND" = xno; then
-      # Are the wayland headers installed in the default /usr/include location?
-      AC_CHECK_HEADERS([wayland-client.h wayland-cursor.h],
-          [ WAYLAND_FOUND=yes ],
-          [ WAYLAND_FOUND=no; break ]
-      )
-      if test "x$WAYLAND_FOUND" = xyes; then
-          WAYLAND_CFLAGS=
-          WAYLAND_LIBS="-lwayland-client -lwayland-cursor"
-          DEFAULT_WAYLAND=yes
-      fi
-    fi
-    if test "x$WAYLAND_FOUND" = xno; then
-      HELP_MSG_MISSING_DEPENDENCY([wayland])
-      AC_MSG_ERROR([Could not find wayland! $HELP_MSG ])
-    fi
-
-
-    # Checking for vulkan sdk
-
-    AC_ARG_WITH(vulkan, [AS_HELP_STRING([--with-vulkan],
-      [specify whether we use vulkan])])
-
-    AC_ARG_WITH(vulkan-include, [AS_HELP_STRING([--with-vulkan-include],
-      [specify directory for the vulkan include files])])
-
-    if test "x$SUPPORTS_LIB_VULKAN" = xfalse; then
-
-      if (test "x${with_vulkan}" != x && test "x${with_vulkan}" != xno) || \
-         (test "x${with_vulkan_include}" != x && test "x${with_vulkan_include}" != xno); then
-        AC_MSG_WARN([[vulkan not used, so --with-vulkan-include is ignored]])
-      fi
-      VULKAN_FLAGS=
-      VULKAN_ENABLED=false
-    else
-      # Do not build vulkan rendering pipeline by default
-      if (test "x${with_vulkan}" = x && test "x${with_vulkan_include}" = x) || \
-          test "x${with_vulkan}" = xno || test "x${with_vulkan_include}" = xno ; then
-        VULKAN_FLAGS=
-        VULKAN_ENABLED=false
-      else
-        VULKAN_FOUND=no
-
-        if test "x${with_vulkan_include}" != x; then
-          AC_CHECK_HEADERS([${with_vulkan_include}/include/vulkan/vulkan.h],
-            [ VULKAN_FOUND=yes
-              VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -I${with_vulkan_include}/include -DVULKAN_ENABLED"
-              VULKAN_ENABLED=true
-            ],
-            [ AC_MSG_ERROR([Can't find 'vulkan/vulkan.h' under '${with_vulkan_include}']) ]
-          )
-        fi
-
-        if test "x$VULKAN_FOUND" = xno; then
-          # Check vulkan sdk location
-          AC_CHECK_HEADERS([$VULKAN_SDK/include/vulkan/vulkan.h],
-            [ VULKAN_FOUND=yes
-              VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -I${VULKAN_SDK}/include -DVULKAN_ENABLED"
-              VULKAN_ENABLED=true
-            ],
-            [ VULKAN_FOUND=no; break ]
-          )
-        fi
-
-        if test "x$VULKAN_FOUND" = xno; then
-          # Check default /usr/include location
-          AC_CHECK_HEADERS([vulkan/vulkan.h],
-            [ VULKAN_FOUND=yes
-              VULKAN_FLAGS="-DVK_USE_PLATFORM_WAYLAND_KHR -DVULKAN_ENABLED"
-              VULKAN_ENABLED=true
-            ],
-            [ VULKAN_FOUND=no; break ]
-          )
-        fi
-
-        if test "x$VULKAN_FOUND" = xno; then
-          HELP_MSG_MISSING_DEPENDENCY([vulkan])
-          AC_MSG_ERROR([Could not find vulkan! $HELP_MSG ])
-        fi
-      fi
-    fi
-  fi
-  AC_SUBST(VULKAN_FLAGS)
-  AC_SUBST(VULKAN_ENABLED)
-  AC_SUBST(WAYLAND_CFLAGS)
-  AC_SUBST(WAYLAND_LIBS)
-])

make/autoconf/libraries.m4

@@ -36,8 +36,6 @@ m4_include([lib-x11.m4])
 m4_include([lib-fontconfig.m4])
 m4_include([lib-speechd.m4])
 m4_include([lib-nvdacontrollerclient.m4])
-m4_include([lib-wayland.m4])
-
 m4_include([lib-tests.m4])
 
 ################################################################################
@@ -45,26 +43,20 @@ m4_include([lib-tests.m4])
 ################################################################################
 AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
 [
-  # Check if X11, wayland and vulkan is needed
+  # Check if X11 is needed
   if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    # No X11 and wayland support on windows or macosx
+    # No X11 support on windows or macosx
     NEEDS_LIB_X11=false
     NEEDS_LIB_SPEECHD=false
-    NEEDS_LIB_WAYLAND=false
-    SUPPORTS_LIB_VULKAN=false
   elif test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
     # No X11 support needed when building headless only
     NEEDS_LIB_X11=false
     NEEDS_LIB_SPEECHD=false
-    NEEDS_LIB_WAYLAND=false
-    SUPPORTS_LIB_VULKAN=false
   else
-    # All other instances need X11 and wayland, even if building headless only, libawt still
+    # All other instances need X11, even if building headless only, libawt still
     # needs X11 headers.
     NEEDS_LIB_X11=true
     NEEDS_LIB_SPEECHD=true
-    NEEDS_LIB_WAYLAND=true
-    SUPPORTS_LIB_VULKAN=true
   fi
 
   # Check if fontconfig is needed
@@ -157,8 +149,6 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   LIB_SETUP_X11
   LIB_SETUP_SPEECHD
   LIB_SETUP_NVDACONTROLLERCLIENT
-  LIB_SETUP_WAYLAND
-
   LIB_TESTS_SETUP_GTEST
 
   BASIC_JDKLIB_LIBS=""
@@ -197,7 +187,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   if test "x$OPENJDK_TARGET_OS" = xwindows; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \
         comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib powrprof.lib uuid.lib \
-        ws2_32.lib winmm.lib version.lib psapi.lib"
+        wsock32.lib winmm.lib version.lib psapi.lib"
   fi
   LIB_SETUP_JVM_LIBS(BUILD)
   LIB_SETUP_JVM_LIBS(TARGET)

make/autoconf/spec.gmk.in

@@ -474,11 +474,6 @@ NVDACONTROLLERCLIENT_LIB:=@NVDACONTROLLERCLIENT_LIB@
 # Windows the client for the JAWS screen reader
 A11Y_JAWS_ANNOUNCING_ENABLED:=@A11Y_JAWS_ANNOUNCING_ENABLED@
 
-WAYLAND_CFLAGS:=@WAYLAND_CFLAGS@
-WAYLAND_LIBS:=@WAYLAND_LIBS@
-VULKAN_FLAGS:=@VULKAN_FLAGS@
-VULKAN_ENABLED:=@VULKAN_ENABLED@
-
 # The lowest required version of macosx
 MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
 # The highest allowed version of macosx

make/common/modules/LauncherCommon.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -130,6 +130,7 @@ define SetupBuildLauncherBody
           $$(shell $(FIND) $(SUPPORT_OUTPUTDIR)/modules_libs/java.base -name "*.a") \
           $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.jdwp.agent/libdt_socket.a \
           $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.jdwp.agent/libjdwp.a \
+          $(SUPPORT_OUTPUTDIR)/native/java.base/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) \
           -framework CoreFoundation \
           -framework Foundation \
           -framework SystemConfiguration \

make/conf/jib-profiles.js

@@ -851,7 +851,7 @@ var getJibProfilesProfiles = function (input, common, data) {
     [ "linux-aarch64", "linux-x64", "macosx-x64", "macosx-aarch64", "windows-x64" ]
         .forEach(function (name) {
             var o = artifactData[name]
-            var jdk_subdir = "jdk-" + data.version;
+            var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
             var jdk_suffix = (o.jdk_suffix != null ? o.jdk_suffix : "tar.gz");
             var pf = o.platform
             var jcovName = name + "-jcov";

make/data/cldr/README

@@ -1,4 +1,4 @@
 CLDR - Unicode Common Locale Data Repository
 http://cldr.unicode.org
 
-CLDR version installed: 43
+CLDR version installed: 42

make/data/cldr/common/bcp47/currency.xml

@@ -67,9 +67,9 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="btn" description="Bhutanese Ngultrum"/>
             <type name="buk" description="Burmese Kyat" since="1.9"/>
             <type name="bwp" description="Botswanan Pula"/>
-            <type name="byb" description="Belarusian Ruble (1994-1999)" since="1.9"/>
+            <type name="byb" description="Belarusian New Ruble (1994-1999)" since="1.9"/>
             <type name="byn" description="Belarusian Ruble" since="31"/>
-            <type name="byr" description="Belarusian Ruble (2000-2016)" since="1.9"/>
+            <type name="byr" description="Belarusian Ruble (2000–2016)" since="1.9"/>
             <type name="bzd" description="Belize Dollar"/>
             <type name="cad" description="Canadian Dollar"/>
             <type name="cdf" description="Congolese Franc"/>
@@ -112,7 +112,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="fjd" description="Fijian Dollar"/>
             <type name="fkp" description="Falkland Islands Pound"/>
             <type name="frf" description="French Franc"/>
-            <type name="gbp" description="British Pound"/>
+            <type name="gbp" description="British Pound Sterling"/>
             <type name="gek" description="Georgian Kupon Larit" since="1.9"/>
             <type name="gel" description="Georgian Lari" since="1.9"/>
             <type name="ghc" description="Ghanaian Cedi (1979-2007)"/>
@@ -136,8 +136,8 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="idr" description="Indonesian Rupiah"/>
             <type name="iep" description="Irish Pound"/>
             <type name="ilp" description="Israeli Pound"/>
-            <type name="ilr" description="Israeli Shekel (1980-1985)" since="1.9"/>
-            <type name="ils" description="Israeli New Shekel"/>
+            <type name="ilr" description="Israeli Sheqel (1980-1985)" since="1.9"/>
+            <type name="ils" description="Israeli New Sheqel"/>
             <type name="inr" description="Indian Rupee"/>
             <type name="iqd" description="Iraqi Dinar" since="1.9"/>
             <type name="irr" description="Iranian Rial" since="1.9"/>
@@ -181,7 +181,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="mkd" description="Macedonian Denar" since="1.9"/>
             <type name="mkn" description="Macedonian Denar (1992-1993)" since="1.9"/>
             <type name="mlf" description="Malian Franc" since="1.9"/>
-            <type name="mmk" description="Myanmar Kyat"/>
+            <type name="mmk" description="Myanma Kyat"/>
             <type name="mnt" description="Mongolian Tugrik"/>
             <type name="mop" description="Macanese Pataca"/>
             <type name="mro" description="Mauritanian Ouguiya (1973-2017)"/>
@@ -189,7 +189,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="mtl" description="Maltese Lira"/>
             <type name="mtp" description="Maltese Pound"/>
             <type name="mur" description="Mauritian Rupee"/>
-            <type name="mvp" description="Maldivian Rupee (1947-1981)" since="1.9"/>
+            <type name="mvp" description="Maldivian Rupee" since="1.9"/>
             <type name="mvr" description="Maldivian Rufiyaa" since="1.9"/>
             <type name="mwk" description="Malawian Kwacha" since="1.9"/>
             <type name="mxn" description="Mexican Peso" since="1.9"/>
@@ -210,7 +210,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="omr" description="Omani Rial" since="1.9"/>
             <type name="pab" description="Panamanian Balboa"/>
             <type name="pei" description="Peruvian Inti"/>
-            <type name="pen" description="Peruvian Sol"/>
+            <type name="pen" description="Peruvian Nuevo Sol"/>
             <type name="pes" description="Peruvian Sol (1863-1965)" since="1.9"/>
             <type name="pgk" description="Papua New Guinean Kina"/>
             <type name="php" description="Philippine Peso"/>
@@ -219,7 +219,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="plz" description="Polish Zloty (1950-1995)" since="1.9"/>
             <type name="pte" description="Portuguese Escudo"/>
             <type name="pyg" description="Paraguayan Guarani"/>
-            <type name="qar" description="Qatari Riyal"/>
+            <type name="qar" description="Qatari Rial"/>
             <type name="rhd" description="Rhodesian Dollar"/>
             <type name="rol" description="Romanian Leu (1952-2006)" since="1.9"/>
             <type name="ron" description="Romanian Leu"/>
@@ -235,11 +235,11 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="sdp" description="Sudanese Pound (1957-1998)" since="1.9"/>
             <type name="sek" description="Swedish Krona"/>
             <type name="sgd" description="Singapore Dollar"/>
-            <type name="shp" description="St. Helena Pound"/>
+            <type name="shp" description="Saint Helena Pound"/>
             <type name="sit" description="Slovenian Tolar" since="1.9"/>
             <type name="skk" description="Slovak Koruna"/>
-            <type name="sle" description="Sierra Leonean Leone" since="41"/>
-            <type name="sll" description="Sierra Leonean Leone (1964—2022)"/>
+            <type name="sle" description="Sierra Leonean New Leone"/>
+            <type name="sll" description="Sierra Leonean Leone"/>
             <type name="sos" description="Somali Shilling"/>
             <type name="srd" description="Surinamese Dollar"/>
             <type name="srg" description="Surinamese Guilder"/>
@@ -274,28 +274,28 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="uyp" description="Uruguayan Peso (1975-1993)" since="1.9"/>
             <type name="uyu" description="Uruguayan Peso"/>
             <type name="uyw" description="Uruguayan Nominal Wage Index Unit" since="34"/>
-            <type name="uzs" description="Uzbekistani Som" since="1.9"/>
+            <type name="uzs" description="Uzbekistan Som" since="1.9"/>
             <type name="veb" description="Venezuelan Bolívar (1871-2008)" since="1.9"/>
-            <type name="ved" description="Bolívar Soberano" since="41"/>
             <type name="vef" description="Venezuelan Bolívar (2008-2018)"/>
             <type name="ves" description="Venezuelan Bolívar" since="34"/>
+            <type name="ved" description="Bolívar Soberano" since="41"/>
             <type name="vnd" description="Vietnamese Dong"/>
             <type name="vnn" description="Vietnamese Dong (1978-1985)" since="1.9"/>
             <type name="vuv" description="Vanuatu Vatu"/>
             <type name="wst" description="Samoan Tala"/>
-            <type name="xaf" description="Central African CFA Franc"/>
+            <type name="xaf" description="CFA Franc BEAC"/>
             <type name="xag" description="Silver" since="1.9"/>
             <type name="xau" description="Gold" since="1.9"/>
             <type name="xba" description="European Composite Unit" since="1.9"/>
             <type name="xbb" description="European Monetary Unit" since="1.9"/>
-            <type name="xbc" description="European Unit of Account (XBC)" since="1.9"/>
-            <type name="xbd" description="European Unit of Account (XBD)" since="1.9"/>
+            <type name="xbc" description="European Unit of Account 9" since="1.9"/>
+            <type name="xbd" description="European Unit of Account 17" since="1.9"/>
             <type name="xcd" description="East Caribbean Dollar"/>
             <type name="xdr" description="Special Drawing Rights" since="1.9"/>
             <type name="xeu" description="European Currency Unit" since="1.9"/>
             <type name="xfo" description="French Gold Franc" since="1.9"/>
             <type name="xfu" description="French UIC-Franc" since="1.9"/>
-            <type name="xof" description="West African CFA Franc"/>
+            <type name="xof" description="CFA Franc BCEAO"/>
             <type name="xpd" description="Palladium" since="1.9"/>
             <type name="xpf" description="CFP Franc"/>
             <type name="xpt" description="Platinum" since="1.9"/>

make/data/cldr/common/bcp47/segmentation.xml

@@ -10,25 +10,25 @@ For terms of use, see http://www.unicode.org/copyright.html
     <version number="$Revision$"/>
     <keyword>
         <key name="dx" description="Scripts to exclude from dictionary break" valueType="multiple" since="38">
-            <type name="SCRIPT_CODE" description="ISO 15924 script code" since="38"/>
+            <type name="SCRIPT_CODE" description="ISO 15924 script code"/>
         </key>
 
         <key name="lb" description="Line break type key" since="27">
-            <type name="strict" description="CSS level 3 line-break=strict, e.g. treat CJ as NS" since="27"/>
-            <type name="normal" description="CSS level 3 line-break=normal, e.g. treat CJ as ID, break before hyphens for ja,zh" since="27"/>
-            <type name="loose" description="CSS lev 3 line-break=loose" since="27"/>
+            <type name="strict" description="CSS level 3 line-break=strict, e.g. treat CJ as NS"/>
+            <type name="normal" description="CSS level 3 line-break=normal, e.g. treat CJ as ID, break before hyphens for ja,zh"/>
+            <type name="loose" description="CSS lev 3 line-break=loose"/>
         </key>
 
         <key name="lw" description="Line break key for CSS lev 3 word-break options" since="28">
-            <type name="normal" description="CSS lev 3 word-break=normal, normal script/language behavior for midword breaks" since="28"/>
-            <type name="breakall" description="CSS lev 3 word-break=break-all, allow midword breaks unless forbidden by lb setting" since="28"/>
-            <type name="keepall" description="CSS lev 3 word-break=keep-all, prohibit midword breaks except for dictionary breaks" since="28"/>
-            <type name="phrase" description="Prioritize keeping natural phrases (of multiple words) together when breaking, used in short text like title and headline" since="41"/>
+            <type name="normal" description="CSS lev 3 word-break=normal, normal script/language behavior for midword breaks"/>
+            <type name="breakall" description="CSS lev 3 word-break=break-all, allow midword breaks unless forbidden by lb setting"/>
+            <type name="keepall" description="CSS lev 3 word-break=keep-all, prohibit midword breaks except for dictionary breaks"/>
+            <type name="phrase" description="Prioritize keeping natural phrases (of multiple words) together when breaking, used in short text like title and headline"/>
         </key>
 
         <key name="ss" description="Sentence break parameter key to control use of suppressions data" since="28">
-            <type name="none" description="Don't use segmentation suppressions data" since="28"/>
-            <type name="standard" description="Use segmentation suppressions data of type standard" since="28"/>
+            <type name="none" description="Don't use segmentation suppressions data"/>
+            <type name="standard" description="Use segmentation suppressions data of type standard"/>
         </key>
 
     </keyword>

make/data/cldr/common/bcp47/timezone.xml

@@ -96,20 +96,20 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="cacfq" description="Creston, Canada" alias="America/Creston" since="21.0.1"/>
             <type name="caedm" description="Edmonton, Canada" alias="America/Edmonton Canada/Mountain"/>
             <type name="caffs" description="Rainy River, Canada" alias="America/Rainy_River"/>
-            <type name="cafne" description="Fort Nelson, Canada" alias="America/Fort_Nelson" since="29"/>
+            <type name="cafne" description="Fort Nelson, Canada" alias="America/Fort_Nelson"/>
             <type name="caglb" description="Glace Bay, Canada" alias="America/Glace_Bay"/>
             <type name="cagoo" description="Goose Bay, Canada" alias="America/Goose_Bay"/>
             <type name="cahal" description="Halifax, Canada" alias="America/Halifax Canada/Atlantic"/>
             <type name="caiql" description="Iqaluit, Canada" alias="America/Iqaluit"/>
             <type name="camon" description="Moncton, Canada" alias="America/Moncton"/>
-            <type name="camtr" description="Montreal, Canada" deprecated="true" preferred="cator"/>
+            <type name="camtr" description="Montreal, Canada" deprecated="true" alias="America/Montreal"/>
             <type name="capnt" description="Pangnirtung, Canada" alias="America/Pangnirtung"/>
             <type name="careb" description="Resolute, Canada" alias="America/Resolute"/>
             <type name="careg" description="Regina, Canada" alias="America/Regina Canada/East-Saskatchewan Canada/Saskatchewan"/>
             <type name="casjf" description="St. John's, Canada" alias="America/St_Johns Canada/Newfoundland"/>
             <type name="canpg" description="Nipigon, Canada" alias="America/Nipigon"/>
             <type name="cathu" description="Thunder Bay, Canada" alias="America/Thunder_Bay"/>
-            <type name="cator" description="Toronto, Canada" alias="America/Toronto America/Montreal Canada/Eastern"/>
+            <type name="cator" description="Toronto, Canada" alias="America/Toronto Canada/Eastern"/>
             <type name="cavan" description="Vancouver, Canada" alias="America/Vancouver Canada/Pacific"/>
             <type name="cawnp" description="Winnipeg, Canada" alias="America/Winnipeg Canada/Central"/>
             <type name="caybx" description="Blanc-Sablon, Canada" alias="America/Blanc-Sablon"/>
@@ -177,7 +177,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="frpar" description="Paris, France" alias="Europe/Paris"/>
             <type name="galbv" description="Libreville, Gabon" alias="Africa/Libreville"/>
             <type name="gaza" description="Gaza Strip, Palestinian Territories" deprecated="true" preferred="gazastrp"/>
-            <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40"/>
+            <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza"/>
             <type name="gblon" description="London, United Kingdom" alias="Europe/London Europe/Belfast GB GB-Eire"/>
             <type name="gdgnd" description="Grenada" alias="America/Grenada"/>
             <type name="getbs" description="Tbilisi, Georgia" alias="Asia/Tbilisi"/>
@@ -190,7 +190,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="globy" description="Ittoqqortoormiit (Scoresbysund), Greenland" alias="America/Scoresbysund"/>
             <type name="glthu" description="Qaanaaq (Thule), Greenland" alias="America/Thule"/>
             <type name="gmbjl" description="Banjul, Gambia" alias="Africa/Banjul"/>
-            <type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich" since="31"/>
+            <type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich"/>
             <type name="gncky" description="Conakry, Guinea" alias="Africa/Conakry"/>
             <type name="gpbbr" description="Guadeloupe" alias="America/Guadeloupe"/>
             <type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot"/>
@@ -280,7 +280,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="mwblz" description="Blantyre, Malawi" alias="Africa/Blantyre"/>
             <type name="mxchi" description="Chihuahua, Mexico" alias="America/Chihuahua"/>
             <type name="mxcun" description="Cancún, Mexico" alias="America/Cancun"/>
-            <type name="mxcjs" description="Ciudad Juárez, Mexico" alias="America/Ciudad_Juarez" since="43"/>
+            <type name="mxcjs" description="Ciudad Juárez, Mexico" alias="America/Ciudad_Juarez"/>
             <type name="mxhmo" description="Hermosillo, Mexico" alias="America/Hermosillo"/>
             <type name="mxmam" description="Matamoros, Mexico" alias="America/Matamoros"/>
             <type name="mxmex" description="Mexico City, Mexico" alias="America/Mexico_City Mexico/General"/>
@@ -390,7 +390,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="tmasb" description="Ashgabat, Turkmenistan" alias="Asia/Ashgabat Asia/Ashkhabad"/>
             <type name="tntun" description="Tunis, Tunisia" alias="Africa/Tunis"/>
             <type name="totbu" description="Tongatapu, Tonga" alias="Pacific/Tongatapu"/>
-            <type name="trist" description="Istanbul, Türkiye" alias="Europe/Istanbul Asia/Istanbul Turkey"/>
+            <type name="trist" description="Istanbul, Turkey" alias="Europe/Istanbul Asia/Istanbul Turkey"/>
             <type name="ttpos" description="Port of Spain, Trinidad and Tobago" alias="America/Port_of_Spain"/>
             <type name="tvfun" description="Funafuti, Tuvalu" alias="Pacific/Funafuti"/>
             <type name="twtpe" description="Taipei, Taiwan" alias="Asia/Taipei ROC"/>

make/data/cldr/common/bcp47/variant.xml

@@ -7,18 +7,18 @@
 	<version number="$Revision$" />
 	<keyword>
 		<key name="em" description="Emoji presentation style request" since="29">
-			<type name="emoji" description="use an emoji presentation for emoji characters if possible" since="29"/>
-			<type name="text" description="use a text presentation for emoji characters if possible" since="29"/>
-			<type name="default" description="use the default presentation as specified in UTR #51" since="29"/>
+			<type name="emoji" description="use an emoji presentation for emoji characters if possible"/>
+			<type name="text" description="use a text presentation for emoji characters if possible"/>
+			<type name="default" description="use the default presentation as specified in UTR #51"/>
 		</key>
 
 		<key name="rg" description="Alternate region for determining certain data values (e.g. default currency and units) specified by rgScope" since="29">
-			<type name="RG_KEY_VALUE" description="A region code from idValidity/id[type='region'][idStatus='regular'], suffixed with 'ZZZZ'" since="29"/>
+			<type name="RG_KEY_VALUE" description="A region code from idValidity/id[type='region'][idStatus='regular'], suffixed with 'ZZZZ'" />
 		</key>
 
 		<key name="sd" description="Region subdivision" since="28">
 			<type name="SUBDIVISION_CODE"
-				description="Valid unicode_subdivision_subtag for the region subtag as specified in LDML, based on subdivisionContainment data in supplementalData, prefixed by the associated unicode_region_subtag" since="28"/>
+				description="Valid unicode_subdivision_subtag for the region subtag as specified in LDML, based on subdivisionContainment data in supplementalData, prefixed by the associated unicode_region_subtag" />
 		</key>
 
 		<key name="va" description="Common locale variant type key">

make/data/cldr/common/dtd/ldml.dtd

@@ -1,5 +1,5 @@
 <!--
-Copyright © 1991-2023 Unicode, Inc.
+Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "43" >
+<!ATTLIST version cldrVersion CDATA #FIXED "42" >
     <!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -68,7 +68,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST language references CDATA #IMPLIED >
-    <!--@MATCH:any-->
     <!--@METADATA-->
 
 <!ELEMENT script ( #PCDATA ) >
@@ -466,7 +465,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST exemplarCharacters references CDATA #IMPLIED >
-    <!--@MATCH:any-->
     <!--@METADATA-->
 <!ATTLIST exemplarCharacters validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
@@ -2827,11 +2825,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT cr ( #PCDATA ) >
 <!ATTLIST cr alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant, proposed, short-->
+    <!--@MATCH:literal/variant-->
 <!ATTLIST cr draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST cr references CDATA #IMPLIED >
-    <!--@MATCH:any-->
     <!--@METADATA-->
 
 <!-- # Use the cr element instead, with ICU syntax. -->
@@ -3126,7 +3123,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:or/range/-1.0E20~1.0E20||literal/-x, 0, 0.x, NaN, -Inf, Inf, x,x, x.x-->
     <!--@VALUE-->
 <!ATTLIST rbnfrule radix CDATA #IMPLIED >
-    <!--@MATCH:literal/1,000, 100, 1000, 100000, 5, 20, 400, 8000, 160,000, 3,200,000, 64,000,000-->
+    <!--@MATCH:literal/1,000, 100, 1000, 100000, 20-->
     <!--@VALUE-->
 <!ATTLIST rbnfrule decexp CDATA #IMPLIED >
     <!--@VALUE-->
@@ -3162,8 +3159,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
 
 <!ELEMENT personNames ( alias | ( nameOrderLocales*, foreignSpaceReplacement*, initialPattern*, personName*, sampleName*, special* ) ) >
+    <!--@TECHPREVIEW-->
 
 <!ELEMENT nameOrderLocales ( #PCDATA ) >
+    <!--@TECHPREVIEW-->
 <!ATTLIST nameOrderLocales order (givenFirst | surnameFirst) #REQUIRED >
 <!ATTLIST nameOrderLocales alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
@@ -3173,6 +3172,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
 
 <!ELEMENT foreignSpaceReplacement ( #PCDATA ) >
+    <!--@TECHPREVIEW-->
 <!ATTLIST foreignSpaceReplacement xml:space (default | preserve) "preserve" >
     <!--@METADATA-->
 <!ATTLIST foreignSpaceReplacement alt NMTOKENS #IMPLIED >
@@ -3183,6 +3183,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
 
 <!ELEMENT initialPattern ( #PCDATA ) >
+    <!--@TECHPREVIEW-->
 <!ATTLIST initialPattern type (initial | initialSequence) #REQUIRED >
 <!ATTLIST initialPattern alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
@@ -3192,16 +3193,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
 
 <!ELEMENT personName ( alias | ( namePattern+, special* ) ) >
+    <!--@TECHPREVIEW-->
 <!ATTLIST personName order NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/givenFirst, surnameFirst, sorting-->
+    <!--@MATCH:set/literal/givenFirst, surnameFirst, sorting-->
 <!ATTLIST personName length NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/long, medium, short-->
+    <!--@MATCH:set/literal/long, medium, short-->
 <!ATTLIST personName usage NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/referring, addressing, monogram-->
+    <!--@MATCH:set/literal/referring, addressing, monogram-->
 <!ATTLIST personName formality NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/formal, informal-->
+    <!--@MATCH:set/literal/formal, informal-->
 
 <!ELEMENT namePattern ( #PCDATA ) >
+    <!--@TECHPREVIEW-->
 <!ATTLIST namePattern alt (1 | 2) #IMPLIED >
 <!ATTLIST namePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
@@ -3209,12 +3212,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@METADATA-->
 
 <!ELEMENT sampleName ( alias | ( nameField+, special* ) ) >
+    <!--@TECHPREVIEW-->
 <!ATTLIST sampleName item NMTOKENS #REQUIRED >
-    <!--@MATCH:literal/nativeG, nativeGS, nativeGGS, nativeFull, foreignG, foreignGS, foreignGGS, foreignFull-->
+    <!--@MATCH:literal/givenOnly, givenSurnameOnly, given12Surname, full-->
 
 <!ELEMENT nameField ( #PCDATA ) >
+    <!--@TECHPREVIEW-->
 <!ATTLIST nameField type CDATA #REQUIRED >
-    <!--@MATCH:literal/title, given, given-informal, given2, surname, surname-prefix, surname-core, surname2, generation, credentials-->
+    <!--@MATCH:literal/prefix, given, given-informal, given2, surname, surname-prefix, surname-core, surname2, suffix-->
 <!ATTLIST nameField alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
 <!ATTLIST nameField draft (approved | contributed | provisional | unconfirmed) #IMPLIED >

make/data/cldr/common/dtd/ldmlBCP47.dtd

@@ -1,5 +1,5 @@
 <!--
-Copyright © 1991-2023 Unicode, Inc.
+Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "43" >
+<!ATTLIST version cldrVersion CDATA #FIXED "42" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 

make/data/cldr/common/dtd/ldmlSupplemental.dtd

@@ -1,18 +1,18 @@
 <!--
-Copyright © 1991-2023 Unicode, Inc.
+Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
-<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitIdComponents?, unitConstants*, unitQuantities*, convertUnits*, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales*, personNamesDefaults?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups?, grammaticalData? ) >
+<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitIdComponents?, unitConstants*, unitQuantities*, convertUnits*, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales?, personNamesDefaults?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups?, grammaticalData? ) >
 
 <!ELEMENT version EMPTY >
     <!--@METADATA-->
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:any-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "43" >
+<!ATTLIST version cldrVersion CDATA #FIXED "42" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 <!ATTLIST version unicodeVersion CDATA #FIXED "15.0.0" >
@@ -216,7 +216,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT calendarData ( calendar* ) >
 
-<!ELEMENT calendar ( calendarSystem?, inheritEras?, eras? ) >
+<!ELEMENT calendar ( calendarSystem?, eras? ) >
 <!ATTLIST calendar type NMTOKEN #REQUIRED >
     <!--@MATCH:bcp47/ca-->
 <!ATTLIST calendar territories NMTOKENS #IMPLIED >
@@ -237,11 +237,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST calendarSystem references CDATA #IMPLIED >
     <!--@METADATA-->
 
-<!ELEMENT inheritEras EMPTY >
-<!ATTLIST inheritEras calendar NMTOKEN #REQUIRED >
-    <!--@MATCH:bcp47/ca-->
-    <!--@VALUE-->
-
 <!ELEMENT eras ( era* ) >
 <!ATTLIST eras references CDATA #IMPLIED >
     <!--@METADATA-->
@@ -255,12 +250,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST era end CDATA #IMPLIED >
     <!--@MATCH:time/yyyy-MM-dd-->
     <!--@VALUE-->
-<!ATTLIST era code NMTOKEN #IMPLIED >
-    <!--@MATCH:regex/[a-z0-9]{3,8}(\-[a-z0-9]{3,8})*-->
-    <!--@VALUE-->
-<!ATTLIST era aliases NMTOKENS #IMPLIED >
-    <!--@MATCH:set/regex/[a-z0-9]{2,8}(\-[a-z0-9]{3,8})*-->
-    <!--@VALUE-->
 <!ATTLIST era named (true | false) #IMPLIED >
     <!--@VALUE-->
 
@@ -450,6 +439,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@DEPRECATED-->
 <!ATTLIST unitPreferences draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
+    <!--@DEPRECATED-->
 
 <!ELEMENT unitPreference ( #PCDATA ) >
     <!--@ORDERED-->
@@ -910,8 +900,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!-- # Parent locales -->
 
 <!ELEMENT parentLocales ( parentLocale* ) >
-<!ATTLIST parentLocales component NMTOKEN #IMPLIED >
-    <!--@MATCH:literal/segmentations, collations-->
 
 <!ELEMENT parentLocale EMPTY >
 <!ATTLIST parentLocale parent NMTOKEN #REQUIRED >
@@ -935,9 +923,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST likelySubtag to NMTOKEN #REQUIRED >
     <!--@MATCH:validity/locale-->
     <!--@VALUE-->
-<!ATTLIST likelySubtag origin NMTOKENS #IMPLIED >
-    <!--@MATCH:set/literal/sil1, wikidata, special-->
-    <!--@METADATA-->
 
 <!ELEMENT metazoneInfo ( timezone* ) >
 

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

@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="aa"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa" draft="unconfirmed">Qafar</language>
-		</languages>
-		<territories>
-			<territory type="DJ" draft="unconfirmed">Yabuuti</territory>
-			<territory type="ER" draft="unconfirmed">Eretria</territory>
-			<territory type="ET" draft="unconfirmed">Otobbia</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a b t s e c k x i d q r f g o l m n u w h y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[j p v z]</exemplarCharacters>
-		<exemplarCharacters type="index">[A B T S E C K X I D Q R F G O L M N U W H Y]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="generic">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern draft="unconfirmed">EEEE, MMMM dd, y G</pattern>
-							<datetimeSkeleton draft="unconfirmed">GyMMMMEEEEdd</datetimeSkeleton>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern draft="unconfirmed">dd MMMM y G</pattern>
-							<datetimeSkeleton draft="unconfirmed">GyMMMMdd</datetimeSkeleton>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern draft="unconfirmed">dd-MMM-y G</pattern>
-							<datetimeSkeleton draft="unconfirmed">GyMMMdd</datetimeSkeleton>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern draft="unconfirmed">dd/MM/yy GGGGG</pattern>
-							<datetimeSkeleton draft="unconfirmed">GGGGGyyMMdd</datetimeSkeleton>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">Qun</month>
-							<month type="2" draft="unconfirmed">Nah</month>
-							<month type="3" draft="unconfirmed">Cig</month>
-							<month type="4" draft="unconfirmed">Agd</month>
-							<month type="5" draft="unconfirmed">Cax</month>
-							<month type="6" draft="unconfirmed">Qas</month>
-							<month type="7" draft="unconfirmed">Qad</month>
-							<month type="8" draft="unconfirmed">Leq</month>
-							<month type="9" draft="unconfirmed">Way</month>
-							<month type="10" draft="unconfirmed">Dit</month>
-							<month type="11" draft="unconfirmed">Xim</month>
-							<month type="12" draft="unconfirmed">Kax</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">Qunxa Garablu</month>
-							<month type="2" draft="unconfirmed">Kudo</month>
-							<month type="3" draft="unconfirmed">Ciggilta Kudo</month>
-							<month type="4" draft="unconfirmed">Agda Baxis</month>
-							<month type="5" draft="unconfirmed">Caxah Alsa</month>
-							<month type="6" draft="unconfirmed">Qasa Dirri</month>
-							<month type="7" draft="unconfirmed">Qado Dirri</month>
-							<month type="8" draft="unconfirmed">Liiqen</month>
-							<month type="9" draft="unconfirmed">Waysu</month>
-							<month type="10" draft="unconfirmed">Diteli</month>
-							<month type="11" draft="unconfirmed">Ximoli</month>
-							<month type="12" draft="unconfirmed">Kaxxa Garablu</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1" draft="unconfirmed">Q</month>
-							<month type="2" draft="unconfirmed">N</month>
-							<month type="3" draft="unconfirmed">C</month>
-							<month type="4" draft="unconfirmed">A</month>
-							<month type="5" draft="unconfirmed">C</month>
-							<month type="6" draft="unconfirmed">Q</month>
-							<month type="7" draft="unconfirmed">Q</month>
-							<month type="8" draft="unconfirmed">L</month>
-							<month type="9" draft="unconfirmed">W</month>
-							<month type="10" draft="unconfirmed">D</month>
-							<month type="11" draft="unconfirmed">X</month>
-							<month type="12" draft="unconfirmed">K</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun" draft="unconfirmed">Aca</day>
-							<day type="mon" draft="unconfirmed">Etl</day>
-							<day type="tue" draft="unconfirmed">Tal</day>
-							<day type="wed" draft="unconfirmed">Arb</day>
-							<day type="thu" draft="unconfirmed">Kam</day>
-							<day type="fri" draft="unconfirmed">Gum</day>
-							<day type="sat" draft="unconfirmed">Sab</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun" draft="unconfirmed">Acaada</day>
-							<day type="mon" draft="unconfirmed">Etleeni</day>
-							<day type="tue" draft="unconfirmed">Talaata</day>
-							<day type="wed" draft="unconfirmed">Arbaqa</day>
-							<day type="thu" draft="unconfirmed">Kamiisi</day>
-							<day type="fri" draft="unconfirmed">Gumqata</day>
-							<day type="sat" draft="unconfirmed">Sabti</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun" draft="unconfirmed">A</day>
-							<day type="mon" draft="unconfirmed">E</day>
-							<day type="tue" draft="unconfirmed">T</day>
-							<day type="wed" draft="unconfirmed">A</day>
-							<day type="thu" draft="unconfirmed">K</day>
-							<day type="fri" draft="unconfirmed">G</day>
-							<day type="sat" draft="unconfirmed">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="unconfirmed">saaku</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">carra</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">saaku</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">carra</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
-				<eras>
-					<eraNames>
-						<era type="0" draft="unconfirmed">Yaasuusuk Duma</era>
-						<era type="1" draft="unconfirmed">Yaasuusuk Wadir</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0" draft="unconfirmed">YD</era>
-						<era type="1" draft="unconfirmed">YW</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern draft="unconfirmed">EEEE, MMMM dd, y</pattern>
-							<datetimeSkeleton draft="unconfirmed">yMMMMEEEEdd</datetimeSkeleton>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern draft="unconfirmed">dd MMMM y</pattern>
-							<datetimeSkeleton draft="unconfirmed">yMMMMdd</datetimeSkeleton>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern draft="unconfirmed">dd-MMM-y</pattern>
-							<datetimeSkeleton draft="unconfirmed">yMMMdd</datetimeSkeleton>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern draft="unconfirmed">dd/MM/yy</pattern>
-							<datetimeSkeleton draft="unconfirmed">yyMMdd</datetimeSkeleton>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-							<datetimeSkeleton>ahmmsszzzz</datetimeSkeleton>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-							<datetimeSkeleton>ahmmssz</datetimeSkeleton>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-							<datetimeSkeleton>ahmmss</datetimeSkeleton>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-							<datetimeSkeleton>ahmm</datetimeSkeleton>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats numberSystem="latn">
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern draft="unconfirmed">¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ETB">
-				<symbol>Br</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>

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

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="aa"/>
-		<territory type="DJ"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">Qunxa Garablu</month>
-							<month type="2" draft="unconfirmed">Kudo</month>
-							<month type="3" draft="unconfirmed">Ciggilta Kudo</month>
-							<month type="4" draft="unconfirmed">Agda Baxis</month>
-							<month type="5" draft="unconfirmed">Caxah Alsa</month>
-							<month type="6" draft="unconfirmed">Qasa Dirri</month>
-							<month type="7" draft="unconfirmed">Qado Dirri</month>
-							<month type="8" draft="unconfirmed">Leqeeni</month>
-							<month type="9" draft="unconfirmed">Waysu</month>
-							<month type="10" draft="unconfirmed">Diteli</month>
-							<month type="11" draft="unconfirmed">Ximoli</month>
-							<month type="12" draft="unconfirmed">Kaxxa Garablu</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="DJF">
-				<symbol>Fdj</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="aa"/>
-		<territory type="ER"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="ERN">
-				<symbol>Nfk</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="aa"/>
-		<territory type="ET"/>
-	</identity>
-</ldml>

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

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-
-Proper interpretation of these files requires synthesis of missing items, as per
-​https://www.unicode.org/reports/tr35/tr35-general.html#Annotations
-Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="ab"/>
-		<territory type="GE"/>
-	</identity>
-</ldml>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="an"/>
-		<territory type="ES"/>
-	</identity>
-</ldml>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-
-Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations.
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="apc"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="apc">العامية</language>
-		</languages>
-	</localeDisplayNames>
-	<layout>
-		<orientation>
-			<characterOrder>right-to-left</characterOrder>
-		</orientation>
-	</layout>
-	<characters>
-		<exemplarCharacters>[\u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 \u0670 ء آ أ ؤ إ ئ ا ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ى ي]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ـ\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک گ ی]</exemplarCharacters>
-		<exemplarCharacters type="index">[ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي]</exemplarCharacters>
-		<exemplarCharacters type="numbers">[\u061C\u200E \- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐ ‑ – — ، ؛ \: ! ؟ . … ' &quot; « » ( ) \[ \] \&amp;]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">كانون التاني</month>
-							<month type="2" draft="unconfirmed">شباط</month>
-							<month type="3" draft="unconfirmed">أذار</month>
-							<month type="4" draft="unconfirmed">نيسان</month>
-							<month type="5" draft="unconfirmed">أيار</month>
-							<month type="6" draft="unconfirmed">حزيران</month>
-							<month type="7" draft="unconfirmed">تموز</month>
-							<month type="8" draft="unconfirmed">آب</month>
-							<month type="9" draft="unconfirmed">أيلول</month>
-							<month type="10" draft="unconfirmed">تشرين الأول</month>
-							<month type="11" draft="unconfirmed">تشرين التاني</month>
-							<month type="12" draft="unconfirmed">كانون الأول</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="wide">
-							<day type="sun" draft="unconfirmed">الأحد</day>
-							<day type="mon" draft="unconfirmed">التنين</day>
-							<day type="tue" draft="unconfirmed">التلاتا</day>
-							<day type="wed" draft="unconfirmed">الأربعا</day>
-							<day type="thu" draft="unconfirmed">الخميس</day>
-							<day type="fri" draft="unconfirmed">الجمعة</day>
-							<day type="sat" draft="unconfirmed">السبت</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">صباحا</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">مساء</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="JOD">
-				<symbol>د.أ.‏</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="apc"/>
-		<territory type="SY"/>
-	</identity>
-</ldml>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -36,14 +36,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="contributed">هذه السنة</relative>
 				<relative type="1" draft="contributed">السنة التالية</relative>
 			</field>
-			<field type="year-short">
-				<relative type="0">هذه السنة</relative>
-				<relative type="1">السنة التالية</relative>
-			</field>
-			<field type="year-narrow">
-				<relative type="0">هذه السنة</relative>
-				<relative type="1">السنة التالية</relative>
-			</field>
 		</fields>
 	</dates>
 	<numbers>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -76,6 +76,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many" draft="contributed">{0} مترًا في الثانية المربعة</unitPattern>
 				<unitPattern count="other" draft="contributed">{0} متر في الثانية المربعة</unitPattern>
 			</unit>
+			<unit type="angle-arc-minute">
+				<unitPattern count="zero">{0} دقيقة قوسية</unitPattern>
+				<unitPattern count="one">دقيقة قوسية</unitPattern>
+				<unitPattern count="two">دقيقتان قوسيتان</unitPattern>
+				<unitPattern count="few">{0} دقائق قوسية</unitPattern>
+				<unitPattern count="many">{0} دقيقة قوسية</unitPattern>
+				<unitPattern count="other">{0} دقيقة قوسية</unitPattern>
+			</unit>
 			<unit type="area-square-kilometer">
 				<unitPattern count="zero">{0} كيلومتر مربع</unitPattern>
 				<unitPattern count="one">{0} كيلومتر مربع</unitPattern>
@@ -535,6 +543,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} سنة</unitPattern>
 				<unitPattern count="other">{0} سنة</unitPattern>
 			</unit>
+			<unit type="energy-british-thermal-unit">
+				<unitPattern count="zero">{0} وحدة حرارية بريطانية</unitPattern>
+				<unitPattern count="one">{0} وحدة حرارية بريطانية</unitPattern>
+				<unitPattern count="two">{0} وحدة حرارية بريطانية</unitPattern>
+				<unitPattern count="few">{0} وحدات حرارية بريطانية</unitPattern>
+				<unitPattern count="many">{0} وحدة حرارية بريطانية</unitPattern>
+				<unitPattern count="other">{0} وحدة حرارية بريطانية</unitPattern>
+			</unit>
 			<unit type="length-mile">
 				<unitPattern count="zero">{0} ميل</unitPattern>
 				<unitPattern count="one">ميل</unitPattern>
@@ -768,40 +784,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
-			<unit type="angle-revolution">
-				<unitPattern count="two">دورتان</unitPattern>
-				<unitPattern count="few">{0} دورات</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="two">هكتاران</unitPattern>
-				<unitPattern count="few">{0} هكتارات</unitPattern>
-				<unitPattern count="many">{0} هكتارًا</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="two">فدانان</unitPattern>
-				<unitPattern count="few">{0} أفدنة</unitPattern>
-				<unitPattern count="many">{0} فدانًا</unitPattern>
-			</unit>
-			<unit type="concentr-karat">
-				<unitPattern count="two">قيراطان</unitPattern>
-				<unitPattern count="few">{0} قراريط</unitPattern>
-				<unitPattern count="many">{0} قيراطًا</unitPattern>
-			</unit>
-			<unit type="concentr-permillion">
-				<unitPattern count="two">جزءان/مليون</unitPattern>
-				<unitPattern count="few">{0} أجزاء/مليون</unitPattern>
-				<unitPattern count="many">{0} جزءًا/مليون</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<unitPattern count="two">ميلان/غالون</unitPattern>
-				<unitPattern count="few">{0} أميال/غالون</unitPattern>
-				<unitPattern count="many">{0} ميلًا/غالون</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon-imperial">
-				<unitPattern count="two">ميلان/غ. إمبراطوري</unitPattern>
-				<unitPattern count="few">{0} أميال/غ. إمبراطوري</unitPattern>
-				<unitPattern count="many">{0} ميلًا/غ. إمبراطوري</unitPattern>
-			</unit>
 			<unit type="duration-year">
 				<unitPattern count="zero">{0} سنة</unitPattern>
 				<unitPattern count="one">سنة</unitPattern>
@@ -810,32 +792,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} سنة</unitPattern>
 				<unitPattern count="other">{0} سنة</unitPattern>
 			</unit>
-			<unit type="length-yard">
-				<unitPattern count="two">ياردتان</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="two">قدمان</unitPattern>
-				<unitPattern count="few">{0} أقدام</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="two">فرسخان فلكيان</unitPattern>
-				<unitPattern count="few">{0} فراسخ فلكية</unitPattern>
-				<unitPattern count="many">{0} فرسخًا فلكيًا</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="two">ميلان بحريان</unitPattern>
-				<unitPattern count="few">{0} أميال بحرية</unitPattern>
-				<unitPattern count="many">{0} ميلًا بحريًا</unitPattern>
-			</unit>
-			<unit type="length-mile-scandinavian">
-				<unitPattern count="two">ميلان اسكندنافيان</unitPattern>
-				<unitPattern count="few">{0} أميال اسكندنافية</unitPattern>
-				<unitPattern count="many">{0} ميلًا اسكندنافيًا</unitPattern>
-			</unit>
-			<unit type="light-solar-luminosity">
-				<unitPattern count="two">ضياءان شمسيان</unitPattern>
-				<unitPattern count="few">{0} ضياءات شمسية</unitPattern>
-				<unitPattern count="many">{0} ضياءً شمسيًا</unitPattern>
+			<unit type="duration-month">
+				<unitPattern count="zero">{0} شهر</unitPattern>
+				<unitPattern count="one">شهر</unitPattern>
+				<unitPattern count="two">شهران</unitPattern>
+				<unitPattern count="few">{0} أشهر</unitPattern>
+				<unitPattern count="many">{0} شهرًا</unitPattern>
+				<unitPattern count="other">{0} شهر</unitPattern>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>كغم</displayName>
@@ -855,87 +818,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} غم</unitPattern>
 				<unitPattern count="other">{0} غم</unitPattern>
 			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="two">طنان</unitPattern>
-				<unitPattern count="few">{0} أطنان</unitPattern>
-				<unitPattern count="many">{0} طنًا</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="two">رطلان</unitPattern>
-				<unitPattern count="few">{0} أرطال</unitPattern>
-				<unitPattern count="many">{0} رطلُا</unitPattern>
-			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="two">قيراطان</unitPattern>
-				<unitPattern count="few">{0} قراريط</unitPattern>
-				<unitPattern count="many">{0} قيراطًا</unitPattern>
-			</unit>
-			<unit type="mass-earth-mass">
-				<unitPattern count="two">كتلتان أرضيتان</unitPattern>
-				<unitPattern count="few">{0} كتل أرضية</unitPattern>
-			</unit>
-			<unit type="mass-solar-mass">
-				<unitPattern count="two">كتلتان شمسيتان</unitPattern>
-				<unitPattern count="few">{0} كتل شمسية</unitPattern>
-			</unit>
-			<unit type="pressure-pound-force-per-square-inch">
-				<unitPattern count="two">رطلان/بوصة²</unitPattern>
-				<unitPattern count="few">{0} أرطال/بوصة²</unitPattern>
-				<unitPattern count="many">{0} رطلًا/بوصة²</unitPattern>
-			</unit>
-			<unit type="pressure-kilopascal">
-				<displayName>كيلوباسكال</displayName>
-				<unitPattern count="zero">{0} كيلوباسكال</unitPattern>
-				<unitPattern count="one">{0} كيلوباسكال</unitPattern>
-				<unitPattern count="two">{0} كيلوباسكال</unitPattern>
-				<unitPattern count="few">{0} كيلوباسكال</unitPattern>
-				<unitPattern count="many">{0} كيلوباسكال</unitPattern>
-				<unitPattern count="other">{0} كيلوباسكال</unitPattern>
-			</unit>
-			<unit type="pressure-megapascal">
-				<displayName>ميغاباسكال</displayName>
-				<unitPattern count="zero">{0} ميغاباسكال</unitPattern>
-				<unitPattern count="one">{0} ميغاباسكال</unitPattern>
-				<unitPattern count="two">{0} ميغاباسكال</unitPattern>
-				<unitPattern count="few">{0} ميغاباسكال</unitPattern>
-				<unitPattern count="many">{0} ميغاباسكال</unitPattern>
-				<unitPattern count="other">{0} ميغاباسكال</unitPattern>
-			</unit>
-			<unit type="speed-knot">
-				<unitPattern count="two">عقدتان</unitPattern>
-				<unitPattern count="few">{0} عقد</unitPattern>
-			</unit>
-			<unit type="temperature-kelvin">
-				<displayName>درجة كلفن</displayName>
-				<unitPattern count="zero">{0} درجة كلفن</unitPattern>
-				<unitPattern count="one">{0} درجة كلفن</unitPattern>
-				<unitPattern count="two">{0} درجة كلفن</unitPattern>
-				<unitPattern count="few">{0} درجة كلفن</unitPattern>
-				<unitPattern count="many">{0} درجة كلفن</unitPattern>
-				<unitPattern count="other">{0} درجة كلفن</unitPattern>
-			</unit>
-			<unit type="volume-pint-metric">
-				<unitPattern count="two">مكيالان متريان</unitPattern>
-				<unitPattern count="few">{0} مكاييل مترية</unitPattern>
-				<unitPattern count="many">{0} مكيالًا متريًا</unitPattern>
-			</unit>
-			<unit type="volume-cup-metric">
-				<unitPattern count="two">كوبان متريان</unitPattern>
-				<unitPattern count="few">{0} أكواب مترية</unitPattern>
-				<unitPattern count="many">{0} كوبًا متريًا</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="two">كوبان</unitPattern>
-				<unitPattern count="few">{0} أكواب</unitPattern>
-				<unitPattern count="many">{0} كوبًا</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="two">أونصتان سائلتان</unitPattern>
-			</unit>
-			<unit type="volume-teaspoon">
-				<unitPattern count="two">{0} ملعقتان ص</unitPattern>
-				<unitPattern count="few">{0} ملاعق ص</unitPattern>
-			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="south">{0} جنوب</coordinateUnitPattern>
 				<coordinateUnitPattern type="west">{0} غرب</coordinateUnitPattern>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="arn"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="arn">Mapudungun</language>
-		</languages>
-	</localeDisplayNames>
-	<layout>
-		<orientation>
-			<characterOrder>left-to-right</characterOrder>
-			<lineOrder>top-to-bottom</lineOrder>
-		</orientation>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a {ch} d e f g i k l ḻ {ll} m n ñ ṉ {ng} o p r s {sh} t ṯ {tr} u ü w y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[b c h j q x z]</exemplarCharacters>
-		<exemplarCharacters type="index">[A {CH} D E F G I K L Ḻ {LL} M N Ñ Ṉ {NG} O P R S {SH} T Ṯ {TR} U Ü W Y]</exemplarCharacters>
-	</characters>
-</ldml>

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="arn"/>
-		<territory type="CL"/>
-	</identity>
-</ldml>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
+<!-- Copyright © 1991-2022 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-DFS-2016
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

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

@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="az"/>
-		<script type="Arab"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ab">آبخازجا</language>
-			<language type="af">آفریکانس</language>
-			<language type="agq">آقمجه</language>
-			<language type="ak">آکانجا</language>
-			<language type="am">آمهارجا</language>
-			<language type="ar">عربجه</language>
-			<language type="ar_001">استاندارد عربجه</language>
-			<language type="as">آسامجا</language>
-			<language type="asa">آسوجا</language>
-			<language type="az">آذربایجان تۆرکجه‌سی</language>
-			<language type="az" alt="short">آذریجه</language>
-			<language type="az_Arab">تۆرکجه</language>
-			<language type="ba">باشقیرجا</language>
-			<language type="be">بئلاروسجا</language>
-			<language type="bem">بئمباجا</language>
-			<language type="bez">بئناجا</language>
-			<language type="bg">بۇلقارجا</language>
-			<language type="bgn">دوْغو بلوچجا</language>
-			<language type="bm">بامباراجا</language>
-			<language type="bn">بنگالجا</language>
-			<language type="br">برئتونجا</language>
-			<language type="brx">بوْدوجا</language>
-			<language type="bs">بوْسنیاجا</language>
-			<language type="ca">کاتالانجا</language>
-			<language type="ce">چئچئنجه</language>
-			<language type="cgg">چیقاجا</language>
-			<language type="chr">چئروکیجه</language>
-			<language type="ckb">اوْرتا کۆردجه</language>
-			<language type="co">کوْرسیکاجا</language>
-			<language type="cs">چئکجه</language>
-			<language type="cv">چۇواشجا</language>
-			<language type="da">دانجا</language>
-			<language type="de">آلمانجا</language>
-			<language type="dua">دۇالاجا</language>
-			<language type="dz">دزونگخا</language>
-			<language type="ebu">ائمبوجا</language>
-			<language type="ee">اِوه‌جه</language>
-			<language type="el">یونانجا</language>
-			<language type="en">اینگیلیزجه</language>
-			<language type="eo">اِسپرانتو</language>
-			<language type="es">اسپانیاجا</language>
-			<language type="es_419">لاتین آمریکا اسپانیاجاسی</language>
-			<language type="es_ES">اۇروپا اسپانیاجاسی</language>
-			<language type="es_MX">مکزیک اسپانیاجاسی</language>
-			<language type="et">اِستونجا</language>
-			<language type="eu">باسکجا</language>
-			<language type="fa">فارسجا</language>
-			<language type="fi">فینجه</language>
-			<language type="fil">فیلیپینجه</language>
-			<language type="fj">فیجیجه</language>
-			<language type="fo">فاروئه‌جه</language>
-			<language type="fr">فرانساجا</language>
-			<language type="gag">قاقائوزجا</language>
-			<language type="gl">قالیسیاجا</language>
-			<language type="gsw">سویس آلمانجاسی</language>
-			<language type="he">عبریجه</language>
-			<language type="hi">هیندجه</language>
-			<language type="hr">کروواسجا</language>
-			<language type="hy">ائرمنیجه</language>
-			<language type="it">ایتالیاجا</language>
-			<language type="ja">ژاپونجا</language>
-			<language type="ka">گۆرجوجه</language>
-			<language type="kk">قازاقجا</language>
-			<language type="km">خمئرجه</language>
-			<language type="ko">کوْره‌جه</language>
-			<language type="ks">کشمیرجه</language>
-			<language type="ksf">بافیاجا</language>
-			<language type="ku">کۆردجه</language>
-			<language type="kw">کوْرنجا</language>
-			<language type="ky">قیرقیزجا</language>
-			<language type="la">لاتینجه</language>
-			<language type="lg">قانداجا</language>
-			<language type="lrc">قۇزئی لوْرجه</language>
-			<language type="mk">مقدونیجه</language>
-			<language type="mn">موْغولجا</language>
-			<language type="my">بۇرماجا</language>
-			<language type="mzn">مازنیجه</language>
-			<language type="nl">هوْلندجه</language>
-			<language type="pa">پنجابجا</language>
-			<language type="ps">پشتوجه</language>
-			<language type="pt">پوْرتغالجه</language>
-			<language type="ro">رومانیاجا</language>
-			<language type="ru">روسجا</language>
-			<language type="sd">سیندیجه</language>
-			<language type="sdh">گۆنئی کۆردجه</language>
-			<language type="sk">اسلواکجا</language>
-			<language type="sq">آلبانیاجا</language>
-			<language type="sr">صربجه</language>
-			<language type="sv">سوئدجه</language>
-			<language type="sw">سواحیلیجه</language>
-			<language type="sw_CD">کوْنقو سواحیلیسی</language>
-			<language type="ta">تامیلجه</language>
-			<language type="tg">تاجیکجه</language>
-			<language type="tk">تۆرکمنجه</language>
-			<language type="tr">آنادولو تۆرکجه‌سی</language>
-			<language type="tt">تاتارجا</language>
-			<language type="ug">اۇیغورجا</language>
-			<language type="uk">اۇکراینجا</language>
-			<language type="und">تانینمایان دیل</language>
-			<language type="ur">اوْردوجا</language>
-			<language type="uz">اؤزبکجه</language>
-			<language type="vi">ویتنامجا</language>
-			<language type="zh">چینجه</language>
-			<language type="zh_Hans">ساده‌لنمیش چینجه</language>
-			<language type="zh_Hant">سنتی چینجه</language>
-			<language type="zu">زۇلوجا</language>
-		</languages>
-		<scripts>
-			<script type="Arab">عربجه</script>
-			<script type="Armn">ائرمنیجه</script>
-			<script type="Beng">بنگالجا</script>
-			<script type="Brai">بریل</script>
-			<script type="Cyrl">سریلیکجه</script>
-			<script type="Geor">گۆرجوجه</script>
-			<script type="Grek">یونانجا</script>
-			<script type="Hans">ساده‌لنمیش</script>
-			<script type="Hans" alt="stand-alone">ساده‌لنمیش هانجا</script>
-			<script type="Hant">سنتی</script>
-			<script type="Hant" alt="stand-alone">سنتی هانجا</script>
-			<script type="Hebr">عبریجه</script>
-			<script type="Hira">هیراگانا</script>
-			<script type="Jpan">ژاپونجا</script>
-			<script type="Kana">کاتاکانا</script>
-			<script type="Khmr">خمئرجه</script>
-			<script type="Kore">کوْره‌جه</script>
-			<script type="Latn">لاتینجه</script>
-			<script type="Mong">موْغولجا</script>
-			<script type="Taml">تامیلجه</script>
-			<script type="Tibt">تبتجه</script>
-			<script type="Zsym">سمبول‌لار</script>
-			<script type="Zxxx">یازیلمایان</script>
-			<script type="Zyyy">اوْرتاق</script>
-			<script type="Zzzz">تانینمایان خط</script>
-		</scripts>
-		<territories>
-			<territory type="001">دۆنیا</territory>
-		</territories>
-		<codePatterns>
-			<codePattern type="language">دیل: {0}</codePattern>
-			<codePattern type="script">یازی: {0}</codePattern>
-			<codePattern type="territory">بؤلگه: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<orientation>
-			<characterOrder>right-to-left</characterOrder>
-			<lineOrder>top-to-bottom</lineOrder>
-		</orientation>
-	</layout>
-	<characters>
-		<exemplarCharacters>[آ ؤ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ۆ ۇ ی ؽ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C\u200D\u200E\u200F \u064E \u064F \u0650 \u0652 إ ك ڭ ى ي]</exemplarCharacters>
-		<exemplarCharacters type="index">[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐ ‑ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]</exemplarCharacters>
-		<ellipsis type="final">{0}…</ellipsis>
-		<ellipsis type="initial">…{0}</ellipsis>
-		<ellipsis type="medial">{0}…{1}</ellipsis>
-		<ellipsis type="word-final">{0} …</ellipsis>
-		<ellipsis type="word-initial">… {0}</ellipsis>
-		<ellipsis type="word-medial">{0} … {1}</ellipsis>
-		<moreInformation>؟</moreInformation>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>‹</alternateQuotationStart>
-		<alternateQuotationEnd>›</alternateQuotationEnd>
-	</delimiters>
-	<numbers>
-		<defaultNumberingSystem draft="contributed">arabext</defaultNumberingSystem>
-		<otherNumberingSystems>
-			<native draft="contributed">arabext</native>
-		</otherNumberingSystems>
-		<symbols numberSystem="arabext">
-			<timeSeparator>:</timeSeparator>
-		</symbols>
-	</numbers>
-</ldml>

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

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="az"/>
-		<script type="Arab"/>
-		<territory type="IQ"/>
-	</identity>
-</ldml>

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

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2023 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-DFS-2016
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
-<ldml>
-	<identity>
-		<version number="$Revision$"/>
-		<language type="az"/>
-		<script type="Arab"/>
-		<territory type="IR"/>
-	</identity>
-</ldml>