Skip to content

Commit 6e3c253

Browse files
intr3p1dintr3p1d
committed
[#noissue] Fix javadoc generation failure
[#11069] Bump javadoc plugin from 3.4.0 to 3.6.3 [#noissue] Add --add-exports options to `maven-javadoc-plugin` [#noissue] Skip Javadoc generation for `bootstrap-java9-internal` [#8851] Fix javadoc generation failure [#noissue] Commented out the release option [#noissue] Skip it-module, testweb [#noissue] Bump nexus-staging-maven-plugin from 1.6.8 to 1.6.13
1 parent e61304b commit 6e3c253

File tree

6 files changed

+132
-6
lines changed

6 files changed

+132
-6
lines changed

‎.github/workflows/maven-central-deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Java Environment
6161
run: env | grep '^JAVA'
6262
- name: Publish package
63-
run: ./mvnw --batch-mode deploy --file pom.xml -DskipTests=true -Pmaven.central.release
63+
run: ./mvnw --batch-mode deploy --file pom.xml -P '!it-module,!agent-testweb-module' -DskipTests=true -Pmaven.central.release
6464
env:
6565
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
6666
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

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

+28
Original file line numberDiff line numberDiff line change
@@ -141,5 +141,33 @@
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+
<version>${plugin.javadoc.version}</version>
157+
<configuration>
158+
<skip>true</skip>
159+
</configuration>
160+
<executions>
161+
<execution>
162+
<id>attach-javadocs</id>
163+
<goals>
164+
<goal>jar</goal>
165+
</goals>
166+
</execution>
167+
</executions>
168+
</plugin>
169+
</plugins>
170+
</build>
171+
</profile>
144172
</profiles>
145173
</project>

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

+32-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
-->
1717

1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<groupId>com.navercorp.pinpoint</groupId>
@@ -122,4 +122,35 @@
122122
</plugins>
123123
</build>
124124

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+
<version>${plugin.javadoc.version}</version>
138+
<configuration>
139+
<doclint>none</doclint>
140+
<source>8</source>
141+
<javadocExecutable>${jdk.home}/bin/javadoc</javadocExecutable>
142+
</configuration>
143+
<executions>
144+
<execution>
145+
<id>attach-javadocs</id>
146+
<goals>
147+
<goal>jar</goal>
148+
</goals>
149+
</execution>
150+
</executions>
151+
</plugin>
152+
</plugins>
153+
</build>
154+
</profile>
155+
</profiles>
125156
</project>

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

+33-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +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>
32-
31+
<!-- <maven.compiler.release>9</maven.compiler.release>-->
3332
</properties>
3433

3534
<artifactId>pinpoint-bootstrap-java9</artifactId>
@@ -109,4 +108,36 @@
109108
</plugins>
110109
</build>
111110

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+
<version>${plugin.javadoc.version}</version>
125+
<configuration>
126+
<doclint>none</doclint>
127+
<source>8</source>
128+
<javadocExecutable>${jdk.home}/bin/javadoc</javadocExecutable>
129+
</configuration>
130+
<executions>
131+
<execution>
132+
<id>attach-javadocs</id>
133+
<goals>
134+
<goal>jar</goal>
135+
</goals>
136+
</execution>
137+
</executions>
138+
</plugin>
139+
</plugins>
140+
</build>
141+
</profile>
142+
</profiles>
112143
</project>

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

+35
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,39 @@
5151
</plugin>
5252
</plugins>
5353
</build>
54+
55+
<profiles>
56+
<profile>
57+
<id>maven.central.release</id>
58+
<properties>
59+
<env>release</env>
60+
<spring.profiles.active>release</spring.profiles.active>
61+
</properties>
62+
<build>
63+
<plugins>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-javadoc-plugin</artifactId>
67+
<version>${plugin.javadoc.version}</version>
68+
<configuration>
69+
<doclint>none</doclint>
70+
<javadocExecutable>${jdk.home}/bin/javadoc</javadocExecutable>
71+
<additionalOptions>
72+
<additionalOption>--add-exports</additionalOption>
73+
<additionalOption>java.net.http/jdk.internal.net.http=ALL-UNNAMED</additionalOption>
74+
</additionalOptions>
75+
</configuration>
76+
<executions>
77+
<execution>
78+
<id>attach-javadocs</id>
79+
<goals>
80+
<goal>jar</goal>
81+
</goals>
82+
</execution>
83+
</executions>
84+
</plugin>
85+
</plugins>
86+
</build>
87+
</profile>
88+
</profiles>
5489
</project>

‎pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@
263263
<plugin.jar.version>3.3.0</plugin.jar.version>
264264
<plugin.antrun.version>3.0.0</plugin.antrun.version>
265265
<plugin.build-helper.version>3.4.0</plugin.build-helper.version>
266+
<plugin.javadoc.version>3.6.3</plugin.javadoc.version>
266267

267268
<plugin.spotbugs.version>4.7.3.6</plugin.spotbugs.version>
268269
<plugin.pmd.version>3.21.2</plugin.pmd.version>
@@ -1955,7 +1956,7 @@
19551956
</plugin>
19561957
<plugin>
19571958
<artifactId>maven-javadoc-plugin</artifactId>
1958-
<version>3.4.0</version>
1959+
<version>${plugin.javadoc.version}</version>
19591960
<configuration>
19601961
<doclint>none</doclint>
19611962
<!-- <detectOfflineLinks>false</detectOfflineLinks>-->
@@ -1995,7 +1996,7 @@
19951996
<plugin>
19961997
<groupId>org.sonatype.plugins</groupId>
19971998
<artifactId>nexus-staging-maven-plugin</artifactId>
1998-
<version>1.6.8</version>
1999+
<version>1.6.13</version>
19992000
<extensions>true</extensions>
20002001
<configuration>
20012002
<serverId>ossrh</serverId>

0 commit comments

Comments
 (0)