Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set javadoc 23 specific flags only on JDK 23 and later #8152

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Set javadoc 23 specific flags only on JDK 23 and later #8152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions nbbuild/javadoctools/template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<!ENTITY disallowed-links SYSTEM "disallowed-links.xml">
]>

<project name="template" default="die" basedir=".">
<project name="template" default="die" basedir="." xmlns:if="ant:if">

<import file="../default-properties.xml"/>

Expand Down Expand Up @@ -233,6 +233,9 @@ cause it to fail.
</not>
</or>
</condition>
<condition property="javadoc23.or.later">
<javaversion atleast="23"/>
</condition>
<echo level="verbose">javadoc.up.to.date=${javadoc.up.to.date} javadoc.should.not.be.generated=${javadoc.should.not.be.generated} javadoc.packages=${javadoc.packages}</echo>
</target>

Expand Down Expand Up @@ -323,7 +326,7 @@ cause it to fail.
<arg value="-notimestamp" />
<!-- codebase has many occurrences of '///' which were never meant to appear in javadoc
this disables JDK 23+ "line doc comments" for now -->
<arg value="--disable-line-doc-comments" />
<arg value="--disable-line-doc-comments" if:true="${javadoc23.or.later}" />
<arg value="-Xdoclint:all" />
<arg value="-Xdoclint:-missing" />
</javadoc>
Expand All @@ -348,6 +351,9 @@ cause it to fail.
<doctitle>${javadoc.title}&lt;br/&gt;${javadoc.stability.label}</doctitle>
<header>${javadoc.header}</header>
<bottom>${javadoc.footer}</bottom>
<!-- codebase has many occurrences of '///' which were never meant to appear in javadoc
this disables JDK 23+ "line doc comments" for now -->
<arg value="--disable-line-doc-comments" if:true="${javadoc23.or.later}" />
<arg value="-Xdoclint:all" />
<arg value="-Xdoclint:-missing" />
</javadoc>
Expand Down
Loading