HSEARCH-4130 Remove test.elasticsearch.run.flavour and java_home

I don't know if there exists a way to port them to the Docker version
hibernate · Apr 5, 2021 · ccb524d · ccb524d
1 parent 52a612e
commit ccb524d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/parents/integrationtest/pom.xml b/parents/integrationtest/pom.xml
@@ -298,8 +298,6 @@
             <id>elasticsearch-5.6</id>
             <properties>
                 <test.elasticsearch.connection.version>${version.org.elasticsearch.latest-5.6}</test.elasticsearch.connection.version>
-                <!-- flavours are only supported starting with ES 6.3 -->
-                <test.elasticsearch.run.flavour></test.elasticsearch.run.flavour>
                 <test.elasticsearch.testdialect>org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch5TestDialect</test.elasticsearch.testdialect>
             </properties>
         </profile>
@@ -309,8 +307,6 @@
             <id>elasticsearch-6.0</id>
             <properties>
                 <test.elasticsearch.connection.version>${version.org.elasticsearch.latest-6.2}</test.elasticsearch.connection.version>
-                <!-- flavours are only supported starting with ES 6.3 -->
-                <test.elasticsearch.run.flavour></test.elasticsearch.run.flavour>
                 <test.elasticsearch.testdialect>org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch60TestDialect</test.elasticsearch.testdialect>
             </properties>
         </profile>
@@ -407,8 +403,6 @@
             <id>elasticsearch-7.11</id>
             <properties>
                 <test.elasticsearch.connection.version>${version.org.elasticsearch.latest-7.11}</test.elasticsearch.connection.version>
-                <!-- OSS flavour no longer available in 7.11 -->
-                <test.elasticsearch.run.flavour>default</test.elasticsearch.run.flavour>
                 <test.elasticsearch.testdialect>org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch710TestDialect</test.elasticsearch.testdialect>
             </properties>
         </profile>

diff --git a/pom.xml b/pom.xml
@@ -477,11 +477,6 @@
         <surefire.environment>default</surefire.environment>
 
         <!-- Elasticsearch tests properties -->
-
-        <!-- Control how an Elasticsearch instance is run automatically during tests -->
-        <test.elasticsearch.run.skip>false</test.elasticsearch.run.skip>
-        <test.elasticsearch.run.java_home>${java.home}</test.elasticsearch.run.java_home>
-        <test.elasticsearch.run.flavour>oss</test.elasticsearch.run.flavour>
         <!--
              These properties are transparently passed as system properties to integration tests,
              and retrieved by a test utility: