Skip to content

Commit 09bcf7e

Browse files
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 &lt;=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 /> [![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.1&new-version=4.30.2)](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] <support@github.com> Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
1 parent 059a1ce commit 09bcf7e

File tree

15 files changed

+930
-922
lines changed

15 files changed

+930
-922
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,5 @@ jobs:
2020
restore-keys: |
2121
${{ runner.os }}-maven-
2222
- name: Run the Maven verify phase
23-
env:
24-
PROTO_GENERATION: true
25-
REQUIRE_PROTO_UP_TO_DATE: true
2623
run: mise run ci
2724

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ Combine all with `./mvnw test -DskipTests=true -Dspotless.check.skip=true -Dcove
3434

3535
## Updating the Protobuf Java Classes
3636

37-
Use `PROTO_GENERATION=true mvn clean install` to generate protobuf classes.
37+
Use `mise up && mise run test` to generate protobuf classes.

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_1.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.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_1.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.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_1.Metrics;
6+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
77
import java.io.IOException;
88
import java.net.URL;
99
import java.util.List;

mise.lock

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[tools.java]
2+
version = "temurin-17.0.13+11"
3+
backend = "core:java"
4+
5+
[tools.protoc]
6+
version = "30.2"
7+
backend = "aqua:protocolbuffers/protobuf/protoc"
8+
9+
[tools.protoc.checksums]
10+
"protoc-30.2-linux-x86_64.zip" = "sha256:327e9397c6fb3ea2a542513a3221334c6f76f7aa524a7d2561142b67b312a01f"

mise.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PROTO_GENERATION = "true"
33

44
[tools]
55
java = "temurin-17.0.13+11"
6-
protoc = "30.1"
6+
protoc = "latest"
77

88
[tasks.ci]
99
description = "CI Build"
@@ -12,7 +12,7 @@ run = [
1212
# just to check if javadoc can be generated
1313
"./mvnw javadoc:javadoc -P javadoc"
1414
]
15-
env = { PROTO_GENERATION = "true", REQUIRE_PROTO_UP_TO_DATE = "true" }
15+
env = { REQUIRE_PROTO_UP_TO_DATE = "true" }
1616

1717
[tasks.format]
1818
description = "format source code"
@@ -25,3 +25,4 @@ run = "./mvnw test -DskipTests=true -Dspotless.check.skip=true -Dcoverage.skip=t
2525
[tasks.test-all]
2626
description = "run all tests"
2727
run = "./mvnw verify"
28+

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_1.Metrics;
9+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.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_1.Metrics;
11+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.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_1.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.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;

0 commit comments

Comments
 (0)