Skip to content

Commit 01b3d58

Browse files
committed
set test java to 25, remove deprecated usage
Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent 937db41 commit 01b3d58

File tree

9 files changed

+19
-18
lines changed
  • examples
    • example-exemplars-tail-sampling
    • example-exporter-servlet-tomcat
  • integration-tests
    • it-exporter
      • it-exporter-servlet-jetty-sample
      • it-exporter-servlet-tomcat-sample
    • it-spring-boot-smoke-test
  • prometheus-metrics-exporter-httpserver/src/test/java/io/prometheus/metrics/exporter/httpserver
  • prometheus-metrics-exporter-servlet-jakarta

9 files changed

+19
-18
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-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-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

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,9 @@
252252
<release>${java.version}</release>
253253
<source>${java.version}</source>
254254
<target>${java.version}</target>
255-
<testRelease>17</testRelease>
256-
<testSource>17</testSource>
257-
<testTarget>17</testTarget>
255+
<testRelease>25</testRelease>
256+
<testSource>25</testSource>
257+
<testTarget>25</testTarget>
258258
<showWarnings>true</showWarnings>
259259
<compilerArgs>
260260
<arg>-Xlint:all,-serial,-processing,-options</arg>

prometheus-metrics-exporter-httpserver/src/test/java/io/prometheus/metrics/exporter/httpserver/HTTPServerTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package io.prometheus.metrics.exporter.httpserver;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
5-
63
import com.sun.net.httpserver.Authenticator;
74
import com.sun.net.httpserver.HttpExchange;
85
import com.sun.net.httpserver.HttpHandler;
@@ -11,18 +8,21 @@
118
import io.prometheus.metrics.model.registry.PrometheusRegistry;
129
import io.prometheus.metrics.model.registry.PrometheusScrapeRequest;
1310
import io.prometheus.metrics.model.snapshots.MetricSnapshots;
11+
import org.junit.jupiter.api.Test;
12+
13+
import javax.net.ssl.SSLContext;
14+
import javax.security.auth.Subject;
1415
import java.io.IOException;
1516
import java.net.InetAddress;
1617
import java.net.InetSocketAddress;
1718
import java.net.Socket;
1819
import java.nio.charset.StandardCharsets;
19-
import java.security.AccessController;
2020
import java.security.NoSuchAlgorithmException;
2121
import java.security.Principal;
2222
import java.util.concurrent.Executors;
23-
import javax.net.ssl.SSLContext;
24-
import javax.security.auth.Subject;
25-
import org.junit.jupiter.api.Test;
23+
24+
import static org.assertj.core.api.Assertions.assertThat;
25+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
2626

2727
public class HTTPServerTest {
2828

@@ -46,8 +46,9 @@ public Result authenticate(HttpExchange exchange) {
4646
HttpHandler handler =
4747
exchange -> {
4848
boolean found = false;
49-
Subject current = Subject.getSubject(AccessController.getContext());
49+
Subject current = Subject.current();
5050
for (Principal p : current.getPrincipals()) {
51+
System.out.println("p=" + p.getName());
5152
if (user.equals(p.getName())) {
5253
found = true;
5354
break;

prometheus-metrics-exporter-servlet-jakarta/pom.xml

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

2020
<properties>
2121
<automatic.module.name>io.prometheus.metrics.exporter.servlet.jakarta</automatic.module.name>
22-
<java.version>17</java.version>
22+
<java.version>25</java.version>
2323
</properties>
2424

2525
<dependencies>

0 commit comments

Comments
 (0)