diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index da4fb667526..04bd7674e14 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,10 +57,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v4.2.2 - name: Setup Java JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v4.7.1 with: java-version: 17 distribution: temurin 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 }} diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml index 65f6a24015d..a161a145562 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -195,7 +195,7 @@ io.micrometer micrometer-core - 1.14.0 + 1.15.12 io.swagger.core.v3 diff --git a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy index d9c8dd22a7f..67987b800e1 100644 --- a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy +++ b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy @@ -48,8 +48,8 @@ class DependencyConstraints { deps.put("jgroups.version", "3.6.20.Final") deps.put("log4j.version", "2.25.4") deps.put("log4j-slf4j2-impl.version", "2.23.1") - deps.put("micrometer.version", "1.14.0") - deps.put("shiro.version", "2.2.1") + deps.put("micrometer.version", "1.15.12") + deps.put("shiro.version", "2.1.0") // GEODE-10583: Pin Bouncy Castle (transitive via shiro-crypto-hash) to a fixed version deps.put("bouncycastle.version", "1.84") deps.put("slf4j-api.version", "2.0.17") diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index 3fae9e48a5f..3fd20c30aa3 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -1023,9 +1023,9 @@ lib/lucene-analysis-phonetic-9.12.3.jar lib/lucene-core-9.12.3.jar lib/lucene-queries-9.12.3.jar lib/lucene-queryparser-9.12.3.jar -lib/micrometer-commons-1.14.0.jar -lib/micrometer-core-1.14.0.jar -lib/micrometer-observation-1.14.0.jar +lib/micrometer-commons-1.15.12.jar +lib/micrometer-core-1.15.12.jar +lib/micrometer-observation-1.15.12.jar lib/mx4j-3.0.2.jar lib/mx4j-remote-3.0.2.jar lib/mx4j-tools-3.0.1.jar diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt index 3a4267d07ff..d88492b876b 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -75,7 +75,7 @@ commons-digester-2.1.jar commons-io-2.19.0.jar commons-logging-1.3.5.jar classgraph-4.8.147.jar -micrometer-core-1.14.0.jar +micrometer-core-1.15.12.jar HdrHistogram-2.2.2.jar fastutil-8.5.8.jar jakarta.resource-api-2.1.0.jar @@ -119,10 +119,9 @@ 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.14.0.jar +micrometer-observation-1.15.12.jar spring-jcl-6.1.21.jar -micrometer-commons-1.14.0.jar +micrometer-commons-1.15.12.jar LatencyUtils-2.0.3.jar snakeyaml-2.5.jar reactor-core-3.6.10.jar diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index bc383c2d5b0..19315ce0012 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -46,7 +46,7 @@ spring-shell-standard-commands-3.3.3.jar spring-shell-standard-3.3.3.jar spring-shell-core-3.3.3.jar commons-io-2.19.0.jar -micrometer-core-1.14.0.jar +micrometer-core-1.15.12.jar jakarta.resource-api-2.1.0.jar jetty-ee10-annotations-12.0.33.jar spring-boot-starter-validation-3.3.13.jar @@ -120,8 +120,8 @@ jetty-util-12.0.33.jar spring-boot-starter-logging-3.3.13.jar jul-to-slf4j-2.0.17.jar slf4j-api-2.0.17.jar -micrometer-observation-1.14.0.jar -micrometer-commons-1.14.0.jar +micrometer-observation-1.15.12.jar +micrometer-commons-1.15.12.jar LatencyUtils-2.0.3.jar snakeyaml-2.5.jar spring-jcl-6.1.21.jar