Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-search Commit: 0294683a89457d62739694a9a11ccf0e4e044807 https://github.com/hibernate/hibernate-search/commit/0294683a89457d627396... Author: Sanne Grinovero <sanne(a)hibernate.org&gt; Date: 2017-04-26 (Wed, 26 Apr 2017) Changed paths: M elasticsearch/src/main/java/org/hibernate/search/elasticsearch/settings/impl/translation/AnalysisDefinitionFactory.java M elasticsearch/src/main/java/org/hibernate/search/elasticsearch/settings/impl/translation/DefaultElasticsearchAnalyzerDefinitionTranslator.java M elasticsearch/src/main/java/org/hibernate/search/elasticsearch/settings/impl/translation/JsonPassThroughAnalysisDefinitionFactory.java M elasticsearch/src/main/java/org/hibernate/search/elasticsearch/settings/impl/translation/SimpleAnalysisDefinitionFactory.java M engine/src/main/java/org/hibernate/search/analyzer/impl/LuceneAnalyzerBuilder.java M engine/src/main/java/org/hibernate/search/bridge/impl/BridgeFactory.java A engine/src/main/java/org/hibernate/search/cfg/spi/ParameterAnnotationsReader.java M engine/src/main/java/org/hibernate/search/util/logging/impl/Log.java A engine/src/test/java/org/hibernate/search/test/analyzer/analyzerdef/AnalyzerDefInvalidTest.java Log Message: ----------- HSEARCH-2606 Disallow conflicting usage of @Parameter