Skip to content

Commit 49b3ce5

Browse files
committed
Copyright; move tracing providers-level surefire test exec down to each provider pom.xml - mvn was trying to run it at the providers project level which cannot work
1 parent 0326b24 commit 49b3ce5

File tree

8 files changed

+40
-17
lines changed

8 files changed

+40
-17
lines changed

logging/log4j/src/test/java/io/helidon/logging/log4j/Log4jMdcTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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.

logging/slf4j/src/test/java/Slf4jMdcTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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.

tracing/provider-tests/src/main/java/io/helidon/tracing/providers/tests/TestMdc.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.io.ByteArrayInputStream;
2020
import java.io.IOException;
21+
import java.nio.charset.StandardCharsets;
2122
import java.util.logging.Level;
2223
import java.util.logging.LogManager;
2324
import 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

tracing/providers/opentelemetry/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,17 @@
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>

tracing/providers/opentracing/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,19 @@
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>

tracing/providers/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,6 @@
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>

tracing/providers/zipkin/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,17 @@
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>

tracing/tracing/src/main/java/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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.

0 commit comments

Comments
 (0)