Skip to content

Commit 5c47daa

Browse files
chore(deps): update dependency java to v25 (#1596)
Coming soon: The Renovate bot (GitHub App) will be renamed to Mend. PRs from Renovate will soon appear from 'Mend'. Learn more [here](https://redirect.github.com/renovatebot/renovate/discussions/37842). This PR contains the following updates: | Package | Update | Change | |---|---|---| | [java](https://adoptium.net) | major | `21.0.8+9.0.LTS` -> `25.0.0+36.0.LTS` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/prometheus/client_java). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xMzAuMSIsInVwZGF0ZWRJblZlciI6IjQxLjEzMC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=--> --------- Signed-off-by: Gregor Zeitlinger <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <[email protected]>
1 parent 57b9064 commit 5c47daa

File tree

15 files changed

+23
-22
lines changed

15 files changed

+23
-22
lines changed

examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</description>
2020

2121
<properties>
22-
<java.version>17</java.version>
22+
<java.version>25</java.version>
2323
</properties>
2424

2525
<dependencies>

examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</description>
2020

2121
<properties>
22-
<java.version>17</java.version>
22+
<java.version>25</java.version>
2323
</properties>
2424

2525
<dependencies>

examples/example-exporter-servlet-tomcat/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</description>
1818

1919
<properties>
20-
<java.version>17</java.version>
20+
<java.version>25</java.version>
2121
</properties>
2222

2323
<dependencies>

integration-tests/it-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import java.io.IOException;
1010
import java.io.InputStream;
1111
import java.net.HttpURLConnection;
12+
import java.net.URI;
1213
import java.net.URISyntaxException;
13-
import java.net.URL;
1414
import java.util.ArrayList;
1515
import java.util.HashMap;
1616
import java.util.List;
@@ -34,7 +34,7 @@ public ExporterTest(String sampleApp) throws IOException, URISyntaxException {
3434
Volume.create("it-exporter")
3535
.copy("../../it-" + sampleApp + "/target/" + sampleApp + ".jar");
3636
this.sampleAppContainer =
37-
new GenericContainer<>("openjdk:17")
37+
new GenericContainer<>("openjdk:25")
3838
.withFileSystemBind(sampleAppVolume.getHostPath(), "/app", BindMode.READ_ONLY)
3939
.withWorkingDirectory("/app")
4040
.withLogConsumer(LogConsumer.withPrefix(sampleApp))
@@ -68,18 +68,18 @@ protected Response scrape(String method, String queryString, String... requestHe
6868
throws IOException {
6969
return scrape(
7070
method,
71-
new URL(
71+
URI.create(
7272
"http://localhost:"
7373
+ sampleAppContainer.getMappedPort(9400)
7474
+ "/metrics?"
7575
+ queryString),
7676
requestHeaders);
7777
}
7878

79-
public static Response scrape(String method, URL url, String... requestHeaders)
79+
public static Response scrape(String method, URI uri, String... requestHeaders)
8080
throws IOException {
8181
long timeoutMillis = TimeUnit.SECONDS.toMillis(5);
82-
HttpURLConnection con = (HttpURLConnection) url.openConnection();
82+
HttpURLConnection con = (HttpURLConnection) uri.toURL().openConnection();
8383
con.setRequestMethod(method);
8484
for (int i = 0; i < requestHeaders.length; i += 2) {
8585
con.setRequestProperty(requestHeaders[i], requestHeaders[i + 1]);
@@ -111,7 +111,7 @@ public static Response scrape(String method, URL url, String... requestHeaders)
111111
if (exception != null) {
112112
exception.printStackTrace();
113113
}
114-
fail("timeout while getting metrics from " + url);
114+
fail("timeout while getting metrics from " + uri);
115115
return null; // will not happen
116116
}
117117

integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</description>
1818
<properties>
1919
<jetty-server.version>12.1.1</jetty-server.version>
20-
<java.version>17</java.version>
20+
<java.version>25</java.version>
2121
</properties>
2222

2323
<dependencies>

integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</description>
1818

1919
<properties>
20-
<java.version>17</java.version>
20+
<java.version>25</java.version>
2121
</properties>
2222

2323
<dependencies>

integration-tests/it-pushgateway/src/test/java/io/prometheus/metrics/it/pushgateway/PushGatewayIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void setUp() throws IOException, URISyntaxException {
4141
.withLogConsumer(LogConsumer.withPrefix("pushgateway"))
4242
.waitingFor(Wait.forListeningPort());
4343
sampleAppContainer =
44-
new GenericContainer<>("openjdk:17")
44+
new GenericContainer<>("openjdk:25")
4545
.withFileSystemBind(sampleAppVolume.getHostPath(), "/app", BindMode.READ_ONLY)
4646
.withNetwork(network)
4747
.withWorkingDirectory("/app")

integration-tests/it-spring-boot-smoke-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Spring Smoke Tests
2222
</description>
2323
<properties>
24-
<java.version>17</java.version>
24+
<java.version>25</java.version>
2525
<junit-jupiter.version>5.13.4</junit-jupiter.version>
2626
</properties>
2727

integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import io.prometheus.client.it.common.ExporterTest;
66
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_1.Metrics;
77
import java.io.IOException;
8-
import java.net.URL;
8+
import java.net.URI;
99
import java.util.List;
1010
import java.util.Optional;
1111
import org.junit.jupiter.api.Test;
@@ -20,7 +20,7 @@ public void testPrometheusProtobufFormat() throws IOException {
2020
ExporterTest.Response response =
2121
ExporterTest.scrape(
2222
"GET",
23-
new URL("http://localhost:8080/actuator/prometheus"),
23+
URI.create("http://localhost:8080/actuator/prometheus"),
2424
"Accept",
2525
"application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily;"
2626
+ " encoding=delimited");

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tools]
22
"go:github.com/gohugoio/hugo" = "v0.150.1"
33
"go:github.com/grafana/oats" = "0.4.1"
4-
java = "temurin-21.0.8+9.0.LTS"
4+
java = "temurin-25.0.0+36.0.LTS"
55
lychee = "0.20.1"
66
protoc = "32.1"
77

0 commit comments

Comments
 (0)