Skip to content

Commit 7bd17f3

Browse files
romain-grecourtromain-grecourt
authored
Split plexus logging support to retain JDK11 support in sitegen (helidon-io#1108)
1 parent 9d212d4 commit 7bd17f3

File tree

21 files changed

+124
-52
lines changed

21 files changed

+124
-52
lines changed

‎common/maven-logging/pom.xml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (c) 2025 Oracle and/or its affiliates.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
18+
-->
19+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
<parent>
23+
<groupId>io.helidon.build-tools.common</groupId>
24+
<artifactId>helidon-build-common-project</artifactId>
25+
<version>4.0.0-SNAPSHOT</version>
26+
</parent>
27+
<artifactId>helidon-build-common-maven-logging</artifactId>
28+
<name>Helidon Build Tools Common Maven Logging</name>
29+
30+
<dependencies>
31+
<dependency>
32+
<groupId>io.helidon.build-tools.common</groupId>
33+
<artifactId>helidon-build-common</artifactId>
34+
<version>${project.version}</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>io.helidon.build-tools.common</groupId>
38+
<artifactId>helidon-build-common-ansi</artifactId>
39+
<version>${project.version}</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.apache.maven</groupId>
43+
<artifactId>maven-core</artifactId>
44+
<scope>provided</scope>
45+
</dependency>
46+
</dependencies>
47+
48+
<build>
49+
<plugins>
50+
<plugin>
51+
<groupId>org.codehaus.plexus</groupId>
52+
<artifactId>plexus-component-metadata</artifactId>
53+
<executions>
54+
<execution>
55+
<goals>
56+
<goal>generate-metadata</goal>
57+
</goals>
58+
</execution>
59+
</executions>
60+
</plugin>
61+
</plugins>
62+
</build>
63+
</project>

‎common/maven-plugin/src/main/java/io/helidon/build/common/maven/plugin/PlexusLogWriter.java‎ renamed to ‎common/maven-logging/src/main/java/io/helidon/build/common/maven/logging/PlexusLogWriter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2019, 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.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.helidon.build.common.maven.plugin;
16+
package io.helidon.build.common.maven.logging;
1717

1818
import io.helidon.build.common.RichTextRenderer;
1919
import io.helidon.build.common.logging.LogLevel;

‎common/maven-plugin/src/main/java/io/helidon/build/common/maven/plugin/PlexusLoggerHolder.java‎ renamed to ‎common/maven-logging/src/main/java/io/helidon/build/common/maven/logging/PlexusLoggerHolder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2023 Oracle and/or its affiliates.
2+
* Copyright (c) 2019, 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.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.helidon.build.common.maven.plugin;
16+
package io.helidon.build.common.maven.logging;
1717

1818
import java.util.concurrent.atomic.AtomicReference;
1919

‎common/maven-plugin/src/main/java/io/helidon/build/common/maven/plugin/PlexusLoggerInitializer.java‎ renamed to ‎common/maven-logging/src/main/java/io/helidon/build/common/maven/logging/PlexusLoggerInitializer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2019, 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.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.helidon.build.common.maven.plugin;
16+
package io.helidon.build.common.maven.logging;
1717

1818
import org.apache.maven.AbstractMavenLifecycleParticipant;
1919
import org.codehaus.plexus.component.annotations.Component;

‎common/maven-logging/src/main/java/io/helidon/build/common/maven/logging/package-info.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Copyright (c) 2025 Oracle and/or its affiliates.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* Helidon Build Common Maven Logging.
19+
*/
20+
package io.helidon.build.common.maven.logging;

‎common/maven-logging/src/main/resources/META-INF/services/io.helidon.build.common.logging.LogWriter‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.helidon.build.common.maven.logging.PlexusLogWriter

‎common/maven-plugin/pom.xml‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2021, 2024 Oracle and/or its affiliates.
4+
Copyright (c) 2021, 2025 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -42,11 +42,6 @@
4242
<artifactId>helidon-build-common-maven</artifactId>
4343
<version>${project.version}</version>
4444
</dependency>
45-
<dependency>
46-
<groupId>io.helidon.build-tools.common</groupId>
47-
<artifactId>helidon-build-common-ansi</artifactId>
48-
<version>${project.version}</version>
49-
</dependency>
5045
<dependency>
5146
<groupId>org.apache.maven</groupId>
5247
<artifactId>maven-core</artifactId>
@@ -63,20 +58,4 @@
6358
<scope>test</scope>
6459
</dependency>
6560
</dependencies>
66-
67-
<build>
68-
<plugins>
69-
<plugin>
70-
<groupId>org.codehaus.plexus</groupId>
71-
<artifactId>plexus-component-metadata</artifactId>
72-
<executions>
73-
<execution>
74-
<goals>
75-
<goal>generate-metadata</goal>
76-
</goals>
77-
</execution>
78-
</executions>
79-
</plugin>
80-
</plugins>
81-
</build>
8261
</project>

‎common/maven-plugin/src/main/resources/META-INF/services/io.helidon.build.common.logging.LogWriter‎

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

‎common/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2021, 2024 Oracle and/or its affiliates.
4+
Copyright (c) 2021, 2025 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
3333
<module>common</module>
3434
<module>ansi</module>
3535
<module>maven</module>
36+
<module>maven-logging</module>
3637
<module>maven-plugin</module>
3738
<module>maven-url-support</module>
3839
<module>test-utils</module>

‎maven-plugins/build-cache-maven-plugin/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2023, 2024 Oracle and/or its affiliates.
4+
Copyright (c) 2023, 2025 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -80,6 +80,11 @@
8080
<artifactId>helidon-build-common-maven-plugin</artifactId>
8181
<version>${project.version}</version>
8282
</dependency>
83+
<dependency>
84+
<groupId>io.helidon.build-tools.common</groupId>
85+
<artifactId>helidon-build-common-maven-logging</artifactId>
86+
<version>${project.version}</version>
87+
</dependency>
8388
<dependency>
8489
<groupId>org.junit.jupiter</groupId>
8590
<artifactId>junit-jupiter-api</artifactId>

0 commit comments

Comments
 (0)