Branch: refs/heads/main Home: https://github.com/hibernate/hibernate-search Commit: f7171886d798d506c2e005e055b2c7b232a90c7d https://github.com/hibernate/hibernate-search/commit/f7171886d798d506c2e0... Author: marko-bekhta <marko.prykladna(a)gmail.com&gt; Date: 2023-04-21 (Fri, 21 Apr 2023) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/lowlevel/index/mapping/impl/AbstractTypeMapping.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/lowlevel/index/mapping/impl/RootTypeMapping.java M documentation/src/main/asciidoc/reference/backend-elasticsearch.asciidoc M documentation/src/test/resources/custom/index-mapping-merged.json M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerCreationCustomMappingIT.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerCreationMappingFieldTemplatesIT.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerUpdateCustomMappingIT.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerValidationCustomMappingIT.java A integrationtest/backend/elasticsearch/src/test/resources/custom-index-mapping/no-overlapping-with-templates.json Log Message: ----------- HSEARCH-4825 "Merge" dynamic templates if a mapping file is provided