Merge checker annotaions from JDK 21 to JDK 25.

.azure/azure-pipelines.yml

@@ -8,7 +8,7 @@ jobs:
 - job: build_jdk
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk21-plus:latest
+  container: mdernst/cf-ubuntu-jdk25-plus:latest
   steps:
   - bash: |
       whoami
@@ -17,7 +17,7 @@ jobs:
       ls -al
       env | sort
     displayName: show environment
-  - bash: pwd && ls && bash ./configure --with-jtreg=/usr/share/jtreg --disable-warnings-as-errors
+  - bash: pwd && ls && bash ./configure --with-jtreg=/usr/share/jtreg --disable-warnings-as-errors --with-copyright-year=2026
     displayName: configure
   - bash: make jdk
     timeoutInMinutes: 90
@@ -29,10 +29,10 @@ jobs:
   # - bash: make -C /jdk run-test-tier1
   #   displayName: make run-test-tier1
 
-- job: build_jdk21u
+- job: build_jdk25u
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk21-plus:latest
+  container: mdernst/cf-ubuntu-jdk25-plus:latest
   timeoutInMinutes: 0
   steps:
   - bash: |
@@ -56,29 +56,29 @@ jobs:
         else mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/plume-scripts.git ; \
       fi
     displayName: plume-scripts
-  # This creates ../jdk21u .
+  # This creates ../jdk25u .
   # Run `git-clone-related` without a limit on depth, because if the depth is
   # too small, the merge will fail.  Don't use "--filter=blob:none" because that
   # leads to "fatal: remote error:  filter 'combine' not supported".
   - bash: |
       set -ex
       echo "pwd = $(pwd)"
-      if test -d ../jdk21u; then
-        echo "../jdk21u should not exist yet"
+      if test -d ../jdk25u; then
+        echo "../jdk25u should not exist yet"
         false
       fi
       df .
-      /tmp/$USER/git-scripts/git-clone-related typetools jdk21u ../jdk21u --single-branch
+      /tmp/$USER/git-scripts/git-clone-related Gaoyan1999 jdk25u ../jdk25u --single-branch
       git config --global user.email "you@example.com"
       git config --global user.name "Your Name"
       git config --global core.longpaths true
       git config --global core.protectNTFS false
-      cd ../jdk21u
+      cd ../jdk25u
       git diff --exit-code
       echo $?
-    displayName: clone-related-jdk21u
+    displayName: clone-related-jdk25u
   - bash: |
-      cd ../jdk21u && git status
+      cd ../jdk25u && git status
       eval $(/tmp/$USER/plume-scripts/ci-info typetools)
       set
       echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
@@ -91,25 +91,25 @@ jobs:
       git config --global pull.rebase false
       git config --global core.longpaths true
       git config --global core.protectNTFS false
-      cd ../jdk21u && git status
+      cd ../jdk25u && git status
       eval $(/tmp/$USER/plume-scripts/ci-info typetools)
       set
       echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
-      cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
+      cd ../jdk25u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
     displayName: git merge
-  - bash: cd ../jdk21u && export JT_HOME=/usr/share/jtreg && bash ./configure --with-jtreg --disable-warnings-as-errors
+  - bash: cd ../jdk25u && export JT_HOME=/usr/share/jtreg && bash ./configure --with-jtreg --disable-warnings-as-errors
     displayName: configure
-  - bash: cd ../jdk21u && make jdk
+  - bash: cd ../jdk25u && make jdk
     displayName: make jdk
   ## This works only after `make images`
-  # - bash: cd ../jdk21u && build/*/images/jdk/bin/java -version
+  # - bash: cd ../jdk25u && build/*/images/jdk/bin/java -version
   #   displayName: version
-  # - bash: make -C /jdk21u run-test-tier1
+  # - bash: make -C /jdk25u run-test-tier1
   #   timeoutInMinutes: 0
   #   displayName: make run-test-tier1
-  # - bash: make -C /jdk21u :test/jdk:tier1
+  # - bash: make -C /jdk25u :test/jdk:tier1
   ## Temporarily comment out because of trouble finding junit and jasm
-  # - bash: cd ../jdk21u && make run-test TEST="jtreg:test/jdk:tier1"
+  # - bash: cd ../jdk25u && make run-test TEST="jtreg:test/jdk:tier1"
   #   timeoutInMinutes: 0
   #   displayName: make run-test
 

.azure/azure-pipelines.yml.m4

@@ -11,7 +11,7 @@ jobs:
 - job: build_jdk
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk21-plus:latest
+  container: mdernst/cf-ubuntu-jdk25-plus:latest
   steps:
   - bash: |
       whoami
@@ -20,7 +20,7 @@ jobs:
       ls -al
       env | sort
     displayName: show environment
-  - bash: pwd && ls && bash ./configure --with-jtreg=/usr/share/jtreg --disable-warnings-as-errors
+  - bash: pwd && ls && bash ./configure --with-jtreg=/usr/share/jtreg --disable-warnings-as-errors --with-copyright-year=2026
     displayName: configure
   - bash: make jdk
     timeoutInMinutes: 90
@@ -32,10 +32,10 @@ jobs:
   # - bash: make -C /jdk run-test-tier1
   #   displayName: make run-test-tier1
 
-- job: build_jdk21u
+- job: build_jdk25u
   pool:
     vmImage: 'ubuntu-latest'
-  container: mdernst/cf-ubuntu-jdk21-plus:latest
+  container: mdernst/cf-ubuntu-jdk25-plus:latest
   timeoutInMinutes: 0
   steps:
   - bash: |
@@ -59,29 +59,29 @@ jobs:
         else mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/plume-scripts.git ; \
       fi
     displayName: plume-scripts
-  # This creates ../jdk21u .
+  # This creates ../jdk25u .
   # Run `git-clone-related` without a limit on depth, because if the depth is
   # too small, the merge will fail.  Don't use "--filter=blob:none" because that
   # leads to "fatal: remote error:  filter 'combine' not supported".
   - bash: |
       set -ex
       echo "pwd = $(pwd)"
-      if test -d ../jdk21u; then
-        echo "../jdk21u should not exist yet"
+      if test -d ../jdk25u; then
+        echo "../jdk25u should not exist yet"
         false
       fi
       df .
-      /tmp/$USER/git-scripts/git-clone-related typetools jdk21u ../jdk21u --single-branch
+      /tmp/$USER/git-scripts/git-clone-related Gaoyan1999 jdk25u ../jdk25u --single-branch
       git config --global user.email "you@example.com"
       git config --global user.name "Your Name"
       git config --global core.longpaths true
       git config --global core.protectNTFS false
-      cd ../jdk21u
+      cd ../jdk25u
       git diff --exit-code
       echo $?
-    displayName: clone-related-jdk21u
+    displayName: clone-related-jdk25u
   - bash: |
-      cd ../jdk21u && git status
+      cd ../jdk25u && git status
       eval $(/tmp/$USER/plume-scripts/ci-info typetools)
       set
       echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
@@ -94,25 +94,25 @@ jobs:
       git config --global pull.rebase false
       git config --global core.longpaths true
       git config --global core.protectNTFS false
-      cd ../jdk21u && git status
+      cd ../jdk25u && git status
       eval $(/tmp/$USER/plume-scripts/ci-info typetools)
       set
       echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
-      cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
+      cd ../jdk25u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
     displayName: git merge
-  - bash: cd ../jdk21u && export JT_HOME=/usr/share/jtreg && bash ./configure --with-jtreg --disable-warnings-as-errors
+  - bash: cd ../jdk25u && export JT_HOME=/usr/share/jtreg && bash ./configure --with-jtreg --disable-warnings-as-errors
     displayName: configure
-  - bash: cd ../jdk21u && make jdk
+  - bash: cd ../jdk25u && make jdk
     displayName: make jdk
   ## This works only after `make images`
-  # - bash: cd ../jdk21u && build/*/images/jdk/bin/java -version
+  # - bash: cd ../jdk25u && build/*/images/jdk/bin/java -version
   #   displayName: version
-  # - bash: make -C /jdk21u run-test-tier1
+  # - bash: make -C /jdk25u run-test-tier1
   #   timeoutInMinutes: 0
   #   displayName: make run-test-tier1
-  # - bash: make -C /jdk21u :test/jdk:tier1
+  # - bash: make -C /jdk25u :test/jdk:tier1
   ## Temporarily comment out because of trouble finding junit and jasm
-  # - bash: cd ../jdk21u && make run-test TEST="jtreg:test/jdk:tier1"
+  # - bash: cd ../jdk25u && make run-test TEST="jtreg:test/jdk:tier1"
   #   timeoutInMinutes: 0
   #   displayName: make run-test
 

.editorconfig

@@ -0,0 +1,14 @@
+root = true
+
+[*]
+charset = utf-8
+
+[*.{cpp,hpp,c,h,java,cc,hh,m,mm,S,md,properties,gmk,m4,ac}]
+trim_trailing_whitespace = true
+
+[Makefile]
+trim_trailing_whitespace = true
+
+[src/hotspot/**.{cpp,hpp,h}]
+indent_style = space
+indent_size = 2

.gitattributes

@@ -1 +1,11 @@
 *	-text
+*	encoding=utf-8
+*.java	diff=java
+*.c	diff=cpp
+*.h	diff=cpp
+*.cpp	diff=cpp
+*.hpp	diff=cpp
+*.md	diff=markdown
+*.sh	diff=bash
+*.html	diff=html
+*.css	diff=css

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

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

.github/actions/config/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,6 @@ runs:
       id: read-config
       run: |
         # Extract value from configuration file
-        value="$(grep -h ${{ inputs.var }}= make/conf/github-actions.conf | cut -d '=' -f 2-)"
+        value="$(grep -h '^${{ inputs.var }}'= make/conf/github-actions.conf | cut -d '=' -f 2-)"
         echo "value=$value" >> $GITHUB_OUTPUT
       shell: bash

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ runs:
     - name: 'Build'
       id: build
       run: >
-        make LOG=info ${{ inputs.make-target }}
+        make -k LOG=info ${{ inputs.make-target }}
         || bash ./.github/scripts/gen-build-failure-report.sh "$GITHUB_STEP_SUMMARY"
       shell: bash
 
@@ -66,15 +66,15 @@ runs:
       shell: bash
 
     - name: 'Upload build logs'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: failure-logs-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: failure-logs
       if: steps.check.outputs.failure == 'true'
 
       # This is the best way I found to abort the job with an error message
     - name: 'Notify about build failures'
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         script: core.setFailed('Build failed. See summary for details.')
       if: steps.check.outputs.failure == 'true'

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@ runs:
 
     - name: 'Check cache for BootJDK'
       id: get-cached-bootjdk
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: bootjdk/jdk
         key: boot-jdk-${{ inputs.platform }}-${{ steps.sha256.outputs.value }}
@@ -104,6 +104,6 @@ runs:
     - name: 'Export path to where BootJDK is installed'
       id: path-name
       run: |
-        # Export the path
-        echo 'path=bootjdk/jdk' >> $GITHUB_OUTPUT
+        # Export the absolute path
+        echo "path=`pwd`/bootjdk/jdk" >> $GITHUB_OUTPUT
       shell: bash