Skip to content

Commit 71ade5d

Browse files
authored
[4.x] Plugin updates (helidon-io#8687)
* Fail on Javadoc warning switch as a maven property. * Maven dependency check module added to non-pom packaging modules, skipped by default. * Updated helidon-codegen and helidon-common modules to use the dependency and javadoc updated setup. * Adding `helidon-config` to keep backward compatibility of examples using webserver. * Helidon common mapper is not required by reactive streams. * Set phase to `none` in project pom, so it is not executed when the plugin is added for different executions.
1 parent 610f90b commit 71ade5d

55 files changed

Lines changed: 318 additions & 113 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

codegen/apt/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
<groupId>io.helidon.codegen</groupId>
4141
<artifactId>helidon-codegen</artifactId>
4242
</dependency>
43+
<dependency>
44+
<groupId>io.helidon.codegen</groupId>
45+
<artifactId>helidon-codegen-class-model</artifactId>
46+
</dependency>
4347
<dependency>
4448
<groupId>org.junit.jupiter</groupId>
4549
<artifactId>junit-jupiter-api</artifactId>

codegen/class-model/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
</description>
3333

3434
<dependencies>
35+
<dependency>
36+
<groupId>io.helidon.common</groupId>
37+
<artifactId>helidon-common</artifactId>
38+
</dependency>
3539
<dependency>
3640
<groupId>io.helidon.common</groupId>
3741
<artifactId>helidon-common-types</artifactId>

codegen/class-model/src/main/java/io/helidon/codegen/classmodel/ModelComponent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ abstract static class Builder<B extends Builder<B, T>, T extends ModelComponent>
4949
/**
5050
* Whether to include import type information among the imports.
5151
*
52-
* @param includeImport
53-
* @return
52+
* @param includeImport whether imports should be included
53+
* @return updated builder instance
5454
*/
5555
public B includeImport(boolean includeImport) {
5656
this.includeImport = includeImport;

codegen/codegen/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
<description>Code generation common utilities</description>
3232

3333
<dependencies>
34+
<dependency>
35+
<groupId>io.helidon.common</groupId>
36+
<artifactId>helidon-common</artifactId>
37+
</dependency>
3438
<dependency>
3539
<groupId>io.helidon.common</groupId>
3640
<artifactId>helidon-common-types</artifactId>

codegen/codegen/src/main/java/io/helidon/codegen/CodegenException.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
* This exception can hold {@link #originatingElement()} that may be used to provide more information to the user.
2424
*/
2525
public class CodegenException extends RuntimeException {
26+
/**
27+
* Originating element, depends on which codegen implementation is used.
28+
* For annotation processor, this could be the Element that caused this exception.
29+
*/
2630
private final Object originatingElement;
2731

2832
/**

codegen/compiler/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
</description>
3333

3434
<dependencies>
35+
<dependency>
36+
<groupId>io.helidon.common</groupId>
37+
<artifactId>helidon-common</artifactId>
38+
</dependency>
3539
<dependency>
3640
<groupId>io.helidon.codegen</groupId>
3741
<artifactId>helidon-codegen</artifactId>

codegen/helidon-copyright/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@
3434
</description>
3535

3636
<dependencies>
37+
<dependency>
38+
<groupId>io.helidon.common</groupId>
39+
<artifactId>helidon-common</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>io.helidon.common</groupId>
43+
<artifactId>helidon-common-types</artifactId>
44+
</dependency>
3745
<dependency>
3846
<groupId>io.helidon.codegen</groupId>
3947
<artifactId>helidon-codegen</artifactId>

codegen/helidon-copyright/src/main/java/io/helidon/codegen/helidon/copyright/HelidonCopyrightProvider.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ public class HelidonCopyrightProvider implements CopyrightProvider {
4545
*/
4646
""";
4747

48+
/**
49+
* Default constructor required by the {@link java.util.ServiceLoader}.
50+
*/
51+
public HelidonCopyrightProvider() {
52+
}
53+
4854
@Override
4955
public String copyright(TypeName generator, TypeName trigger, TypeName generatedType) {
5056
return COPYRIGHT_TEMPLATE.replace("{{year}}", year());

codegen/pom.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333

3434
<packaging>pom</packaging>
3535

36+
<properties>
37+
<javadoc.fail-on-warnings>true</javadoc.fail-on-warnings>
38+
</properties>
39+
3640
<modules>
3741
<module>codegen</module>
3842
<module>class-model</module>
@@ -41,4 +45,19 @@
4145
<module>scan</module>
4246
<module>compiler</module>
4347
</modules>
48+
49+
<build>
50+
<plugins>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-dependency-plugin</artifactId>
54+
<executions>
55+
<execution>
56+
<id>check-dependencies</id>
57+
<phase>verify</phase>
58+
</execution>
59+
</executions>
60+
</plugin>
61+
</plugins>
62+
</build>
4463
</project>

common/buffers/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
<name>Helidon Common Buffers</name>
3030

3131
<dependencies>
32-
<dependency>
33-
<groupId>io.helidon.common</groupId>
34-
<artifactId>helidon-common</artifactId>
35-
</dependency>
3632
<dependency>
3733
<groupId>org.junit.jupiter</groupId>
3834
<artifactId>junit-jupiter-api</artifactId>

0 commit comments

Comments
 (0)