File tree Expand file tree Collapse file tree 8 files changed +40
-17
lines changed
log4j/src/test/java/io/helidon/logging/log4j
provider-tests/src/main/java/io/helidon/tracing/providers/tests Expand file tree Collapse file tree 8 files changed +40
-17
lines changed Original file line number Diff line number Diff line change 11/*
2- * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
2+ * Copyright (c) 2020, 2025 Oracle and/or its affiliates.
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
Original file line number Diff line number Diff line change 11/*
2- * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
2+ * Copyright (c) 2020, 2025 Oracle and/or its affiliates.
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
Original file line number Diff line number Diff line change 1818
1919import java .io .ByteArrayInputStream ;
2020import java .io .IOException ;
21+ import java .nio .charset .StandardCharsets ;
2122import java .util .logging .Level ;
2223import java .util .logging .LogManager ;
2324import java .util .logging .Logger ;
@@ -41,7 +42,7 @@ static void beforeAll() throws IOException {
4142 String loggingConfig = "# HelidonConsoleHandler uses a SimpleFormatter subclass that replaces \" !thread!\" with the current thread\n "
4243 + "java.util.logging.SimpleFormatter.format=%1$tY.%1$tm.%1$td %1$tH:%1$tM:%1$tS %4$s %3$s !thread!: %5$s%6$s trace_id %X{trace_id}%n\n " ;
4344
44- LogManager .getLogManager ().readConfiguration (new ByteArrayInputStream (loggingConfig .getBytes ()));
45+ LogManager .getLogManager ().readConfiguration (new ByteArrayInputStream (loggingConfig .getBytes (StandardCharsets . UTF_8 )));
4546 }
4647
4748 @ Test
Original file line number Diff line number Diff line change 132132 </includes >
133133 </configuration >
134134 </execution >
135+ <execution >
136+ <id >mdc-test</id >
137+ <goals >
138+ <goal >test</goal >
139+ </goals >
140+ <configuration >
141+ <includes >
142+ <include >**/TestMdc.java</include >
143+ </includes >
144+ </configuration >
145+ </execution >
135146 </executions >
136147 </plugin >
137148 </plugins >
Original file line number Diff line number Diff line change 141141 </configurationParameters >
142142 </properties >
143143 </configuration >
144+ <executions >
145+ <execution >
146+ <id >mdc-test</id >
147+ <goals >
148+ <goal >test</goal >
149+ </goals >
150+ <configuration >
151+ <includes >
152+ <include >**/TestMdc.java</include >
153+ </includes >
154+ </configuration >
155+ </execution >
156+ </executions >
144157 </plugin >
145158 </plugins >
146159 </build >
Original file line number Diff line number Diff line change 5959 <dependency >io.helidon.tracing:helidon-tracing-provider-tests</dependency >
6060 </dependenciesToScan >
6161 </configuration >
62- <executions >
63- <execution >
64- <id >mdc-test</id >
65- <goals >
66- <goal >test</goal >
67- </goals >
68- <configuration >
69- <includes >
70- <include >**/TestMdc.java</include >
71- </includes >
72- </configuration >
73- </execution >
74- </executions >
7562 </plugin >
7663 </plugins >
7764 </build >
Original file line number Diff line number Diff line change 169169 </includes >
170170 </configuration >
171171 </execution >
172+ <execution >
173+ <id >mdc-test</id >
174+ <goals >
175+ <goal >test</goal >
176+ </goals >
177+ <configuration >
178+ <includes >
179+ <include >**/TestMdc.java</include >
180+ </includes >
181+ </configuration >
182+ </execution >
172183 </executions >
173184 </plugin >
174185 </plugins >
Original file line number Diff line number Diff line change 11/*
2- * Copyright (c) 2018, 2024 Oracle and/or its affiliates.
2+ * Copyright (c) 2018, 2025 Oracle and/or its affiliates.
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
You can’t perform that action at this time.
0 commit comments