[calcite-avatica] branch main updated: [CALCITE-5812] Gradle tasks fails when creating the javadoc aggregation

[zabetak]

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-avatica.git


The following commit(s) were added to refs/heads/main by this push:
     new be8b99aee [CALCITE-5812] Gradle tasks fails when creating the javadoc 
aggregation
be8b99aee is described below

commit be8b99aeede2883e5692124edd187eaeffabed2c
Author: Richard Antal <richard.an...@cloudera.com>
AuthorDate: Fri Jun 30 12:05:03 2023 +0200

    [CALCITE-5812] Gradle tasks fails when creating the javadoc aggregation
    
    Exclude "bom" project from the javadoc aggregation since it does not
    have "main" and "test" objects causing "tasks" to fail.
    
    Close apache/calcite-avatica#222
---
 .github/workflows/main.yml | 6 +++---
 build.gradle.kts           | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a2670a8d6..c55c92b69 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,7 +58,7 @@ jobs:
           fetch-depth: 50
       - name: 'Test'
         run: |
-          ./gradlew --no-parallel --no-daemon build javadoc 
-Pcheckstyle.version=9.3
+          ./gradlew --no-parallel --no-daemon tasks build javadoc 
-Pcheckstyle.version=9.3
 
   linux-jdk8-avatica:
     name: 'Linux (JDK 8), Avatica main'
@@ -117,7 +117,7 @@ jobs:
           fetch-depth: 50
       - name: 'Test'
         run: |
-          ./gradlew --no-parallel --no-daemon -Pguava.version=${GUAVA:-14.0.1} 
build
+          ./gradlew --no-parallel --no-daemon -Pguava.version=${GUAVA:-14.0.1} 
tasks build
 
   linux-jdk11-middle-aged-guava:
     name: 'Linux (JDK 11), Middle-Aged Guava'
@@ -202,4 +202,4 @@ jobs:
         distribution: 'zulu'
     - name: 'Test'
       run: |
-        ./gradlew --no-parallel --no-daemon build javadoc
+        ./gradlew --no-parallel --no-daemon tasks build javadoc
diff --git a/build.gradle.kts b/build.gradle.kts
index d5671dab9..374a2a980 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -140,6 +140,7 @@ val javadocAggregate by tasks.registering(Javadoc::class) {
     description = "Generates aggregate javadoc for all the artifacts"
 
     val sourceSets = allprojects
+        .filter { it.name != "bom" }
         .mapNotNull { it.extensions.findByType<SourceSetContainer>() }
         .map { it.named("main") }
 
@@ -154,6 +155,7 @@ val javadocAggregateIncludingTests by 
tasks.registering(Javadoc::class) {
     description = "Generates aggregate javadoc for all the artifacts, 
including test code"
 
     val sourceSets = allprojects
+        .filter { it.name != "bom" }
         .mapNotNull { it.extensions.findByType<SourceSetContainer>() }
         .flatMap { listOf(it.named("main"), it.named("test")) }