Skip to content

Commit c09e74b

Browse files
authored
chore: Bump Gradle wrapper to 9.4.1 and exclude @ignore classes (opensearch-project#5414)
1 parent c0ac784 commit c09e74b

3 files changed

Lines changed: 31 additions & 6 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

integ-test/src/test/java/org/opensearch/sql/calcite/CalciteNoPushdownIT.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,8 @@
4444
CalciteGeoIpFunctionsIT.class,
4545
CalciteGeoPointFormatsIT.class,
4646
CalciteHeadCommandIT.class,
47-
CalciteInformationSchemaCommandIT.class,
4847
CalciteIPComparisonIT.class,
4948
CalciteIPFunctionsIT.class,
50-
CalciteJsonFunctionsIT.class,
5149
CalciteLegacyAPICompatibilityIT.class,
5250
CalciteLikeQueryIT.class,
5351
CalciteMathematicalFunctionIT.class,
@@ -90,7 +88,6 @@
9088
CalcitePPLSortIT.class,
9189
CalcitePPLStringBuiltinFunctionIT.class,
9290
CalcitePPLTrendlineIT.class,
93-
CalcitePrometheusDataSourceCommandsIT.class,
9491
CalciteQueryAnalysisIT.class,
9592
CalciteRareCommandIT.class,
9693
CalciteRegexCommandIT.class,
@@ -101,7 +98,6 @@
10198
CalciteResourceMonitorIT.class,
10299
CalciteSearchCommandIT.class,
103100
CalciteSettingsIT.class,
104-
CalciteShowDataSourcesCommandIT.class,
105101
CalciteSortCommandIT.class,
106102
CalciteStatsCommandIT.class,
107103
CalciteSystemFunctionIT.class,

0 commit comments

Comments
 (0)