Skip to content

Commit f31c053

Browse files
committed
chore: Bump Gradle wrapper to 9.4.1 and exclude @ignore classes
Bump Gradle wrapper from 9.2.0 to 9.4.1 to satisfy the minimum version required by opensearch-build-tools 3.7.0-SNAPSHOT (GlobalBuildInfoPlugin). Exclude 24 @Ignore-annotated test classes from integTest at the Gradle layer to work around a Gradle 9.4.1+ bug where TestEventReporterAsListener crashes with ClassCastException when encountering class-level @ignore annotations. These classes were already skipped by JUnit; this moves the skip earlier to avoid the buggy bridge. Not fixed as of Gradle 9.5.0. Refs: opensearch-project/OpenSearch#21153, #5406 Signed-off-by: Chen Dai <daichen@amazon.com>
1 parent c0ac784 commit f31c053

2 files changed

Lines changed: 31 additions & 2 deletions

File tree

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
3+
distributionSha256Sum=708d2c6ecc97ca9a11838ef64a6c2301151b8dd10387e22dc1a12c30557cab5b
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

integ-test/build.gradle

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,35 @@ integTest {
546546
// Exclude this IT, because they executed in another task (:integTestWithSecurity)
547547
exclude 'org/opensearch/sql/security/**'
548548

549+
// Workaround for Gradle 9.4.1 bug: TestEventReporterAsListener crashes with ClassCastException
550+
// when encountering class-level @Ignore annotations. These classes were already skipped by JUnit;
551+
// this moves the skip to the Gradle layer to avoid the buggy bridge.
552+
// Remove once Gradle ships a fix (not fixed as of 9.5.0).
553+
exclude 'org/opensearch/sql/calcite/remote/CalciteInformationSchemaCommandIT.class'
554+
exclude 'org/opensearch/sql/calcite/remote/CalciteJsonFunctionsIT.class'
555+
exclude 'org/opensearch/sql/calcite/remote/CalcitePrometheusDataSourceCommandsIT.class'
556+
exclude 'org/opensearch/sql/calcite/remote/CalciteShowDataSourcesCommandIT.class'
557+
exclude 'org/opensearch/sql/legacy/AggregationIT.class'
558+
exclude 'org/opensearch/sql/legacy/DateFormatIT.class'
559+
exclude 'org/opensearch/sql/legacy/DateFunctionsIT.class'
560+
exclude 'org/opensearch/sql/legacy/HashJoinIT.class'
561+
exclude 'org/opensearch/sql/legacy/HavingIT.class'
562+
exclude 'org/opensearch/sql/legacy/JoinIT.class'
563+
exclude 'org/opensearch/sql/legacy/JSONRequestIT.class'
564+
exclude 'org/opensearch/sql/legacy/MathFunctionsIT.class'
565+
exclude 'org/opensearch/sql/legacy/MetricsIT.class'
566+
exclude 'org/opensearch/sql/legacy/MultiQueryIT.class'
567+
exclude 'org/opensearch/sql/legacy/NestedFieldQueryIT.class'
568+
exclude 'org/opensearch/sql/legacy/PreparedStatementIT.class'
569+
exclude 'org/opensearch/sql/legacy/QueryFunctionsIT.class'
570+
exclude 'org/opensearch/sql/legacy/QueryIT.class'
571+
exclude 'org/opensearch/sql/legacy/ShowIT.class'
572+
exclude 'org/opensearch/sql/legacy/SourceFieldIT.class'
573+
exclude 'org/opensearch/sql/legacy/SQLFunctionsIT.class'
574+
exclude 'org/opensearch/sql/legacy/SubqueryIT.class'
575+
exclude 'org/opensearch/sql/ppl/JsonFunctionsIT.class'
576+
exclude 'org/opensearch/sql/sql/ExpressionIT.class'
577+
549578
finalizedBy 'printIntegTestPaths'
550579
}
551580

0 commit comments

Comments
 (0)