Skip to content

Commit f640500

Browse files
authored
Merge pull request #7907 from mbien/disable-jdk23-line-doc_delivery
Disable JDK 23 line-doc comments for now
2 parents 2669fd6 + 78699aa commit f640500

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,11 +416,25 @@ jobs:
416416
- name: Build nbms
417417
run: ant $OPTS build-nbms
418418

419-
# 13-14 min
419+
# 13-14 min for javadoc; JDK version must be synced with nb-javac
420+
- name: Set up JDK 23 for javadoc
421+
if: env.test_javadoc == 'true' && success()
422+
uses: actions/setup-java@v4
423+
with:
424+
java-version: 23
425+
distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
426+
420427
- name: Build javadoc
421428
if: env.test_javadoc == 'true' && success()
422429
run: ant $OPTS build-javadoc
423430

431+
- name: Set up JDK ${{ matrix.java }}
432+
if: env.test_javadoc == 'true' && success()
433+
uses: actions/setup-java@v4
434+
with:
435+
java-version: ${{ matrix.java }}
436+
distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
437+
424438
# runs only in PRs if requested; ~18 min
425439
- name: Build all Tests
426440
if: env.test_tests == 'true' && github.event_name == 'pull_request' && success()

nbbuild/javadoctools/template.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,9 @@ cause it to fail.
321321
<bottom>${javadoc.footer}</bottom>
322322
<!-- Avoid timestamp comments in _all_ html generated files, to reduce unnecessary git commits -->
323323
<arg value="-notimestamp" />
324+
<!-- codebase has many occurrences of '///' which were never meant to appear in javadoc
325+
this disables JDK 23+ "line doc comments" for now -->
326+
<arg value="--disable-line-doc-comments" />
324327
<arg value="-Xdoclint:all" />
325328
<arg value="-Xdoclint:-missing" />
326329
</javadoc>

0 commit comments

Comments
 (0)