diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b11741a1ada..ffc9416beb1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip +distributionSha256Sum=708d2c6ecc97ca9a11838ef64a6c2301151b8dd10387e22dc1a12c30557cab5b +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/integ-test/build.gradle b/integ-test/build.gradle index b914cb0cbe0..4bd9a9847ca 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -546,6 +546,35 @@ integTest { // Exclude this IT, because they executed in another task (:integTestWithSecurity) exclude 'org/opensearch/sql/security/**' + // Workaround for Gradle 9.4.1 bug: TestEventReporterAsListener crashes with ClassCastException + // when encountering class-level @Ignore annotations. These classes were already skipped by JUnit; + // this moves the skip to the Gradle layer to avoid the buggy bridge. + // Remove once Gradle ships a fix (not fixed as of 9.5.0). + exclude 'org/opensearch/sql/calcite/remote/CalciteInformationSchemaCommandIT.class' + exclude 'org/opensearch/sql/calcite/remote/CalciteJsonFunctionsIT.class' + exclude 'org/opensearch/sql/calcite/remote/CalcitePrometheusDataSourceCommandsIT.class' + exclude 'org/opensearch/sql/calcite/remote/CalciteShowDataSourcesCommandIT.class' + exclude 'org/opensearch/sql/legacy/AggregationIT.class' + exclude 'org/opensearch/sql/legacy/DateFormatIT.class' + exclude 'org/opensearch/sql/legacy/DateFunctionsIT.class' + exclude 'org/opensearch/sql/legacy/HashJoinIT.class' + exclude 'org/opensearch/sql/legacy/HavingIT.class' + exclude 'org/opensearch/sql/legacy/JoinIT.class' + exclude 'org/opensearch/sql/legacy/JSONRequestIT.class' + exclude 'org/opensearch/sql/legacy/MathFunctionsIT.class' + exclude 'org/opensearch/sql/legacy/MetricsIT.class' + exclude 'org/opensearch/sql/legacy/MultiQueryIT.class' + exclude 'org/opensearch/sql/legacy/NestedFieldQueryIT.class' + exclude 'org/opensearch/sql/legacy/PreparedStatementIT.class' + exclude 'org/opensearch/sql/legacy/QueryFunctionsIT.class' + exclude 'org/opensearch/sql/legacy/QueryIT.class' + exclude 'org/opensearch/sql/legacy/ShowIT.class' + exclude 'org/opensearch/sql/legacy/SourceFieldIT.class' + exclude 'org/opensearch/sql/legacy/SQLFunctionsIT.class' + exclude 'org/opensearch/sql/legacy/SubqueryIT.class' + exclude 'org/opensearch/sql/ppl/JsonFunctionsIT.class' + exclude 'org/opensearch/sql/sql/ExpressionIT.class' + finalizedBy 'printIntegTestPaths' } diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/CalciteNoPushdownIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/CalciteNoPushdownIT.java index 29c2ffd582f..206ee52fcae 100644 --- a/integ-test/src/test/java/org/opensearch/sql/calcite/CalciteNoPushdownIT.java +++ b/integ-test/src/test/java/org/opensearch/sql/calcite/CalciteNoPushdownIT.java @@ -44,10 +44,8 @@ CalciteGeoIpFunctionsIT.class, CalciteGeoPointFormatsIT.class, CalciteHeadCommandIT.class, - CalciteInformationSchemaCommandIT.class, CalciteIPComparisonIT.class, CalciteIPFunctionsIT.class, - CalciteJsonFunctionsIT.class, CalciteLegacyAPICompatibilityIT.class, CalciteLikeQueryIT.class, CalciteMathematicalFunctionIT.class, @@ -90,7 +88,6 @@ CalcitePPLSortIT.class, CalcitePPLStringBuiltinFunctionIT.class, CalcitePPLTrendlineIT.class, - CalcitePrometheusDataSourceCommandsIT.class, CalciteQueryAnalysisIT.class, CalciteRareCommandIT.class, CalciteRegexCommandIT.class, @@ -101,7 +98,6 @@ CalciteResourceMonitorIT.class, CalciteSearchCommandIT.class, CalciteSettingsIT.class, - CalciteShowDataSourcesCommandIT.class, CalciteSortCommandIT.class, CalciteStatsCommandIT.class, CalciteSystemFunctionIT.class,