Skip to content

Commit aec439c

Browse files
yrodiereyrodiere
committed
[HSEARCH] 6.1.0.Final
1 parent 3f5eb8e commit aec439c

File tree

4 files changed

+30
-39
lines changed

4 files changed

+30
-39
lines changed

‎hibernate-search/hsearch-elasticsearch-wikipedia/pom.xml‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
<apt.version>1.1.3</apt.version>
2727
<docker-maven-plugin.version>0.34.1</docker-maven-plugin.version>
2828
<!-- Override the version of Hibernate ORM in Spring Boot -->
29-
<hibernate.version>5.4.32.Final</hibernate.version>
29+
<hibernate.version>5.6.5.Final</hibernate.version>
3030
<!-- Override the version of Elasticsearch Rest Client in Spring Boot -->
31-
<elasticsearch.version>7.10.1</elasticsearch.version>
32-
<hibernate.search.version>6.0.7.Final</hibernate.search.version>
31+
<elasticsearch.version>7.16.3</elasticsearch.version>
32+
<hibernate.search.version>6.1.0.Final</hibernate.search.version>
3333

3434
<docker-maven-plugin.version>0.34.1</docker-maven-plugin.version>
3535
<test.postgres.run.skip>true</test.postgres.run.skip>
3636
<test.postgres.run.image.name>postgres</test.postgres.run.image.name>
3737
<test.postgres.run.image.tag>13.1</test.postgres.run.image.tag>
3838
<test.elasticsearch.run.skip>true</test.elasticsearch.run.skip>
39-
<test.elasticsearch.run.image.name>elasticsearch</test.elasticsearch.run.image.name>
39+
<test.elasticsearch.run.image.name>elastic/elasticsearch</test.elasticsearch.run.image.name>
4040
<test.elasticsearch.run.image.tag>${elasticsearch.version}</test.elasticsearch.run.image.tag>
4141
</properties>
4242

@@ -143,16 +143,13 @@
143143
<env>
144144
<logger.level>WARN</logger.level>
145145
<discovery.type>single-node</discovery.type>
146-
<!-- Prevent swapping
147-
This may trigger warnings upon boot if the system is not correctly set up.
148-
See https://www.elastic.co/guide/en/elasticsearch/reference/7.5/setup-configuration-memory.html#bootstrap-memory_lock
149-
-->
150-
<bootstrap.memory_lock>true</bootstrap.memory_lock>
151-
<!-- fix Docker images for older versions -->
152-
<!-- Older images require HTTP authentication for all requests;
153-
it's not practical for testing, so we disable that.
154-
-->
155-
<xpack.security.enabled>false</xpack.security.enabled>
146+
<!-- Limit the RAM usage.
147+
Recent versions of ES limit themselves to 50% of the total available RAM,
148+
but on CI this is sometimes too much, as we also have the Maven JVM
149+
and the JVM that runs tests taking up a significant amount of RAM,
150+
leaving too little for filesystem caches and resulting in freezes.
151+
-->
152+
<ES_JAVA_OPTS>-Xms1g -Xmx1g</ES_JAVA_OPTS>
156153
</env>
157154
<ports>
158155
<port>9200:9200</port>

‎hibernate-search/hsearch-feature-examples/base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1414
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
1515
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
16-
<quarkus.platform.version>2.4.2.Final</quarkus.platform.version>
16+
<quarkus.platform.version>2.7.0.CR1</quarkus.platform.version>
1717
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
1818

1919
<mapstruct.version>1.4.1.Final</mapstruct.version>

‎hibernate-search/hsearch-feature-examples/search-advanced/pom.xml‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1515
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
1616
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
17-
<quarkus.platform.version>2.4.2.Final</quarkus.platform.version>
17+
<quarkus.platform.version>2.7.0.CR1</quarkus.platform.version>
1818
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
1919

2020
<mapstruct.version>1.4.1.Final</mapstruct.version>
@@ -26,8 +26,8 @@
2626
<test.postgres.run.image.name>postgres</test.postgres.run.image.name>
2727
<test.postgres.run.image.tag>13.1</test.postgres.run.image.tag>
2828
<test.elasticsearch.run.skip>true</test.elasticsearch.run.skip>
29-
<test.elasticsearch.run.image.name>elasticsearch</test.elasticsearch.run.image.name>
30-
<test.elasticsearch.run.image.tag>7.10.1</test.elasticsearch.run.image.tag>
29+
<test.elasticsearch.run.image.name>elastic/elasticsearch</test.elasticsearch.run.image.name>
30+
<test.elasticsearch.run.image.tag>7.16.3</test.elasticsearch.run.image.tag>
3131
</properties>
3232
<dependencyManagement>
3333
<dependencies>
@@ -172,16 +172,13 @@
172172
<env>
173173
<logger.level>WARN</logger.level>
174174
<discovery.type>single-node</discovery.type>
175-
<!-- Prevent swapping
176-
This may trigger warnings upon boot if the system is not correctly set up.
177-
See https://www.elastic.co/guide/en/elasticsearch/reference/7.5/setup-configuration-memory.html#bootstrap-memory_lock
175+
<!-- Limit the RAM usage.
176+
Recent versions of ES limit themselves to 50% of the total available RAM,
177+
but on CI this is sometimes too much, as we also have the Maven JVM
178+
and the JVM that runs tests taking up a significant amount of RAM,
179+
leaving too little for filesystem caches and resulting in freezes.
178180
-->
179-
<bootstrap.memory_lock>true</bootstrap.memory_lock>
180-
<!-- fix Docker images for older versions -->
181-
<!-- Older images require HTTP authentication for all requests;
182-
it's not practical for testing, so we disable that.
183-
-->
184-
<xpack.security.enabled>false</xpack.security.enabled>
181+
<ES_JAVA_OPTS>-Xms1g -Xmx1g</ES_JAVA_OPTS>
185182
</env>
186183
<ports>
187184
<port>9200:9200</port>

‎hibernate-search/hsearch-feature-examples/search/pom.xml‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1414
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
1515
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
16-
<quarkus.platform.version>2.4.2.Final</quarkus.platform.version>
16+
<quarkus.platform.version>2.7.0.CR1</quarkus.platform.version>
1717
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
1818

1919
<mapstruct.version>1.4.1.Final</mapstruct.version>
@@ -25,8 +25,8 @@
2525
<test.postgres.run.image.name>postgres</test.postgres.run.image.name>
2626
<test.postgres.run.image.tag>13.1</test.postgres.run.image.tag>
2727
<test.elasticsearch.run.skip>true</test.elasticsearch.run.skip>
28-
<test.elasticsearch.run.image.name>elasticsearch</test.elasticsearch.run.image.name>
29-
<test.elasticsearch.run.image.tag>7.10.1</test.elasticsearch.run.image.tag>
28+
<test.elasticsearch.run.image.name>elastic/elasticsearch</test.elasticsearch.run.image.name>
29+
<test.elasticsearch.run.image.tag>7.16.3</test.elasticsearch.run.image.tag>
3030
</properties>
3131
<dependencyManagement>
3232
<dependencies>
@@ -171,16 +171,13 @@
171171
<env>
172172
<logger.level>WARN</logger.level>
173173
<discovery.type>single-node</discovery.type>
174-
<!-- Prevent swapping
175-
This may trigger warnings upon boot if the system is not correctly set up.
176-
See https://www.elastic.co/guide/en/elasticsearch/reference/7.5/setup-configuration-memory.html#bootstrap-memory_lock
174+
<!-- Limit the RAM usage.
175+
Recent versions of ES limit themselves to 50% of the total available RAM,
176+
but on CI this is sometimes too much, as we also have the Maven JVM
177+
and the JVM that runs tests taking up a significant amount of RAM,
178+
leaving too little for filesystem caches and resulting in freezes.
177179
-->
178-
<bootstrap.memory_lock>true</bootstrap.memory_lock>
179-
<!-- fix Docker images for older versions -->
180-
<!-- Older images require HTTP authentication for all requests;
181-
it's not practical for testing, so we disable that.
182-
-->
183-
<xpack.security.enabled>false</xpack.security.enabled>
180+
<ES_JAVA_OPTS>-Xms1g -Xmx1g</ES_JAVA_OPTS>
184181
</env>
185182
<ports>
186183
<port>9200:9200</port>

0 commit comments

Comments
 (0)