Commit 9846444
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 />
[](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- integration-tests
- it-common/src/test/java/io/prometheus/client/it/common
- it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test
- it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot
- prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics
- prometheus-metrics-exposition-formats/src
- main
- generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_31_0
- java/io/prometheus/metrics/expositionformats/internal
- test/java/io/prometheus/metrics/expositionformats
11 files changed
+935
-936
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
Lines changed: 922 additions & 923 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
0 commit comments