Skip to content

Commit d3b533a

Browse files
Bump com.google.protobuf:protobuf-java from 4.29.3 to 4.30.0 (#1299)
Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 4.29.3 to 4.30.0. <details> <summary>Commits</summary> <ul> <li>See full diff in <a href="https://github.com/protocolbuffers/protobuf/commits/v4.30.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.29.3&new-version=4.30.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 100dec1 commit d3b533a

File tree

12 files changed

+1029
-1028
lines changed

12 files changed

+1029
-1028
lines changed

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
java temurin-17.0.13+11
2-
protoc 29.3
2+
protoc 30.0

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

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

prometheus-metrics-exposition-formats/generate-protobuf.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ if [[ $GENERATED_WITH != "$PROTOBUF_VERSION" ]]; then
3838
echo "Generated protobuf sources version $GENERATED_WITH does not match provided version $PROTOBUF_VERSION"
3939
echo "Please update the protoc version .tool-versions to the latest version of https://github.com/protocolbuffers/protobuf/releases"
4040
echo "Please use https://github.com/asdf-vm/asdf - this will use the version specified in .tool-versions"
41+
echo "Generated protobuf sources are not up-to-date. Please run 'PROTO_GENERATION=true mvn clean install' and commit the changes."
4142
exit 1
4243
fi
4344

prometheus-metrics-exposition-formats/pom.xml

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

2121
<properties>
2222
<automatic.module.name>io.prometheus.metrics.expositionformats</automatic.module.name>
23-
<protobuf-java.version>4.29.3</protobuf-java.version>
23+
<protobuf-java.version>4.30.0</protobuf-java.version>
2424
</properties>
2525

2626
<dependencies>

prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_29_3/Metrics.java renamed to prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_30_0/Metrics.java

Lines changed: 1018 additions & 1018 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)