Skip to content

Conversation

@mbwhite
Copy link
Contributor

@mbwhite mbwhite commented Dec 17, 2025

Make all components put javadoc into a consistent root. This achieves the following

  • means the javadoc for the generated protobuf can be kept quiet - as we can't adjust the javadoc here
  • there is a single place for javadoc that could be published
  • the isthmus and core and protobuf projects can be interlinked
  • isthmus can be linked with the calcite javadoc
  • overview pages can be added
  • all under a versioned directory for easy maintence

To date there isn't (AFAIK) a stightforward maintainable way to merge javadoc form multi-component projects

@mbwhite mbwhite force-pushed the fix-javadoc-gen branch 2 times, most recently from 7c32998 to ea78d5c Compare December 17, 2025 10:34
@mbwhite mbwhite force-pushed the fix-javadoc-gen branch 2 times, most recently from aa66f53 to 3c5cf68 Compare January 5, 2026 16:35
@mbwhite mbwhite force-pushed the fix-javadoc-gen branch 2 times, most recently from bd4e0e9 to d66c27e Compare January 16, 2026 08:46
@mbwhite
Copy link
Contributor Author

mbwhite commented Jan 16, 2026

@nielspardon @andrew-coleman @benbellick @bestbeforetoday @vbarua

I've updated the merge conflicts; if there aren't any more urgent comments on this one... would it be ok to merge please? Help ro reduce any conflicts with other JavaDoc changes. Also this one helps to reduce the overall 'noise' level from the generated protobuf's javadoc.

Thanks

Make all components put javadoc into a consistent root.
This achieves the following

- means the javadoc for the generated protobuf can be
  kept quiet - as we can't adjust the javadoc here
- there is a single place for javadoc that could be published
- the isthmus and core and protobuf projects can be interlinked
- isthmus can be linked with the calcite javadoc
- overview pages can be added
- all under a versioned directory for easy maintence

To date there isn't (AFAIK) a stightforward maintainable way to
merge javadoc form multi-component projects

Signed-off-by: MBWhite <whitemat@uk.ibm.com>
Signed-off-by: MBWhite <whitemat@uk.ibm.com>
Signed-off-by: MBWhite <whitemat@uk.ibm.com>
Signed-off-by: MBWhite <whitemat@uk.ibm.com>
Signed-off-by: MBWhite <whitemat@uk.ibm.com>
Signed-off-by: MBWhite <whitemat@uk.ibm.com>
Signed-off-by: MBWhite <whitemat@uk.ibm.com>
@mbwhite mbwhite force-pushed the fix-javadoc-gen branch 2 times, most recently from c7b5824 to 5abcd50 Compare January 23, 2026 15:47
Signed-off-by: MBWhite <whitemat@uk.ibm.com>
tasks.named<Jar>("javadocJar") {
val shared = rootProject.layout.buildDirectory.dir("docs/${version}").get().asFile
if (!shared.exists()) {
println("Creating a dir for javadoc ${rootProject.buildDir}/docs/${version}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've seen a deprecation warning for the usebuildDir when I ran this locally. seems one should use layout.buildDirectory.get() instead.

tasks.named<Jar>("javadocJar") {
val shared = rootProject.layout.buildDirectory.dir("docs/${version}").get().asFile
if (!shared.exists()) {
println("Creating a dir for javadoc ${rootProject.buildDir}/${version}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've seen a deprecation warning for the usebuildDir when I ran this locally. seems one should use layout.buildDirectory.get() instead.


// Only the generated proto sources
setSource(fileTree(protoJavaDir) { include("**/*.java") })
// source(fileTree(immuteableJavaDir) { include("**/*.java") })
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this line is not really needed

Suggested change
// source(fileTree(immuteableJavaDir) { include("**/*.java") })


// Only the generated proto sources
setSource(fileTree(immuteableJavaDir) { include("**/*.java") })
// source(fileTree(immuteableJavaDir) { include("**/*.java") })
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// source(fileTree(immuteableJavaDir) { include("**/*.java") })

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants