Set javadoc 23 specific flags only on JDK 23 and later

apache · Jan 14, 2025 · 1cc1873 · 1cc1873
1 parent 6869ba2
commit 1cc1873
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/nbbuild/javadoctools/template.xml b/nbbuild/javadoctools/template.xml
@@ -233,6 +233,11 @@ cause it to fail.
                 </not>
             </or>
         </condition>
+        <!-- codebase has many occurrences of '///' which were never meant to appear in javadoc
+             this disables JDK 23+ "line doc comments" for now  -->
+        <condition property="javadoc23.extra.flags" value="--disable-line-doc-comments" else="">
+            <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>
 
@@ -321,11 +326,9 @@ cause it to fail.
             <bottom>${javadoc.footer}</bottom>
             <!-- Avoid timestamp comments in _all_ html generated files, to reduce unnecessary git commits -->
             <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="-Xdoclint:all" />
             <arg value="-Xdoclint:-missing" />
+            <arg line="${javadoc23.extra.flags}" />
         </javadoc>
     </target>
 
@@ -350,6 +353,7 @@ cause it to fail.
             <bottom>${javadoc.footer}</bottom>
             <arg value="-Xdoclint:all" />
             <arg value="-Xdoclint:-missing" />
+            <arg line="${javadoc23.extra.flags}" />
         </javadoc>
     </target>