From 6947b48a12d71aca0032b1c351a939b6ac15facd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:45:28 +0100 Subject: [PATCH 1/6] chore(deps): update plugin io.micronaut.build.shared.settings to v7.3.0 (#885) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 52fca9334..e0e83c72d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id('io.micronaut.build.shared.settings') version '7.2.3' + id('io.micronaut.build.shared.settings') version '7.3.0' } rootProject.name = 'micrometer-parent' From ab9471433953473db43e939a04642d3e57a9e8b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:45:43 +0100 Subject: [PATCH 2/6] chore(deps): update softprops/action-gh-release action to v2.1.0 (#878) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2dda05848..f0b8ad78a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -160,6 +160,6 @@ jobs: - name: Upload assets # Upload the artifacts to the existing release. Note that the SLSA provenance will # attest to each artifact file and not the aggregated ZIP file. - uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9 + uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0 with: files: artifacts.zip From 88c1b73a4293d08dc1dcf2e81bc8c261f94fb700 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:46:03 +0100 Subject: [PATCH 3/6] chore(deps): update dependency gradle to v8.11.1 (#877) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b8..e2847c820 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From cdd3cf20c492ced5fccb2024d5bf6ebdb65d0ac4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:46:29 +0100 Subject: [PATCH 4/6] chore(deps): update graalvm/setup-graalvm action to v1.2.6 (#875) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 26ae97640..22e563ad5 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,7 +45,7 @@ jobs: fetch-depth: 0 - name: "🔧 Setup GraalVM CE" - uses: graalvm/setup-graalvm@v1.2.5 + uses: graalvm/setup-graalvm@v1.2.6 with: distribution: 'graalvm' java-version: ${{ matrix.java }} From 269e4d8242f69f92d078639661cebbbf8041eca8 Mon Sep 17 00:00:00 2001 From: micronaut-build <65172877+micronaut-build@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:47:06 +0100 Subject: [PATCH 5/6] Update common files (#880) Co-authored-by: Sergio del Amo --- .github/renovate.json | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 09c2a5983..99eeec105 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,24 +1,32 @@ { "extends": [ - "config:base" + "config:recommended" + ], + "addLabels": [ + "type: dependency-upgrade" ], - "addLabels": ["type: dependency-upgrade"], "schedule": [ - "after 10pm every day" + "after 10pm" ], "prHourlyLimit": 1, "prConcurrentLimit": 20, "timezone": "Europe/Prague", "packageRules": [ { - "matchPackagePatterns": ["actions.*"], "dependencyDashboardApproval": true, - "matchUpdateTypes": ["patch"], + "matchUpdateTypes": [ + "patch" + ], "matchCurrentVersion": "!/^0/", - "automerge": true + "automerge": true, + "matchPackageNames": [ + "/actions.*/" + ] }, { - "matchUpdateTypes": ["patch"], + "matchUpdateTypes": [ + "patch" + ], "matchCurrentVersion": "!/^0/", "automerge": true } From 8911108cb08b040e76d47e45108386c10ea2de57 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Fri, 22 Nov 2024 11:51:27 +0100 Subject: [PATCH 6/6] test: ignore in java21 --- .../prometheus/management/PrometheusEndpointSpec.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/micrometer-registry-prometheus/src/test/groovy/io/micronaut/configuration/metrics/micrometer/prometheus/management/PrometheusEndpointSpec.groovy b/micrometer-registry-prometheus/src/test/groovy/io/micronaut/configuration/metrics/micrometer/prometheus/management/PrometheusEndpointSpec.groovy index d425e8c14..4006c95d6 100644 --- a/micrometer-registry-prometheus/src/test/groovy/io/micronaut/configuration/metrics/micrometer/prometheus/management/PrometheusEndpointSpec.groovy +++ b/micrometer-registry-prometheus/src/test/groovy/io/micronaut/configuration/metrics/micrometer/prometheus/management/PrometheusEndpointSpec.groovy @@ -4,7 +4,8 @@ import io.micronaut.context.ApplicationContext import io.micronaut.http.client.HttpClient import io.micronaut.runtime.server.EmbeddedServer import spock.lang.AutoCleanup -import spock.lang.Ignore +import spock.lang.IgnoreIf +import spock.lang.PendingFeature import spock.lang.Shared import spock.lang.Specification @@ -21,12 +22,13 @@ class PrometheusEndpointSpec extends Specification { @AutoCleanup HttpClient client = embeddedServer.applicationContext.createBean(HttpClient, embeddedServer.URL) + @IgnoreIf({ jvm.isJava21() }) void "test prometheus scrape"() { expect: client.toBlocking().retrieve('/prometheus').contains('jvm_memory_used') } - @Ignore + @PendingFeature void "test prometheus scrape no descriptions"() { given: def result = client.toBlocking().retrieve('/prometheus')