Upgrade to ELK 7.16.3 for tests and documentation

quarkusio · May 18, 2022 · e4da5a3 · e4da5a3
1 parent a367b64
commit e4da5a3
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 10 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -76,10 +76,10 @@
         <antlr.version>4.9.2</antlr.version>
 
         <!-- Defaults for integration tests -->
-        <elasticsearch-server.version>7.10.0</elasticsearch-server.version>
-        <elasticsearch.image>docker.elastic.co/elasticsearch/elasticsearch-oss:${elasticsearch-server.version}</elasticsearch.image>
-        <logstash.image>docker.elastic.co/logstash/logstash-oss:${elasticsearch-server.version}</logstash.image>
-        <kibana.image>docker.elastic.co/kibana/kibana-oss:${elasticsearch-server.version}</kibana.image>
+        <elasticsearch-server.version>7.16.3</elasticsearch-server.version>
+        <elasticsearch.image>docker.elastic.co/elasticsearch/elasticsearch:${elasticsearch-server.version}</elasticsearch.image>
+        <logstash.image>docker.elastic.co/logstash/logstash:${elasticsearch-server.version}</logstash.image>
+        <kibana.image>docker.elastic.co/kibana/kibana:${elasticsearch-server.version}</kibana.image>
         <elasticsearch.protocol>http</elasticsearch.protocol>
         <opensearch-server.version>1.2.3</opensearch-server.version>
         <opensearch.image>docker.io/opensearchproject/opensearch:${opensearch-server.version}</opensearch.image>

diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml
@@ -120,6 +120,7 @@
                                     <run>
                                         <env>
                                             <discovery.type>single-node</discovery.type>
+                                            <ES_JAVA_OPTS>-Xms512m -Xmx512m</ES_JAVA_OPTS>
                                         </env>
                                         <ports>
                                             <port>9200:9200</port>

diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml
@@ -121,6 +121,7 @@
                                     <run>
                                         <env>
                                             <discovery.type>single-node</discovery.type>
+                                            <ES_JAVA_OPTS>-Xms512m -Xmx512m</ES_JAVA_OPTS>
                                         </env>
                                         <ports>
                                             <port>9200:9200</port>

diff --git a/integration-tests/elasticsearch-rest-client/pom.xml b/integration-tests/elasticsearch-rest-client/pom.xml
@@ -165,6 +165,7 @@
                   <run>
                     <env>
                       <discovery.type>single-node</discovery.type>
+                      <ES_JAVA_OPTS>-Xms512m -Xmx512m</ES_JAVA_OPTS>
                     </env>
                     <ports>
                       <port>9200:9200</port>

diff --git a/integration-tests/elasticsearch-rest-high-level-client/pom.xml b/integration-tests/elasticsearch-rest-high-level-client/pom.xml
@@ -166,6 +166,7 @@
                                     <run>
                                         <env>
                                             <discovery.type>single-node</discovery.type>
+                                            <ES_JAVA_OPTS>-Xms512m -Xmx512m</ES_JAVA_OPTS>
                                         </env>
                                         <ports>
                                             <port>9200:9200</port>

diff --git a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml
@@ -206,6 +206,7 @@
                                     <run>
                                         <env>
                                             <discovery.type>single-node</discovery.type>
+                                            <ES_JAVA_OPTS>-Xms512m -Xmx512m</ES_JAVA_OPTS>
                                         </env>
                                         <ports>
                                             <port>9200:9200</port>

diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml
@@ -222,6 +222,7 @@
                                     <run>
                                         <env>
                                             <discovery.type>single-node</discovery.type>
+                                            <ES_JAVA_OPTS>-Xms512m -Xmx512m</ES_JAVA_OPTS>
                                         </env>
                                         <ports>
                                             <port>9200:9200</port>

diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml
@@ -184,6 +184,7 @@
                                     <run>
                                         <env>
                                             <discovery.type>single-node</discovery.type>
+                                            <ES_JAVA_OPTS>-Xms512m -Xmx512m</ES_JAVA_OPTS>
                                         </env>
                                         <ports>
                                             <port>9200:9200</port>

diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml
@@ -157,6 +157,7 @@
                                         </ports>
                                         <env>
                                             <discovery.type>single-node</discovery.type>
+                                            <ES_JAVA_OPTS>-Xms512m -Xmx512m</ES_JAVA_OPTS>
                                         </env>
                                         <log>
                                             <prefix>Elasticsearch: </prefix>

diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml
@@ -2,7 +2,7 @@ version: '3.2'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3
     environment:
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"
     networks:
@@ -22,7 +22,7 @@ services:
       - elasticsearch
 
   kibana:
-    image: docker.elastic.co/kibana/kibana-oss:7.10.0
+    image: docker.elastic.co/kibana/kibana:7.16.3
     ports:
       - "5601:5601"
     networks:

diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml
@@ -2,15 +2,15 @@ version: '3.2'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3
     environment:
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"
       discovery.type: "single-node"
     networks:
       - elk
 
   logstash:
-    image: docker.elastic.co/logstash/logstash-oss:7.10.0
+    image: docker.elastic.co/logstash/logstash:7.16.3
     volumes:
       - source: $HOME/pipelines
         target: /usr/share/logstash/pipeline
@@ -25,7 +25,7 @@ services:
       - elasticsearch
 
   kibana:
-    image: docker.elastic.co/kibana/kibana-oss:7.10.0
+    image: docker.elastic.co/kibana/kibana:7.16.3
     ports:
       - "5601:5601"
     networks:

diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml
@@ -2,7 +2,7 @@ version: '3.2'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3
     environment:
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"
       discovery.type: "single-node"
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,6 +120,7 @@ @@
                                         <run>
                                             <env>
                                                 <discovery.type>single-node</discovery.type>
+                                                <ES_JAVA_OPTS>-Xms512m -Xmx512m</ES_JAVA_OPTS>
                                             </env>
                                             <ports>
                                                 <port>9200:9200</port>
@@ Expand Down @@