This is an automated email from the ASF dual-hosted git repository.
timoninmaxim pushed a commit to branch IGNITE-13202__jdk11_javadoc
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 86f6ae2fdd424f96ceb0557aeb5641fec38478fb
Author: Maksim Timonin <timonin.ma...@gmail.com>
AuthorDate: Thu Jun 20 16:48:30 2024 +0300
IGNITE-13202 Fix javadoc exclusion for java11
---
modules/ducktests/pom.xml | 10 ++++++++
modules/yardstick/pom-standalone.xml | 2 +-
parent/pom.xml | 4 ++--
pom.xml | 46 +++++++++++++++++++++++++++++++++++-
4 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/modules/ducktests/pom.xml b/modules/ducktests/pom.xml
index e5756e74872..2fa27c9f3b6 100644
--- a/modules/ducktests/pom.xml
+++ b/modules/ducktests/pom.xml
@@ -163,6 +163,16 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.plugin.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
</project>
diff --git a/modules/yardstick/pom-standalone.xml
b/modules/yardstick/pom-standalone.xml
index c667650c325..755ce7bd929 100644
--- a/modules/yardstick/pom-standalone.xml
+++ b/modules/yardstick/pom-standalone.xml
@@ -175,7 +175,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>${maven.javadoc.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1fe2f1731ff..9dbf3472d50 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -915,6 +915,8 @@
<arg>--add-exports</arg>
<arg>java.base/sun.nio.ch=ALL-UNNAMED</arg>
<arg>--add-exports</arg>
+ <arg>java.base/sun.net.util=ALL-UNNAMED</arg>
+ <arg>--add-exports</arg>
<arg>java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED</arg>
<arg>--add-exports</arg>
<arg>jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED</arg>
@@ -945,9 +947,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <!-- TODO
https://issues.apache.org/jira/browse/IGNITE-13202 -->
<additionalOptions>${javadoc.opts}
--add-exports=java.base/sun.nio.ch=ALL-UNNAMED
--add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED</additionalOptions>
- <detectJavaApiLink>false</detectJavaApiLink>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index de4d928f2dc..d90d3129a62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,51 @@
</tagletArtifact>
<reportOutputDirectory>${basedir}/target/javadoc</reportOutputDirectory>
<destDir>core</destDir>
- <subpackages>org.apache.ignite -exclude
org.apache.ignite.codegen:org.apache.ignite.examples:org.apache.ignite.internal:org.apache.ignite.schema:org.apache.ignite.tests:org.apache.ignite.tools:org.apache.ignite.util:org.apache.ignite.spi.discovery.tcp.messages:org.apache.ignite.spi.discovery.tcp.internal:org.apache.ignite.spi.communication.tcp.internal:org.apache.ignite.spi.discovery.zk.internal:org.apache.ignite.spi.deployment.uri.scanners:org.apache.
[...]
+
+ <excludePackageNames>
+ <!-- External packages, usage of
-subpackages flag leads to incorrect handling of excludePackageNames. -->
+ <!--
https://issues.apache.org/jira/browse/MJAVADOC-797 -->
+ io
+ :io.*
+ :org.apache.calcite
+ :org.apache.calcite.*
+ :org.jsr166
+ :org.jsr166.*
+ :org.mindrot
+ :org.mindrot.*
+
+ <!-- For each package use 2 patterns -
direct and with .* suffix. -->
+ :org.apache.ignite.codegen
+ :org.apache.ignite.codegen.*
+ :org.apache.ignite.examples
+ :org.apache.ignite.examples.*
+ :org.apache.ignite.internal
+ :org.apache.ignite.internal.*
+ :org.apache.ignite.schema
+ :org.apache.ignite.schema.*
+ :org.apache.ignite.tests
+ :org.apache.ignite.tests.*
+ :org.apache.ignite.tools
+ :org.apache.ignite.tools.*
+ :org.apache.ignite.util
+ :org.apache.ignite.util.*
+
:org.apache.ignite.spi.discovery.tcp.messages
+
:org.apache.ignite.spi.discovery.tcp.messages.*
+
:org.apache.ignite.spi.discovery.tcp.internal
+
:org.apache.ignite.spi.discovery.tcp.internal.*
+
:org.apache.ignite.spi.communication.tcp.internal
+
:org.apache.ignite.spi.communication.tcp.internal.*
+
:org.apache.ignite.spi.discovery.zk.internal
+
:org.apache.ignite.spi.discovery.zk.internal.*
+
:org.apache.ignite.spi.deployment.uri.scanners
+
:org.apache.ignite.spi.deployment.uri.scanners.*
+
:org.apache.ignite.spi.deployment.uri.tasks
+
:org.apache.ignite.spi.deployment.uri.tasks.*
+ :org.apache.ignite.yardstick
+ :org.apache.ignite.yardstick.*
+ :org.apache.ignite.webtest
+ :org.apache.ignite.webtest.*
+ </excludePackageNames>
</configuration>
</execution>
</executions>
