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 }} 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 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