From 40765772580e4a6730053d2355103003d7957a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 19 May 2022 09:26:45 +0200 Subject: [PATCH] Disable the security plugin for Elasticsearch servers used in tests 1. Because we don't use it (we always connect unauthenticated) 2. Because we'll need to disable it in Elasticsearch 8+ anyway, otherwise Elasticsearch uses a self-signed certificate (which we have to allow in the client JVM) and mandates HTTP authentication. --- .../deployment/pom.xml | 1 + extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml | 1 + integration-tests/elasticsearch-rest-client/pom.xml | 1 + integration-tests/elasticsearch-rest-high-level-client/pom.xml | 1 + .../pom.xml | 1 + .../hibernate-search-orm-elasticsearch-tenancy/pom.xml | 1 + integration-tests/hibernate-search-orm-elasticsearch/pom.xml | 1 + integration-tests/logging-gelf/pom.xml | 1 + .../logging-gelf/src/test/resources/docker-compose-efk.yml | 1 + .../logging-gelf/src/test/resources/docker-compose-elk.yml | 1 + .../logging-gelf/src/test/resources/docker-compose-graylog.yml | 1 + 11 files changed, 11 insertions(+) diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml index b28101eb9782d..c3b7c32009ca8 100644 --- 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 @@ single-node + false -Xms512m -Xmx512m diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml index 9b499de4dc9f4..99adfce13398c 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml @@ -121,6 +121,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/elasticsearch-rest-client/pom.xml b/integration-tests/elasticsearch-rest-client/pom.xml index a259ca1b2cd17..2bca0cf269bb1 100644 --- a/integration-tests/elasticsearch-rest-client/pom.xml +++ b/integration-tests/elasticsearch-rest-client/pom.xml @@ -165,6 +165,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/elasticsearch-rest-high-level-client/pom.xml b/integration-tests/elasticsearch-rest-high-level-client/pom.xml index 4e3ba6b705c72..4129203dc5348 100644 --- a/integration-tests/elasticsearch-rest-high-level-client/pom.xml +++ b/integration-tests/elasticsearch-rest-high-level-client/pom.xml @@ -166,6 +166,7 @@ single-node + false -Xms512m -Xmx512m 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 index 563eb725362df..550941075da12 100644 --- 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 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml index 0c1c16ce8fc45..3c237ca5eb1ad 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml @@ -222,6 +222,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml index ef081ee2e3398..b888e85055237 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml @@ -184,6 +184,7 @@ single-node + false -Xms512m -Xmx512m diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml index 3a4ddd5d338ca..b84d0b6626d72 100644 --- a/integration-tests/logging-gelf/pom.xml +++ b/integration-tests/logging-gelf/pom.xml @@ -157,6 +157,7 @@ single-node + false -Xms512m -Xmx512m 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 index 0e043df1f9a0d..d1b13ca0b7289 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml @@ -6,6 +6,7 @@ services: environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" + xpack.security.enabled: "false" networks: - efk 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 index ffe67c10cc81b..ef3ac1c81d05e 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml @@ -6,6 +6,7 @@ services: environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" + xpack.security.enabled: "false" networks: - elk 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 index 0b5da8e8aaa36..2b113d640780e 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml @@ -6,6 +6,7 @@ services: environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" + xpack.security.enabled: "false" networks: - graylog