Skip to content

Commit 9846444

Browse files
Bump com.google.protobuf:protobuf-java from 4.30.2 to 4.31.0 (#1357)
Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 4.30.2 to 4.31.0. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/protocolbuffers/protobuf/commit/3d4adad5c4c4e6a6f9f038769b8c90716065b0e4"><code>3d4adad</code></a> Updating version.json and repo version numbers to: 31.0</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/0fad924f7859e4cf72f82420a1341f41bc0d3fa1"><code>0fad924</code></a> Merge pull request <a href="https://redirect.github.com/protocolbuffers/protobuf/issues/21743">#21743</a> from shaod2/31-cp</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/aa5410dd95b9bceeca78e308481a46032ae79cd9"><code>aa5410d</code></a> Remove fast-path check for non-clang compilers in MessageCreator.</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/0cf5489ca0f42df903ba1abd1f5f0a75aa95f045"><code>0cf5489</code></a> Fix silent failure of <code>rb_test</code> rules to run test (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/21733">#21733</a>)</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/d39063184a826bd53bc7b78734a39db9f93c8342"><code>d390631</code></a> Add missing include.</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/01b42bbd549c8f30ef9a27cd4964a7ae2632955a"><code>01b42bb</code></a> Cherry-pick Rust fix to 31.x (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/21617">#21617</a>)</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/ac2bbecc4ff65935a69c9226fa13fc62a6ad8e6f"><code>ac2bbec</code></a> Merge pull request <a href="https://redirect.github.com/protocolbuffers/protobuf/issues/21546">#21546</a> from protocolbuffers/31.x-202504301807</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/ca59567ff2522d5b7e56dec0b3a0f94208213dc9"><code>ca59567</code></a> Updating version.json and repo version numbers to: 31.0-dev</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/4f81598aa4786662f8f7f383e0aa5b3388aad717"><code>4f81598</code></a> Updating version.json and repo version numbers to: 31.0-rc2</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/1fb0d06596e2680bd4c066ded79782730090ab05"><code>1fb0d06</code></a> Cherry pick import option for protoc (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/21489">#21489</a>)</li> <li>Additional commits viewable in <a href="https://github.com/protocolbuffers/protobuf/compare/v4.30.2...v4.31.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.protobuf:protobuf-java&package-manager=maven&previous-version=4.30.2&new-version=4.31.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Gregor Zeitlinger <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <[email protected]>
1 parent 2daa1bd commit 9846444

File tree

11 files changed

+935
-936
lines changed

11 files changed

+935
-936
lines changed

integration-tests/it-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static org.assertj.core.api.Assertions.assertThat;
55
import static org.assertj.core.api.Assertions.fail;
66

7-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_0.Metrics;
88
import java.io.ByteArrayInputStream;
99
import java.io.IOException;
1010
import java.io.InputStream;

integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import com.google.common.io.Resources;
77
import io.prometheus.client.it.common.ExporterTest;
8-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_0.Metrics;
99
import java.io.IOException;
1010
import java.net.URISyntaxException;
1111
import java.net.URLEncoder;

integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static org.assertj.core.api.Assertions.assertThat;
44

55
import io.prometheus.client.it.common.ExporterTest;
6-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
6+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_0.Metrics;
77
import java.io.IOException;
88
import java.net.URL;
99
import java.util.List;

mise.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[tools."cargo:zizmor"]
2-
version = "1.6.0"
2+
version = "1.7.0"
33
backend = "cargo:zizmor"
44

55
[tools."go:github.com/gohugoio/hugo"]
66
version = "v0.147.0"
77
backend = "go:github.com/gohugoio/hugo"
88

99
[tools."go:github.com/grafana/oats"]
10-
version = "0.3.0"
10+
version = "0.3.1"
1111
backend = "go:github.com/grafana/oats"
1212

1313
[tools.java]
@@ -19,8 +19,8 @@ version = "0.18.1"
1919
backend = "aqua:lycheeverse/lychee"
2020

2121
[tools.protoc]
22-
version = "30.2"
22+
version = "31.0"
2323
backend = "aqua:protocolbuffers/protobuf/protoc"
2424

2525
[tools.protoc.checksums]
26-
"protoc-30.2-linux-x86_64.zip" = "sha256:327e9397c6fb3ea2a542513a3221334c6f76f7aa524a7d2561142b67b312a01f"
26+
"protoc-31.0-linux-x86_64.zip" = "sha256:24e2ed32060b7c990d5eb00d642fde04869d7f77c6d443f609353f097799dd42"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<properties>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<automatic.module.name>--module-name-need-to-be-overriden--</automatic.module.name>
21-
<protobuf-java.version>4.30.2</protobuf-java.version>
21+
<protobuf-java.version>4.31.0</protobuf-java.version>
2222
<guava.version>33.4.8-jre</guava.version>
2323
<junit-jupiter.version>5.12.2</junit-jupiter.version>
2424
<otel.instrumentation.version>2.15.0-alpha</otel.instrumentation.version>

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import static org.assertj.core.data.Offset.offset;
77

88
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
9-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
9+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_0.Metrics;
1010
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
1111
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1212
import io.prometheus.metrics.model.snapshots.CounterSnapshot;

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
99
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
1010
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
11-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
11+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_0.Metrics;
1212
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
1313
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1414
import io.prometheus.metrics.model.snapshots.ClassicHistogramBucket;

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
55

66
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
7-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_0.Metrics;
88
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
99
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1010
import io.prometheus.metrics.model.snapshots.Labels;
Lines changed: 922 additions & 923 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import com.google.protobuf.TextFormat;
66
import io.prometheus.metrics.expositionformats.ExpositionFormatWriter;
7-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_0.Metrics;
88
import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
99
import io.prometheus.metrics.model.snapshots.CounterSnapshot;
1010
import io.prometheus.metrics.model.snapshots.CounterSnapshot.CounterDataPointSnapshot;

prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ProtobufExpositionFormatsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

5-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
5+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_0.Metrics;
66
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
77
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
88
import io.prometheus.metrics.model.snapshots.MetricSnapshot;

0 commit comments

Comments
 (0)