Skip to content

Commit 96dae26

Browse files
emeroademeroad
committed
[#noissue] Cleanup javadoc configuration
1 parent 0ad0440 commit 96dae26

File tree

4 files changed

+34
-122
lines changed

4 files changed

+34
-122
lines changed

‎agent-module/agent-testweb/pom.xml

-27
Original file line numberDiff line numberDiff line change
@@ -141,32 +141,5 @@
141141
<module>spring-boot3-webflux-plugin-testweb</module>
142142
</modules>
143143
</profile>
144-
145-
<profile>
146-
<id>maven.central.release</id>
147-
<properties>
148-
<env>release</env>
149-
<spring.profiles.active>release</spring.profiles.active>
150-
</properties>
151-
<build>
152-
<plugins>
153-
<plugin>
154-
<groupId>org.apache.maven.plugins</groupId>
155-
<artifactId>maven-javadoc-plugin</artifactId>
156-
<configuration>
157-
<skip>true</skip>
158-
</configuration>
159-
<executions>
160-
<execution>
161-
<id>attach-javadocs</id>
162-
<goals>
163-
<goal>jar</goal>
164-
</goals>
165-
</execution>
166-
</executions>
167-
</plugin>
168-
</plugins>
169-
</build>
170-
</profile>
171144
</profiles>
172145
</project>

‎agent-module/bootstraps/bootstrap-java9-internal/pom.xml

+15-30
Original file line numberDiff line numberDiff line change
@@ -119,37 +119,22 @@
119119
</configuration>
120120
</plugin>
121121

122+
<plugin>
123+
<groupId>org.apache.maven.plugins</groupId>
124+
<artifactId>maven-javadoc-plugin</artifactId>
125+
<configuration>
126+
<legacyMode>true</legacyMode>
127+
<additionalOptions>
128+
<additionalOption>--add-exports</additionalOption>
129+
<additionalOption>java.base/jdk.internal.loader=ALL-UNNAMED</additionalOption>
130+
<additionalOption>--add-exports</additionalOption>
131+
<additionalOption>java.base/jdk.internal.module=ALL-UNNAMED</additionalOption>
132+
<additionalOption>--add-exports</additionalOption>
133+
<additionalOption>java.base/jdk.internal.misc=ALL-UNNAMED</additionalOption>
134+
</additionalOptions>
135+
</configuration>
136+
</plugin>
122137
</plugins>
123138
</build>
124139

125-
<profiles>
126-
<profile>
127-
<id>maven.central.release</id>
128-
<properties>
129-
<env>release</env>
130-
<spring.profiles.active>release</spring.profiles.active>
131-
</properties>
132-
<build>
133-
<plugins>
134-
<plugin>
135-
<groupId>org.apache.maven.plugins</groupId>
136-
<artifactId>maven-javadoc-plugin</artifactId>
137-
<configuration>
138-
<doclint>none</doclint>
139-
<source>8</source>
140-
<javadocExecutable>${jdk.home}/bin/javadoc</javadocExecutable>
141-
</configuration>
142-
<executions>
143-
<execution>
144-
<id>attach-javadocs</id>
145-
<goals>
146-
<goal>jar</goal>
147-
</goals>
148-
</execution>
149-
</executions>
150-
</plugin>
151-
</plugins>
152-
</build>
153-
</profile>
154-
</profiles>
155140
</project>

‎agent-module/bootstraps/bootstrap-java9/pom.xml

+8-32
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<properties>
2929
<jdk.version>9</jdk.version>
3030
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
31-
<!-- <maven.compiler.release>9</maven.compiler.release>-->
31+
<maven.compiler.release>9</maven.compiler.release>
3232
</properties>
3333

3434
<artifactId>pinpoint-bootstrap-java9</artifactId>
@@ -105,38 +105,14 @@
105105
</configuration>
106106
</plugin>
107107

108+
<plugin>
109+
<groupId>org.apache.maven.plugins</groupId>
110+
<artifactId>maven-javadoc-plugin</artifactId>
111+
<configuration>
112+
<legacyMode>true</legacyMode>
113+
</configuration>
114+
</plugin>
108115
</plugins>
109116
</build>
110117

111-
112-
<profiles>
113-
<profile>
114-
<id>maven.central.release</id>
115-
<properties>
116-
<env>release</env>
117-
<spring.profiles.active>release</spring.profiles.active>
118-
</properties>
119-
<build>
120-
<plugins>
121-
<plugin>
122-
<groupId>org.apache.maven.plugins</groupId>
123-
<artifactId>maven-javadoc-plugin</artifactId>
124-
<configuration>
125-
<doclint>none</doclint>
126-
<source>8</source>
127-
<javadocExecutable>${jdk.home}/bin/javadoc</javadocExecutable>
128-
</configuration>
129-
<executions>
130-
<execution>
131-
<id>attach-javadocs</id>
132-
<goals>
133-
<goal>jar</goal>
134-
</goals>
135-
</execution>
136-
</executions>
137-
</plugin>
138-
</plugins>
139-
</build>
140-
</profile>
141-
</profiles>
142118
</project>

‎agent-module/plugins/jdk-httpclient/pom.xml

+11-33
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@
3737
</configuration>
3838
</plugin>
3939

40+
<plugin>
41+
<groupId>org.apache.maven.plugins</groupId>
42+
<artifactId>maven-javadoc-plugin</artifactId>
43+
<configuration>
44+
<additionalOptions>
45+
<additionalOption>--add-exports</additionalOption>
46+
<additionalOption>java.net.http/jdk.internal.net.http=ALL-UNNAMED</additionalOption>
47+
</additionalOptions>
48+
</configuration>
49+
</plugin>
50+
4051
<plugin>
4152
<groupId>org.apache.maven.plugins</groupId>
4253
<artifactId>maven-surefire-plugin</artifactId>
@@ -50,37 +61,4 @@
5061
</plugins>
5162
</build>
5263

53-
<profiles>
54-
<profile>
55-
<id>maven.central.release</id>
56-
<properties>
57-
<env>release</env>
58-
<spring.profiles.active>release</spring.profiles.active>
59-
</properties>
60-
<build>
61-
<plugins>
62-
<plugin>
63-
<groupId>org.apache.maven.plugins</groupId>
64-
<artifactId>maven-javadoc-plugin</artifactId>
65-
<configuration>
66-
<doclint>none</doclint>
67-
<javadocExecutable>${jdk.home}/bin/javadoc</javadocExecutable>
68-
<additionalOptions>
69-
<additionalOption>--add-exports</additionalOption>
70-
<additionalOption>java.net.http/jdk.internal.net.http=ALL-UNNAMED</additionalOption>
71-
</additionalOptions>
72-
</configuration>
73-
<executions>
74-
<execution>
75-
<id>attach-javadocs</id>
76-
<goals>
77-
<goal>jar</goal>
78-
</goals>
79-
</execution>
80-
</executions>
81-
</plugin>
82-
</plugins>
83-
</build>
84-
</profile>
85-
</profiles>
8664
</project>

0 commit comments

Comments
 (0)