[calcite] branch main updated: [CALCITE-5773] Gradle show tasks fails when creating javadocAggregateIncludingTests

[za...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zabetak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/main by this push:
     new 2baf23b46c [CALCITE-5773] Gradle show tasks fails when creating javadocAggregateIncludingTests
2baf23b46c is described below

commit 2baf23b46c93439bc84a4741f5060a86379dbbdf
Author: Stamatis Zampetakis <za...@gmail.com>
AuthorDate: Thu Jun 8 17:06:08 2023 +0200

    [CALCITE-5773] Gradle show tasks fails when creating javadocAggregateIncludingTests
    
    1. Exclude "bom" project from the javadoc aggregation since it does not
    have "main" and "test" objects causing "tasks" to fail.
    
    2. Include "tasks" when building with newest & oldest JDK in CI to
    ensure it remains functional.
    
    Close apache/calcite#3278
---
 .github/workflows/main.yml | 4 ++--
 build.gradle.kts           | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 64bf44d34f..54258956d9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -166,7 +166,7 @@ jobs:
         with:
           job-id: jdk${{ matrix.jdk }}
           remote-build-cache-proxy-enabled: false
-          arguments: --scan --no-parallel --no-daemon -Pguava.version=${{ env.GUAVA }} build
+          arguments: --scan --no-parallel --no-daemon -Pguava.version=${{ env.GUAVA }} tasks build
 
   linux-jdk11-tz:
     if: github.event.action != 'labeled'
@@ -244,7 +244,7 @@ jobs:
         with:
           job-id: jdk${{ matrix.jdk }}
           remote-build-cache-proxy-enabled: false
-          arguments: --scan --no-parallel --no-daemon -Pguava.version=${{ env.GUAVA }} build
+          arguments: --scan --no-parallel --no-daemon -Pguava.version=${{ env.GUAVA }} tasks build
 
   linux-avatica:
     if: github.event.action != 'labeled'
diff --git a/build.gradle.kts b/build.gradle.kts
index f618a99340..00bd901f21 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -202,6 +202,7 @@ val javadocAggregateIncludingTests by tasks.registering(Javadoc::class) {
     description = "Generates aggregate javadoc for all the artifacts"
 
     val sourceSets = subprojects
+        .filter { it.name != "bom" }
         .mapNotNull { it.extensions.findByType<SourceSetContainer>() }
         .flatMap { listOf(it.named("main"), it.named("test")) }