Merge branch 'main' into 12341-bitmap-filtering

CHANGELOG.md

@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [Workload Management] Add QueryGroup schema ([13669](https:/opensearch-project/OpenSearch/pull/13669))
 - Add batching supported processor base type AbstractBatchingProcessor ([#14554](https:/opensearch-project/OpenSearch/pull/14554))
 - Fix race condition while parsing derived fields from search definition ([14445](https:/opensearch-project/OpenSearch/pull/14445))
+- Add `strict_allow_templates` dynamic mapping option ([#14555](https:/opensearch-project/OpenSearch/pull/14555))
 - Add allowlist setting for ingest-common and search-pipeline-common processors ([#14439](https:/opensearch-project/OpenSearch/issues/14439))
 - Create SystemIndexRegistry with helper method matchesSystemIndex ([#14415](https:/opensearch-project/OpenSearch/pull/14415))
 - Print reason why parent task was cancelled ([#14604](https:/opensearch-project/OpenSearch/issues/14604))
@@ -35,6 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.github.spullara.mustache.java:compiler` from 0.9.13 to 0.9.14 ([#14672](https:/opensearch-project/OpenSearch/pull/14672))
 - Bump `net.minidev:accessors-smart` from 2.5.0 to 2.5.1 ([#14673](https:/opensearch-project/OpenSearch/pull/14673))
 - Bump `jackson` from 2.17.1 to 2.17.2 ([#14687](https:/opensearch-project/OpenSearch/pull/14687))
+- Bump `net.minidev:json-smart` from 2.5.0 to 2.5.1 ([#14748](https:/opensearch-project/OpenSearch/pull/14748))
 
 ### Changed
 - [Tiered Caching] Move query recomputation logic outside write lock ([#14187](https:/opensearch-project/OpenSearch/pull/14187))
@@ -63,8 +65,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix FuzzyQuery in keyword field will use IndexOrDocValuesQuery when both of index and doc_value are true ([#14378](https:/opensearch-project/OpenSearch/pull/14378))
 - Fix file cache initialization ([#14004](https:/opensearch-project/OpenSearch/pull/14004))
 - Handle NPE in GetResult if "found" field is missing ([#14552](https:/opensearch-project/OpenSearch/pull/14552))
+- Fix create or update alias API doesn't throw exception for unsupported parameters ([#14719](https:/opensearch-project/OpenSearch/pull/14719))
 - Refactoring FilterPath.parse by using an iterative approach ([#14200](https:/opensearch-project/OpenSearch/pull/14200))
 - Refactoring Grok.validatePatternBank by using an iterative approach ([#14206](https:/opensearch-project/OpenSearch/pull/14206))
+- Update help output for _cat ([#14722](https:/opensearch-project/OpenSearch/pull/14722))
 
 ### Security
 

buildSrc/src/main/java/org/opensearch/gradle/test/rest/RestResourcesPlugin.java

@@ -81,50 +81,52 @@ public void apply(Project project) {
  // tests
  Configuration testConfig = project.getConfigurations().create("restTestConfig");
  project.getConfigurations().create("restTests");
+
+ if (BuildParams.isInternal()) {
+ // core
+ Dependency restTestdependency = project.getDependencies().project(new HashMap<String, String>() {
+ {
+ put("path", ":rest-api-spec");
+ put("configuration", "restTests");
+ }
+ });
+ testConfig.withDependencies(s -> s.add(restTestdependency));
+ } else {
+ Dependency dependency = project.getDependencies().create("org.opensearch:rest-api-spec:" + VersionProperties.getOpenSearch());
+ testConfig.withDependencies(s -> s.add(dependency));
+ }
+
  Provider<CopyRestTestsTask> copyRestYamlTestTask = project.getTasks()
  .register("copyYamlTestsTask", CopyRestTestsTask.class, task -> {
  task.includeCore.set(extension.restTests.getIncludeCore());
  task.coreConfig = testConfig;
  task.sourceSetName = SourceSet.TEST_SOURCE_SET_NAME;
- if (BuildParams.isInternal()) {
- // core
- Dependency restTestdependency = project.getDependencies().project(new HashMap<String, String>() {
- {
- put("path", ":rest-api-spec");
- put("configuration", "restTests");
- }
- });
- project.getDependencies().add(task.coreConfig.getName(), restTestdependency);
- } else {
- Dependency dependency = project.getDependencies()
- .create("org.opensearch:rest-api-spec:" + VersionProperties.getOpenSearch());
- project.getDependencies().add(task.coreConfig.getName(), dependency);
- }
  task.dependsOn(task.coreConfig);
  });
 
  // api
  Configuration specConfig = project.getConfigurations().create("restSpec"); // name chosen for passivity
  project.getConfigurations().create("restSpecs");
+
+ if (BuildParams.isInternal()) {
+ Dependency restSpecDependency = project.getDependencies().project(new HashMap<String, String>() {
+ {
+ put("path", ":rest-api-spec");
+ put("configuration", "restSpecs");
+ }
+ });
+ specConfig.withDependencies(s -> s.add(restSpecDependency));
+ } else {
+ Dependency dependency = project.getDependencies().create("org.opensearch:rest-api-spec:" + VersionProperties.getOpenSearch());
+ specConfig.withDependencies(s -> s.add(dependency));
+ }
+
  Provider<CopyRestApiTask> copyRestYamlSpecTask = project.getTasks()
  .register("copyRestApiSpecsTask", CopyRestApiTask.class, task -> {
  task.includeCore.set(extension.restApi.getIncludeCore());
  task.dependsOn(copyRestYamlTestTask);
  task.coreConfig = specConfig;
  task.sourceSetName = SourceSet.TEST_SOURCE_SET_NAME;
- if (BuildParams.isInternal()) {
- Dependency restSpecDependency = project.getDependencies().project(new HashMap<String, String>() {
- {
- put("path", ":rest-api-spec");
- put("configuration", "restSpecs");
- }
- });
- project.getDependencies().add(task.coreConfig.getName(), restSpecDependency);
- } else {
- Dependency dependency = project.getDependencies()
- .create("org.opensearch:rest-api-spec:" + VersionProperties.getOpenSearch());
- project.getDependencies().add(task.coreConfig.getName(), dependency);
- }
  task.dependsOn(task.coreConfig);
  });
 

gradle/wrapper/gradle-wrapper.properties

@@ -11,7 +11,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
+distributionSha256Sum=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 # Darwin, MinGW, and NonStop.
 #
 # (3) This script is generated from the Groovy template
-# https:/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https:/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 # within the Gradle project.
 #
 # You can find Gradle at https:/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https:/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################