Commit 09bcf7e
Bump com.google.protobuf:protobuf-java from 4.30.1 to 4.30.2 (#1314)
Bumps
[com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf)
from 4.30.1 to 4.30.2.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/43e1626812c1b543e56a7bec59dc09eb18248bd2"><code>43e1626</code></a>
Updating version.json and repo version numbers to: 30.2</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/7a4c63bac3451b8adf8dd51e9c16ed74d4cbc662"><code>7a4c63b</code></a>
Fix lite classes in the protobuf-java Maven release to be JDK8
compatible. (#...</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/783166965aa8808ec1b74d4890088e3b0799ac08"><code>7831669</code></a>
Remove dllexport attribute on variable definition. (<a
href="https://redirect.github.com/protocolbuffers/protobuf/issues/20833">#20833</a>)</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/da9cadcb975654e3d158796b642ec27ba5f4509d"><code>da9cadc</code></a>
Restore JDK8 compatibility in Bazel for libraries with dependencies from
Mave...</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/09b5078524d60917d1fa8c635bcee52e608f2f04"><code>09b5078</code></a>
Add protobuf_maven artifacts to protobuf_maven_dev as well so they can
still ...</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/b7f06f1ed07a463a9279f7019653fe6c3e90282d"><code>b7f06f1</code></a>
Add volatile to featuresResolved (<a
href="https://redirect.github.com/protocolbuffers/protobuf/issues/20766">#20766</a>)</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/b69f653d6ebc90d88032b8cc82d626758a74ef77"><code>b69f653</code></a>
Restore generator headers in cmake install until the next breaking C++
releas...</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/f4b0a79783aa1c579bfe005908f723fdc6d68169"><code>f4b0a79</code></a>
Restore custom protobuf maven namespaces to avoid polluting main maven
namesp...</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/2dc9f35e83f4b55e58443421266b0f9a158d91dd"><code>2dc9f35</code></a>
Fix Java concurrency issue in feature resolution for old <=3.25.x
gencode usi...</li>
<li><a
href="https://github.com/protocolbuffers/protobuf/commit/221b2a0081ebdba6cf3b7278bf65528316ba4480"><code>221b2a0</code></a>
Change how we decide which empty string implementation to use. (<a
href="https://redirect.github.com/protocolbuffers/protobuf/issues/20708">#20708</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/protocolbuffers/protobuf/compare/v4.30.1...v4.30.2">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 059a1ce commit 09bcf7e
File tree
15 files changed
+930
-922
lines changed- .github/workflows
- 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_30_2
- java/io/prometheus/metrics/expositionformats/internal
- test/java/io/prometheus/metrics/expositionformats
15 files changed
+930
-922
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | 23 | | |
27 | 24 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
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: 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 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
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 | | |
| |||
0 commit comments