From a7a25c2fe6e7c9a846e24e5f79fec67d5db3f931 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 18:33:15 -0400 Subject: [PATCH 01/13] GEODE-10597: Fix verifyManifestClassPath failure in geode-assembly --- .../resources/assembly_content.txt | 23 ++++++++-------- .../resources/gfsh_dependency_classpath.txt | 26 +++++++++---------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index 7f1edd3d1ab..eacc877be72 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -968,6 +968,7 @@ lib/jackson-annotations-2.21.jar lib/jackson-core-2.21.5.jar lib/jackson-databind-2.21.5.jar lib/jackson-dataformat-yaml-2.21.5.jar +lib/jackson-datatype-jdk8-2.21.5.jar lib/jackson-datatype-joda-2.21.5.jar lib/jackson-datatype-jsr310-2.21.5.jar lib/jakarta.activation-api-2.1.3.jar @@ -1032,17 +1033,17 @@ lib/ra.jar lib/reactive-streams-1.0.4.jar lib/reactor-core-3.6.10.jar lib/rmiio-2.1.2.jar -lib/shiro-cache-2.2.1.jar -lib/shiro-config-core-2.2.1.jar -lib/shiro-config-ogdl-2.2.1.jar -lib/shiro-core-2.2.1.jar -lib/shiro-crypto-cipher-2.2.1.jar -lib/shiro-crypto-core-2.2.1.jar -lib/shiro-crypto-hash-2.2.1.jar -lib/shiro-event-2.2.1.jar -lib/shiro-hashes-argon2-2.2.1.jar -lib/shiro-hashes-bcrypt-2.2.1.jar -lib/shiro-lang-2.2.1.jar +lib/shiro-cache-2.1.0.jar +lib/shiro-config-core-2.1.0.jar +lib/shiro-config-ogdl-2.1.0.jar +lib/shiro-core-2.1.0.jar +lib/shiro-crypto-cipher-2.1.0.jar +lib/shiro-crypto-core-2.1.0.jar +lib/shiro-crypto-hash-2.1.0.jar +lib/shiro-event-2.1.0.jar +lib/shiro-hashes-argon2-2.1.0.jar +lib/shiro-hashes-bcrypt-2.1.0.jar +lib/shiro-lang-2.1.0.jar lib/slf4j-api-2.0.17.jar lib/snakeyaml-2.5.jar lib/snappy-0.5.jar diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt index efbfffd9e63..72435fcb718 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -21,11 +21,11 @@ spring-shell-starter-3.3.3.jar spring-web-6.1.21.jar commons-lang3-3.18.0.jar rmiio-2.1.2.jar -jackson-datatype-joda-2.21.5.jar -jackson-annotations-2.21.jar +jackson-datatype-jsr310-2.21.5.jar jackson-dataformat-yaml-2.21.5.jar +jackson-datatype-joda-2.21.5.jar jackson-core-2.21.5.jar -jackson-datatype-jsr310-2.21.5.jar +jackson-datatype-jdk8-2.21.5.jar jackson-databind-2.21.5.jar swagger-annotations-2.2.22.jar jaxb-runtime-4.0.2.jar @@ -66,8 +66,8 @@ HikariCP-4.0.3.jar antlr-2.7.7.jar istack-commons-runtime-4.1.1.jar commons-validator-1.7.jar -shiro-core-2.2.1.jar -shiro-config-ogdl-2.2.1.jar +shiro-core-2.1.0.jar +shiro-config-ogdl-2.1.0.jar commons-beanutils-1.11.0.jar commons-codec-1.15.jar commons-collections-3.2.2.jar @@ -102,15 +102,12 @@ jetty-security-12.0.33.jar jetty-server-12.0.33.jar snappy-0.5.jar jgroups-3.6.20.Final.jar -shiro-cache-2.2.1.jar -shiro-crypto-hash-2.2.1.jar -shiro-crypto-cipher-2.2.1.jar -shiro-config-core-2.2.1.jar -shiro-event-2.2.1.jar -shiro-crypto-core-2.2.1.jar -shiro-lang-2.2.1.jar -shiro-hashes-argon2-2.2.1.jar -shiro-hashes-bcrypt-2.2.1.jar +shiro-cache-2.1.0.jar +shiro-crypto-cipher-2.1.0.jar +shiro-config-core-2.1.0.jar +shiro-event-2.1.0.jar +shiro-crypto-core-2.1.0.jar +shiro-lang-2.1.0.jar jetty-xml-12.0.33.jar jetty-http-12.0.33.jar jetty-io-12.0.33.jar @@ -119,6 +116,7 @@ jul-to-slf4j-2.0.17.jar jetty-jndi-12.0.33.jar jetty-util-12.0.33.jar slf4j-api-2.0.17.jar +jackson-annotations-2.21.jar micrometer-observation-1.15.12.jar spring-jcl-6.1.21.jar micrometer-commons-1.15.12.jar From fa03cf0d692de53ffda72dbacfbb1421499aa655 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 18:45:35 -0400 Subject: [PATCH 02/13] Update GH Actions to v4 and fix CodeQL cache error --- .github/workflows/codeql.yml | 5 +++-- .github/workflows/gradle.yml | 40 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 04bd7674e14..c321662aead 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,10 +57,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v4 - name: Setup Java JDK - uses: actions/setup-java@v4.7.1 + if: matrix.language == 'java' + uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index eb9e6cfb21e..5ee854e2363 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -32,9 +32,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'liberica' @@ -57,9 +57,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: | @@ -96,9 +96,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK (include all 3 JDKs in env) - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: | @@ -145,9 +145,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: | @@ -192,9 +192,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -236,9 +236,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -282,9 +282,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -326,9 +326,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -372,9 +372,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -420,9 +420,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} From 401eb3ab526af69c3a08260bad769ddc647a5b65 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 18:49:20 -0400 Subject: [PATCH 03/13] Downgrade CodeQL to v3 and re-apply Java setup condition --- .github/workflows/codeql.yml | 10 ++++----- .github/workflows/gradle.yml | 40 ++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c321662aead..770baae6d5c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,11 +57,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v4.2.2 - name: Setup Java JDK if: matrix.language == 'java' - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.2 with: java-version: 17 distribution: temurin @@ -69,7 +69,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v4 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -83,7 +83,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v4 + uses: github/codeql-action/autobuild@v3 if: matrix.language != 'java' # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -97,4 +97,4 @@ jobs: if: matrix.language == 'java' - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5ee854e2363..5a46f9c3bf8 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -32,9 +32,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.2 with: java-version: '17' distribution: 'liberica' @@ -57,9 +57,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.2 with: distribution: ${{ matrix.distribution }} java-version: | @@ -96,9 +96,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK (include all 3 JDKs in env) - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.2 with: distribution: ${{ matrix.distribution }} java-version: | @@ -145,9 +145,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.2 with: distribution: ${{ matrix.distribution }} java-version: | @@ -192,9 +192,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.2 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -236,9 +236,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.2 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -282,9 +282,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.2 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -326,9 +326,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.2 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -372,9 +372,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.2 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -420,9 +420,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.2 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} From 7abce42b5eb0e030d565d7b2556f6c01bb4fe963 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 18:50:46 -0400 Subject: [PATCH 04/13] Use @v4 major tags for actions to fix version resolution errors --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/gradle.yml | 40 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 770baae6d5c..8ef97a56ab1 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,11 +57,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v4 - name: Setup Java JDK if: matrix.language == 'java' - uses: actions/setup-java@v4.7.2 + uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5a46f9c3bf8..5ee854e2363 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -32,9 +32,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v4.7.2 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'liberica' @@ -57,9 +57,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.2 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: | @@ -96,9 +96,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK (include all 3 JDKs in env) - uses: actions/setup-java@v4.7.2 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: | @@ -145,9 +145,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.2 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: | @@ -192,9 +192,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.2 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -236,9 +236,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.2 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -282,9 +282,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.2 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -326,9 +326,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.2 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -372,9 +372,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.2 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -420,9 +420,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v4.7.2 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} From f8272b1b1ed4b4a8c535a0f65a3552fdf3ed5499 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 18:53:13 -0400 Subject: [PATCH 05/13] Update CodeQL actions to v4 and resolve Node 20 deprecation warnings --- .github/workflows/codeql.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 8ef97a56ab1..c321662aead 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -69,7 +69,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -83,7 +83,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v3 + uses: github/codeql-action/autobuild@v4 if: matrix.language != 'java' # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -97,4 +97,4 @@ jobs: if: matrix.language == 'java' - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 From fddca02732e2688fe1ceb34632a33b8bc89276e4 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 19:04:49 -0400 Subject: [PATCH 06/13] Upgrade actions to v7 and v5 to fully resolve Node 20 deprecation warnings --- .github/workflows/codeql.yml | 4 +-- .github/workflows/gradle.yml | 56 ++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c321662aead..de3e9ffcfed 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,11 +57,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Setup Java JDK if: matrix.language == 'java' - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 17 distribution: temurin diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5ee854e2363..14728e274e6 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -32,9 +32,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: '17' distribution: 'liberica' @@ -57,9 +57,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: ${{ matrix.distribution }} java-version: | @@ -96,9 +96,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK (include all 3 JDKs in env) - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: ${{ matrix.distribution }} java-version: | @@ -127,7 +127,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ test --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: failure() with: name: unit-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -145,9 +145,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: ${{ matrix.distribution }} java-version: | @@ -174,7 +174,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ integrationTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: failure() with: name: integration-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -192,9 +192,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -218,7 +218,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ acceptanceTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: failure() with: name: acceptance-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -236,9 +236,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -264,7 +264,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ geode-wan:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: failure() with: name: wan-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -282,9 +282,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -308,7 +308,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ geode-cq:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: failure() with: name: cq-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -326,9 +326,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -354,7 +354,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ geode-lucene:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: failure() with: name: lucene-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -372,9 +372,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -401,7 +401,7 @@ jobs: geode-gfsh:distributedTest \ geode-web:distributedTest \ geode-web-management:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: failure() with: name: mgmt-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -420,9 +420,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -452,7 +452,7 @@ jobs: geode-old-client:distributedTest \ extensions:geode-modules:distributedTest \ extensions:geode-modules-tomcat10:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: failure() with: name: assembly-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} From 6c08043fdb8c439c2d2fc2ac2ce8366ce2981065 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 19:08:25 -0400 Subject: [PATCH 07/13] Restore Setup Java job in CodeQL matrix while keeping conditional caching --- .github/workflows/codeql.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index de3e9ffcfed..fc0ce393032 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -60,12 +60,11 @@ jobs: uses: actions/checkout@v7 - name: Setup Java JDK - if: matrix.language == 'java' uses: actions/setup-java@v5 with: java-version: 17 distribution: temurin - cache: gradle + cache: ${{ matrix.language == 'java' && 'gradle' || '' }} # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL From aa9d37194633be95c184b8c799b47de36b3ac45f Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 19:17:32 -0400 Subject: [PATCH 08/13] Explicitly split Setup Java job in CodeQL matrix for better compatibility --- .github/workflows/codeql.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index fc0ce393032..faef40155c8 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -60,11 +60,19 @@ jobs: uses: actions/checkout@v7 - name: Setup Java JDK + if: matrix.language == 'java' + uses: actions/setup-java@v5 + with: + java-version: 17 + distribution: temurin + cache: gradle + + - name: Setup Java JDK (No Cache) + if: matrix.language != 'java' uses: actions/setup-java@v5 with: java-version: 17 distribution: temurin - cache: ${{ matrix.language == 'java' && 'gradle' || '' }} # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL From 5944bf3e4360796c3d25f4d988f4a7028ddb559d Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 19:21:03 -0400 Subject: [PATCH 09/13] Restore single Setup Java job in CodeQL matrix for parity with develop --- .github/workflows/codeql.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index faef40155c8..1c382a9478f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -60,20 +60,12 @@ jobs: uses: actions/checkout@v7 - name: Setup Java JDK - if: matrix.language == 'java' uses: actions/setup-java@v5 with: java-version: 17 distribution: temurin cache: gradle - - name: Setup Java JDK (No Cache) - if: matrix.language != 'java' - uses: actions/setup-java@v5 - with: - java-version: 17 - distribution: temurin - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v4 From e22bdb63903a5bf2e9456691e0be64c2823090b1 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 19:25:44 -0400 Subject: [PATCH 10/13] Correct GitHub Action versions to @v4 to resolve Node runtime deprecations while maintaining stability --- .github/workflows/codeql.yml | 12 ++++++-- .github/workflows/gradle.yml | 56 ++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1c382a9478f..1c8e293bafe 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,15 +57,23 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v7 + uses: actions/checkout@v4 - name: Setup Java JDK - uses: actions/setup-java@v5 + if: matrix.language == 'java' + uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin cache: gradle + - name: Setup Java JDK (No Cache) + if: matrix.language != 'java' + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: temurin + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v4 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 14728e274e6..5ee854e2363 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -32,9 +32,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'liberica' @@ -57,9 +57,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: | @@ -96,9 +96,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@v4 - name: Set up JDK (include all 3 JDKs in env) - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: | @@ -127,7 +127,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ test --console=plain --no-daemon - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@v4 if: failure() with: name: unit-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -145,9 +145,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: | @@ -174,7 +174,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ integrationTest --console=plain --no-daemon - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@v4 if: failure() with: name: integration-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -192,9 +192,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -218,7 +218,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ acceptanceTest --console=plain --no-daemon - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@v4 if: failure() with: name: acceptance-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -236,9 +236,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -264,7 +264,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ geode-wan:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@v4 if: failure() with: name: wan-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -282,9 +282,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -308,7 +308,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ geode-cq:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@v4 if: failure() with: name: cq-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -326,9 +326,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -354,7 +354,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ geode-lucene:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@v4 if: failure() with: name: lucene-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -372,9 +372,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -401,7 +401,7 @@ jobs: geode-gfsh:distributedTest \ geode-web:distributedTest \ geode-web-management:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@v4 if: failure() with: name: mgmt-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -420,9 +420,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -452,7 +452,7 @@ jobs: geode-old-client:distributedTest \ extensions:geode-modules:distributedTest \ extensions:geode-modules-tomcat10:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v7 + - uses: actions/upload-artifact@v4 if: failure() with: name: assembly-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} From 3ce0e206180702077e7e3cde2d12e072af5fbfe7 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 19:52:10 -0400 Subject: [PATCH 11/13] Restore original GitHub Actions workflows from develop branch --- .github/workflows/codeql.yml | 12 ++--------- .github/workflows/gradle.yml | 40 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1c8e293bafe..04bd7674e14 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,23 +57,15 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v4.2.2 - name: Setup Java JDK - if: matrix.language == 'java' - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: java-version: 17 distribution: temurin cache: gradle - - name: Setup Java JDK (No Cache) - if: matrix.language != 'java' - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: temurin - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v4 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5ee854e2363..eb9e6cfb21e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -32,9 +32,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: java-version: '17' distribution: 'liberica' @@ -57,9 +57,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: distribution: ${{ matrix.distribution }} java-version: | @@ -96,9 +96,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK (include all 3 JDKs in env) - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: distribution: ${{ matrix.distribution }} java-version: | @@ -145,9 +145,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: distribution: ${{ matrix.distribution }} java-version: | @@ -192,9 +192,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -236,9 +236,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -282,9 +282,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -326,9 +326,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -372,9 +372,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -420,9 +420,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} From 7a962565ba0079fb699c2bb802aa127bc91aade7 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 28 Jul 2026 19:59:01 -0400 Subject: [PATCH 12/13] Pin actions to latest SHAs supporting Node 24 per GitHub documentation --- .github/workflows/codeql.yml | 10 +++---- .github/workflows/gradle.yml | 56 ++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 04bd7674e14..07c6b4dcaaa 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,10 +57,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4.2.2 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Setup Java JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: java-version: 17 distribution: temurin @@ -68,7 +68,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v4 + uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -82,7 +82,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v4 + uses: github/codeql-action/autobuild@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3 if: matrix.language != 'java' # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -96,4 +96,4 @@ jobs: if: matrix.language == 'java' - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4 + uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index eb9e6cfb21e..538ded60cca 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -32,9 +32,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK 17 - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: java-version: '17' distribution: 'liberica' @@ -57,9 +57,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: distribution: ${{ matrix.distribution }} java-version: | @@ -96,9 +96,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK (include all 3 JDKs in env) - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: distribution: ${{ matrix.distribution }} java-version: | @@ -127,7 +127,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ test --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 if: failure() with: name: unit-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -145,9 +145,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: distribution: ${{ matrix.distribution }} java-version: | @@ -174,7 +174,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ integrationTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 if: failure() with: name: integration-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -192,9 +192,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -218,7 +218,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ acceptanceTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 if: failure() with: name: acceptance-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -236,9 +236,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -264,7 +264,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ geode-wan:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 if: failure() with: name: wan-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -282,9 +282,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -308,7 +308,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ geode-cq:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 if: failure() with: name: cq-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -326,9 +326,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -354,7 +354,7 @@ jobs: -PtestJVMVer=${JAVA_TEST_VERSION} \ -PtestJava17Home=${JAVA_HOME_17_X64} \ geode-lucene:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 if: failure() with: name: lucene-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -372,9 +372,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -401,7 +401,7 @@ jobs: geode-gfsh:distributedTest \ geode-web:distributedTest \ geode-web-management:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 if: failure() with: name: mgmt-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} @@ -420,9 +420,9 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK - uses: actions/setup-java@v4.7.1 + uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -452,7 +452,7 @@ jobs: geode-old-client:distributedTest \ extensions:geode-modules:distributedTest \ extensions:geode-modules-tomcat10:distributedTest --console=plain --no-daemon - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 if: failure() with: name: assembly-distributed-test-reports-${{ matrix.os }}-${{ matrix.java }} From 45066ac6dc5b573a53eda8fd740da688931bcf6a Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Wed, 29 Jul 2026 05:15:17 -0400 Subject: [PATCH 13/13] Update geode-server-all manifest classpath for latest dependencies --- .../resources/dependency_classpath.txt | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index c8ca5a5bc49..58a97aa2c7b 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -20,7 +20,7 @@ geode-deployment-legacy-0.0.0.jar snappy-0.5.jar swagger-annotations-2.2.22.jar jackson-datatype-jsr310-2.21.5.jar -jackson-annotations-2.21.jar +jackson-datatype-jdk8-2.21.5.jar jackson-dataformat-yaml-2.21.5.jar jackson-core-2.21.5.jar jackson-datatype-joda-2.21.5.jar @@ -56,7 +56,7 @@ jakarta.enterprise.cdi-api-4.0.1.jar jakarta.interceptor-api-2.1.0.jar jakarta.annotation-api-2.1.1.jar jakarta.transaction-api-2.0.1.jar -shiro-core-2.2.1.jar +shiro-core-2.1.0.jar jgroups-3.6.20.Final.jar jackson-annotations-2.21.jar commons-validator-1.7.jar @@ -83,7 +83,7 @@ lucene-analysis-common-9.12.3.jar lucene-queryparser-9.12.3.jar lucene-queries-9.12.3.jar lucene-core-9.12.3.jar -shiro-config-ogdl-2.2.1.jar +shiro-config-ogdl-2.1.0.jar commons-beanutils-1.11.0.jar commons-codec-1.15.jar commons-collections-3.2.2.jar @@ -103,15 +103,12 @@ jetty-session-12.0.33.jar jetty-plus-12.0.33.jar jetty-security-12.0.33.jar jetty-server-12.0.33.jar -shiro-cache-2.2.1.jar -shiro-hashes-argon2-2.2.1.jar -shiro-hashes-bcrypt-2.2.1.jar -shiro-crypto-hash-2.2.1.jar -shiro-crypto-cipher-2.2.1.jar -shiro-config-core-2.2.1.jar -shiro-event-2.2.1.jar -shiro-crypto-core-2.2.1.jar -shiro-lang-2.2.1.jar +shiro-cache-2.1.0.jar +shiro-crypto-cipher-2.1.0.jar +shiro-config-core-2.1.0.jar +shiro-event-2.1.0.jar +shiro-crypto-core-2.1.0.jar +shiro-lang-2.1.0.jar jetty-xml-12.0.33.jar jetty-http-12.0.33.jar jetty-io-12.0.33.jar