Skip to content

Commit 294c8b6

Browse files
Bump com.google.protobuf:protobuf-java from 4.30.0 to 4.30.1 (#1305)
Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 4.30.0 to 4.30.1. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/protocolbuffers/protobuf/commit/0d815c5b74281f081c1ee4b431a4d5bbb1615c97"><code>0d815c5</code></a> Updating version.json and repo version numbers to: 30.1</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/ebb5224493150126861ce2e192d7ae244bfea1df"><code>ebb5224</code></a> Re-add <code>system_python</code> repo alias to MODULE.bazel (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/20662">#20662</a>)</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/4747628cce300d58e3bb0da4f3ee7cbfa1ac853b"><code>4747628</code></a> Remove Java runtime classes from kotlin release. (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/20607">#20607</a>)</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/250c5502fa436e82fca50937db7d28f43855b09e"><code>250c550</code></a> Fix python codegen crash when C++ features are used. (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/20577">#20577</a>)</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/3576a1f8732c4a42df90e406e07326198182b6fb"><code>3576a1f</code></a> Loosen py_proto_library check to be on the import path instead of full direct...</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/efa65c59858cd83f348628a3c5cb350082f3199a"><code>efa65c5</code></a> Merge pull request <a href="https://redirect.github.com/protocolbuffers/protobuf/issues/20562">#20562</a> from protocolbuffers/30.x-202503042254</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/63fc9d680507ceb41d4acbf17b138e4f6f85f86b"><code>63fc9d6</code></a> Updating version.json and repo version numbers to: 30.1-dev</li> <li>See full diff in <a href="https://github.com/protocolbuffers/protobuf/compare/v4.30.0...v4.30.1">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.0&new-version=4.30.1)](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 3180503 commit 294c8b6

File tree

15 files changed

+938
-926
lines changed

15 files changed

+938
-926
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ jobs:
1111
runs-on: ubuntu-24.04
1212
steps:
1313
- uses: actions/checkout@v4
14-
- name: Setup ASDF
15-
uses: equisoft-actions/with-asdf-vm@v2
14+
- uses: jdx/mise-action@v2
1615
- name: Cache local Maven repository
1716
uses: actions/cache@v4
1817
with:
@@ -24,7 +23,5 @@ jobs:
2423
env:
2524
PROTO_GENERATION: true
2625
REQUIRE_PROTO_UP_TO_DATE: true
27-
run: |
28-
mvn -v
29-
./mvnw clean install
30-
./mvnw javadoc:javadoc -P javadoc # just to check if javadoc is generated
26+
run: mise run ci
27+

.tool-versions

Lines changed: 0 additions & 2 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ If you're getting errors when running tests:
3030
- Use `-Dcheckstyle.skip=true` to skip the checkstyle check during development.
3131
- Use `-Dwarnings=-nowarn` to skip the warnings during development.
3232

33+
Combine all with `mvn test -DskipTests=true -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn`.
34+
3335
## Updating the Protobuf Java Classes
3436

3537
Use `PROTO_GENERATION=true mvn clean install` 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_0.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.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_0.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.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_0.Metrics;
6+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
77
import java.io.IOException;
88
import java.net.URL;
99
import java.util.List;

mise.toml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[env]
2+
PROTO_GENERATION = "true"
3+
4+
[tools]
5+
java = "temurin-17.0.13+11"
6+
protoc = "30.1"
7+
8+
[tasks.ci]
9+
description = "CI Build"
10+
run = [
11+
"./mvnw clean install",
12+
# just to check if javadoc can be generated
13+
"./mvnw javadoc:javadoc -P javadoc"
14+
]
15+
env = { PROTO_GENERATION = "true", REQUIRE_PROTO_UP_TO_DATE = "true" }

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