Skip to content

Commit

Permalink
Bump Elasticsearch version for tests/devservices to 8.13
Browse files Browse the repository at this point in the history
  • Loading branch information
yrodiere committed Apr 25, 2024
1 parent e2315ec commit f1f09ac
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<volume.access.modifier>:Z</volume.access.modifier>

<!-- Defaults for integration tests -->
<elasticsearch-server.version>8.12.1</elasticsearch-server.version>
<elasticsearch-server.version>8.13.2</elasticsearch-server.version>
<elasticsearch.image>docker.io/elastic/elasticsearch:${elasticsearch-server.version}</elasticsearch.image>
<logstash.image>docker.io/elastic/logstash:${elasticsearch-server.version}</logstash.image>
<kibana.image>docker.io/elastic/kibana:${elasticsearch-server.version}</kibana.image>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ private GenericContainer<?> createElasticsearchContainer(ElasticsearchDevService
// Disable disk-based shard allocation thresholds:
// in a single-node setup they just don't make sense,
// and lead to problems on large disks with little space left.
// See https://www.elastic.co/guide/en/elasticsearch/reference/8.12/modules-cluster.html#disk-based-shard-allocation
// See https://www.elastic.co/guide/en/elasticsearch/reference/8.13/modules-cluster.html#disk-based-shard-allocation
container.addEnv("cluster.routing.allocation.disk.threshold_enabled", "false");
container.addEnv("ES_JAVA_OPTS", config.javaOpts);
return container;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ quarkus.hibernate-orm."namedpu".database.generation=drop-and-create

# Hibernate Search is inactive for the default PU
quarkus.hibernate-search-orm.active=false
quarkus.hibernate-search-orm.elasticsearch.version=8.12
quarkus.hibernate-search-orm.elasticsearch.version=8.13
quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop

# ... but it's (implicitly) active for a named PU
quarkus.hibernate-search-orm."namedpu".elasticsearch.version=8.12
quarkus.hibernate-search-orm."namedpu".elasticsearch.version=8.13
quarkus.hibernate-search-orm."namedpu".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
quarkus.hibernate-search-orm."namedpu".schema-management.strategy=drop-and-create-and-drop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
quarkus.hibernate-orm.database.generation=drop-and-create

quarkus.hibernate-search-orm.active=false
quarkus.hibernate-search-orm.elasticsearch.version=8.12
quarkus.hibernate-search-orm.elasticsearch.version=8.13
quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1

quarkus.hibernate-orm.database.generation=drop-and-create

quarkus.hibernate-search-orm.elasticsearch.version=8.12
quarkus.hibernate-search-orm.elasticsearch.version=8.13
quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1

quarkus.hibernate-orm.database.generation=drop-and-create

quarkus.hibernate-search-orm.elasticsearch.version=8.12
quarkus.hibernate-search-orm.elasticsearch.version=8.13
# Simulate an offline Elasticsearch instance by pointing to a non-existing cluster
quarkus.hibernate-search-orm.elasticsearch.hosts=localhost:14800
quarkus.hibernate-search-orm.schema-management.strategy=none
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
quarkus.devservices.enabled=false

quarkus.hibernate-search-standalone.active=false
quarkus.hibernate-search-standalone.elasticsearch.version=8.12
quarkus.hibernate-search-standalone.elasticsearch.version=8.13
quarkus.hibernate-search-standalone.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
quarkus.hibernate-search-standalone.schema-management.strategy=drop-and-create-and-drop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# We already start Elasticsearch with Maven
quarkus.devservices.enabled=false

quarkus.hibernate-search-standalone.elasticsearch.version=8.12
quarkus.hibernate-search-standalone.elasticsearch.version=8.13
quarkus.hibernate-search-standalone.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
quarkus.hibernate-search-standalone.schema-management.strategy=drop-and-create-and-drop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
quarkus.hibernate-search-standalone.elasticsearch.version=8.12
quarkus.hibernate-search-standalone.elasticsearch.version=8.13
# Simulate an offline Elasticsearch instance by pointing to a non-existing cluster
quarkus.hibernate-search-standalone.elasticsearch.hosts=localhost:14800
quarkus.hibernate-search-standalone.schema-management.strategy=none
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/elasticsearch-java-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
<!-- Disable disk-based shard allocation thresholds:
in a single-node setup they just don't make sense,
and lead to problems on large disks with little space left.
See https://www.elastic.co/guide/en/elasticsearch/reference/8.12/modules-cluster.html#disk-based-shard-allocation
See https://www.elastic.co/guide/en/elasticsearch/reference/8.13/modules-cluster.html#disk-based-shard-allocation
-->
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
<!-- Disable some features that are not needed in our tests and just slow down startup -->
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/elasticsearch-rest-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
<!-- Disable disk-based shard allocation thresholds:
in a single-node setup they just don't make sense,
and lead to problems on large disks with little space left.
See https://www.elastic.co/guide/en/elasticsearch/reference/8.12/modules-cluster.html#disk-based-shard-allocation
See https://www.elastic.co/guide/en/elasticsearch/reference/8.13/modules-cluster.html#disk-based-shard-allocation
-->
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
<!-- Disable some features that are not needed in our tests and just slow down startup -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
<!-- Disable disk-based shard allocation thresholds:
in a single-node setup they just don't make sense,
and lead to problems on large disks with little space left.
See https://www.elastic.co/guide/en/elasticsearch/reference/8.12/modules-cluster.html#disk-based-shard-allocation
See https://www.elastic.co/guide/en/elasticsearch/reference/8.13/modules-cluster.html#disk-based-shard-allocation
-->
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
<!-- Disable some features that are not needed in our tests and just slow down startup -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
<!-- Disable disk-based shard allocation thresholds:
in a single-node setup they just don't make sense,
and lead to problems on large disks with little space left.
See https://www.elastic.co/guide/en/elasticsearch/reference/8.12/modules-cluster.html#disk-based-shard-allocation
See https://www.elastic.co/guide/en/elasticsearch/reference/8.13/modules-cluster.html#disk-based-shard-allocation
-->
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
<!-- Disable some features that are not needed in our tests and just slow down startup -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
<!-- Disable disk-based shard allocation thresholds:
in a single-node setup they just don't make sense,
and lead to problems on large disks with little space left.
See https://www.elastic.co/guide/en/elasticsearch/reference/8.12/modules-cluster.html#disk-based-shard-allocation
See https://www.elastic.co/guide/en/elasticsearch/reference/8.13/modules-cluster.html#disk-based-shard-allocation
-->
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
<!-- Disable some features that are not needed in our tests and just slow down startup -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public Map<String, String> getConfigOverrides() {
// But here it doesn't matter as we won't send a request to Elasticsearch anyway,
// so we're free to put anything.
// Just make sure to set something consistent with what we have in application.properties.
"quarkus.hibernate-search-orm.elasticsearch.version", "8.12"));
"quarkus.hibernate-search-orm.elasticsearch.version", "8.13"));
return config;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public Map<String, String> getConfigOverrides() {
// But here it doesn't matter as we won't send a request to Elasticsearch anyway,
// so we're free to put anything.
// Just make sure to set something consistent with what we have in application.properties.
"quarkus.hibernate-search-orm.elasticsearch.version", "8.12");
"quarkus.hibernate-search-orm.elasticsearch.version", "8.13");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public Map<String, String> getConfigOverrides() {
// But here it doesn't matter as we won't send a request to Elasticsearch anyway,
// so we're free to put anything.
// Just make sure to set something consistent with what we have in application.properties.
"quarkus.hibernate-search-standalone.elasticsearch.version", "8.12"));
"quarkus.hibernate-search-standalone.elasticsearch.version", "8.13"));
return config;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public Map<String, String> getConfigOverrides() {
// But here it doesn't matter as we won't send a request to Elasticsearch anyway,
// so we're free to put anything.
// Just make sure to set something consistent with what we have in application.properties.
"quarkus.hibernate-search-standalone.elasticsearch.version", "8.12");
"quarkus.hibernate-search-standalone.elasticsearch.version", "8.13");
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/logging-gelf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
<!-- Disable disk-based shard allocation thresholds:
in a single-node setup they just don't make sense,
and lead to problems on large disks with little space left.
See https://www.elastic.co/guide/en/elasticsearch/reference/8.12/modules-cluster.html#disk-based-shard-allocation
See https://www.elastic.co/guide/en/elasticsearch/reference/8.13/modules-cluster.html#disk-based-shard-allocation
-->
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
<!-- Disable some features that are not needed in our tests and just slow down startup -->
Expand Down

0 comments on commit f1f09ac

Please sign in to comment.