Skip to content

Commit

Permalink
MID-7719: Added Javadoc profiles for JDK 11
Browse files Browse the repository at this point in the history
Option which fixes undefined in search links is supported in JDK 11
but in later JDKs this option breaks generation.

Added profile, which enables option only and only on JDK 11, which
we use to generate public facing docs.

Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
  • Loading branch information
tonydamage committed Apr 7, 2022
1 parent fbc104b commit 7007a23
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
16 changes: 15 additions & 1 deletion dist/javadoc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
<maven.install.skip>true</maven.install.skip>
<!-- This enables build without -DskipTests option (e.g. full build). -->
<maven.test.skip>true</maven.test.skip>
<!-- Profile for JDK11 sets additional javadocs options for java 11 (which are removed in java 13+ -->
<javadoc.options></javadoc.options>
</properties>

<dependencies>
Expand Down Expand Up @@ -68,7 +70,7 @@
<isOffline>true</isOffline>
<doctitle>midPoint Aggregate JavaDoc</doctitle>
<windowtitle>midPoint Aggregate JavaDoc</windowtitle>
<!--<additionalJOption>&#45;&#45;no-module-directories</additionalJOption>-->
<additionalJOption>${javadoc.options}</additionalJOption>
<doclint>none</doclint>
<quiet>true</quiet>
<debug>false</debug>
Expand Down Expand Up @@ -116,4 +118,16 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>active-on-jdk-11</id>
<activation>
<jdk>11</jdk>
</activation>
<properties>
<javadoc.options>--no-module-directories</javadoc.options>
</properties>
</profile>
</profiles>
</project>
15 changes: 14 additions & 1 deletion dist/midpoint-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

<properties>
<maven.test.skip>true</maven.test.skip>
<!-- Profile for JDK11 sets additional javadocs options for java 11 (which are removed in java 13+ -->
<javadoc.options></javadoc.options>
</properties>

<dependencies>
Expand Down Expand Up @@ -88,7 +90,7 @@
<quiet>false</quiet>
<debug>false</debug>
<doclint>none</doclint>
<!--<additionalJOption>&#45;&#45;no-module-directories</additionalJOption>-->
<additionalJOption>${javadoc.options}</additionalJOption>

<!--
TODO: Not usable yet, see https://github.com/asciidoctor/asciidoclet/pull/96 for the progress on JDK 11 support.
Expand Down Expand Up @@ -127,4 +129,15 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>active-on-jdk-11</id>
<activation>
<jdk>11</jdk>
</activation>
<properties>
<javadoc.options>--no-module-directories</javadoc.options>
</properties>
</profile>
</profiles>
</project>

0 comments on commit 7007a23

Please sign in to comment.