Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Hibernate Search 6.0.0.CR1 / Elasticsearch 7.9.2 #13112

Merged
merged 3 commits into from
Nov 4, 2020
Merged

Upgrade to Hibernate Search 6.0.0.CR1 / Elasticsearch 7.9.2 #13112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d8cc59
Upgrade to Hibernate Search 6.0.0.CR1
yrodiere Nov 3, 2020
46c4696
Upgrade to Elasticsearch clients 7.9.2
yrodiere Nov 4, 2020
219cfb4
Upgrade Elasticsearch server used in tests to 7.9.2
yrodiere Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ jobs:
run: |
docker run --rm --publish 9200:9200 --name build-elasticsearch \
-e discovery.type=single-node \
-d docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.0
-d docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.2
if: matrix.elasticsearch
- uses: actions/checkout@v2
- name: Set up JDK 11
Expand Down
4 changes: 2 additions & 2 deletions bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@
<hibernate-orm.version>5.4.23.Final</hibernate-orm.version>
<hibernate-reactive.version>1.0.0.Alpha11</hibernate-reactive.version>
<hibernate-validator.version>6.1.6.Final</hibernate-validator.version>
<hibernate-search.version>6.0.0.Beta11</hibernate-search.version>
<hibernate-search.version>6.0.0.CR1</hibernate-search.version>
<narayana.version>5.10.6.Final</narayana.version>
<jboss-transaction-api_1.2_spec.version>1.1.1.Final</jboss-transaction-api_1.2_spec.version>
<agroal.version>1.9</agroal.version>
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
<elasticsearch-rest-client.version>7.9.0</elasticsearch-rest-client.version>
<elasticsearch-rest-client.version>7.9.2</elasticsearch-rest-client.version>
<rxjava1.version>1.3.8</rxjava1.version>
<rxjava.version>2.2.20</rxjava.version>
<wildfly.openssl.version>1.0.6.Final</wildfly.openssl.version>
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<antlr.version>4.7.2</antlr.version>

<!-- Defaults for integration tests -->
<elasticsearch-server.version>7.9.0</elasticsearch-server.version>
<elasticsearch-server.version>7.9.2</elasticsearch-server.version>
<elasticsearch.image>docker.elastic.co/elasticsearch/elasticsearch-oss:${elasticsearch-server.version}</elasticsearch.image>
<elasticsearch.protocol>http</elasticsearch.protocol>

Expand Down
2 changes: 1 addition & 1 deletion .../quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ private void contributeBackendRuntimeProperties(BiConsumer<String, Object> prope
private void contributeBackendIndexBuildTimeProperties(BiConsumer<String, Object> propertyCollector,
String backendName, String indexName, ElasticsearchIndexBuildTimeConfig indexConfig) {
addBackendIndexConfig(propertyCollector, backendName, indexName,
ElasticsearchBackendSettings.ANALYSIS_CONFIGURER,
ElasticsearchIndexSettings.ANALYSIS_CONFIGURER,
indexConfig.analysis.configurer,
Optional::isPresent, c -> c.get().getName());
}
Expand Down