HSEARCH-4674 Remove some redundant properties

hibernate · Nov 8, 2023 · 8b0787b · 8b0787b
1 parent 119254b
commit 8b0787b
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 45 deletions.
diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -20,9 +20,6 @@
     <description>Hibernate Search reference documentation</description>
 
     <properties>
-        <test.elasticsearch.run.skip>${test.elasticsearch.run.skip.forRelevantModules}</test.elasticsearch.run.skip>
-        <test.database.run.skip>false</test.database.run.skip>
-
         <asciidoctor.base-output-dir>${project.build.directory}/asciidoctor/</asciidoctor.base-output-dir>
         <asciidoctor.theme-dir>${project.build.directory}/hibernate-asciidoctor-theme</asciidoctor.theme-dir>
         <asciidoctor.aggregated-resources-dir>${project.build.directory}/aggregated-resources</asciidoctor.aggregated-resources-dir>

diff --git a/integrationtest/backend/elasticsearch/pom.xml b/integrationtest/backend/elasticsearch/pom.xml
@@ -14,8 +14,6 @@
 
     <properties>
         <surefire.module>elasticsearch</surefire.module>
-
-        <test.elasticsearch.run.skip>${test.elasticsearch.run.skip.forRelevantModules}</test.elasticsearch.run.skip>
     </properties>
 
     <dependencies>

diff --git a/integrationtest/java/modules/orm-elasticsearch/pom.xml b/integrationtest/java/modules/orm-elasticsearch/pom.xml
@@ -17,9 +17,6 @@
     <description>Hibernate Search integration tests for Java 11+ modules</description>
 
     <properties>
-        <test.elasticsearch.run.skip>${test.elasticsearch.run.skip.forRelevantModules}</test.elasticsearch.run.skip>
-        <test.database.run.skip>false</test.database.run.skip>
-
         <maven.compiler.release>11</maven.compiler.release>
         <!-- Override the default from the parent POM: here we really do want to use the modulepath -->
         <failsafe.useModulePath>true</failsafe.useModulePath>

diff --git a/integrationtest/java/modules/orm-lucene/pom.xml b/integrationtest/java/modules/orm-lucene/pom.xml
@@ -17,8 +17,6 @@
     <description>Hibernate Search integration tests for Java 11+ modules</description>
 
     <properties>
-        <test.database.run.skip>false</test.database.run.skip>
-
         <maven.compiler.release>11</maven.compiler.release>
         <!-- Override the default from the parent POM: here we really do want to use the modulepath -->
         <failsafe.useModulePath>true</failsafe.useModulePath>

diff --git a/integrationtest/java/modules/orm-outbox-polling-elasticsearch/pom.xml b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/pom.xml
@@ -17,9 +17,6 @@
     <description>Hibernate Search integration tests for Java 11+ modules</description>
 
     <properties>
-        <test.elasticsearch.run.skip>${test.elasticsearch.run.skip.forRelevantModules}</test.elasticsearch.run.skip>
-        <test.database.run.skip>false</test.database.run.skip>
-
         <maven.compiler.release>11</maven.compiler.release>
         <!-- Override the default from the parent POM: here we really do want to use the modulepath -->
         <failsafe.useModulePath>true</failsafe.useModulePath>

diff --git a/integrationtest/java/modules/pojo-standalone-elasticsearch/pom.xml b/integrationtest/java/modules/pojo-standalone-elasticsearch/pom.xml
@@ -17,9 +17,6 @@
     <description>Hibernate Search integration tests for Java 11+ modules</description>
 
     <properties>
-        <test.elasticsearch.run.skip>${test.elasticsearch.run.skip.forRelevantModules}</test.elasticsearch.run.skip>
-        <test.database.run.skip>false</test.database.run.skip>
-
         <maven.compiler.release>11</maven.compiler.release>
         <!-- Override the default from the parent POM: here we really do want to use the modulepath -->
         <failsafe.useModulePath>true</failsafe.useModulePath>

diff --git a/integrationtest/java/modules/pojo-standalone-lucene/pom.xml b/integrationtest/java/modules/pojo-standalone-lucene/pom.xml
@@ -17,8 +17,6 @@
     <description>Hibernate Search integration tests for Java 11+ modules</description>
 
     <properties>
-        <test.database.run.skip>false</test.database.run.skip>
-
         <maven.compiler.release>11</maven.compiler.release>
         <!-- Override the default from the parent POM: here we really do want to use the modulepath -->
         <failsafe.useModulePath>true</failsafe.useModulePath>

diff --git a/integrationtest/mapper/orm-envers/pom.xml b/integrationtest/mapper/orm-envers/pom.xml
@@ -12,10 +12,6 @@
     <name>Hibernate Search ITs - ORM - Envers</name>
     <description>Hibernate Search integration tests for the Hibernate ORM integration with Envers</description>
 
-    <properties>
-        <test.database.run.skip>false</test.database.run.skip>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.hibernate.search</groupId>

diff --git a/integrationtest/mapper/orm-jakarta-batch/pom.xml b/integrationtest/mapper/orm-jakarta-batch/pom.xml
@@ -13,9 +13,6 @@
     <description>Hibernate Search integration tests for the Jakarta Batch integration</description>
 
     <properties>
-        <test.elasticsearch.run.skip>${test.elasticsearch.run.skip.forRelevantModules}</test.elasticsearch.run.skip>
-        <test.database.run.skip>false</test.database.run.skip>
-
         <surefire.jvm.args.module>
             ${test.elasticsearch.connection.jvm.args}
             ${test.weld.jvm.args}

diff --git a/integrationtest/mapper/orm-outbox-polling/pom.xml b/integrationtest/mapper/orm-outbox-polling/pom.xml
@@ -14,8 +14,6 @@
 
     <properties>
         <surefire.module>coord-outbox</surefire.module>
-
-        <test.database.run.skip>false</test.database.run.skip>
     </properties>
 
     <dependencies>

diff --git a/integrationtest/mapper/orm-realbackend/pom.xml b/integrationtest/mapper/orm-realbackend/pom.xml
@@ -13,9 +13,6 @@
     <description>Hibernate Search integration tests for the Hibernate ORM mapper with a real (non-mock) backend</description>
 
     <properties>
-        <test.elasticsearch.run.skip>${test.elasticsearch.run.skip.forRelevantModules}</test.elasticsearch.run.skip>
-        <test.database.run.skip>false</test.database.run.skip>
-
         <!-- See profiles below -->
         <test.multiplebackends.skip>false</test.multiplebackends.skip>
     </properties>

diff --git a/integrationtest/mapper/orm/pom.xml b/integrationtest/mapper/orm/pom.xml
@@ -12,10 +12,6 @@
     <name>Hibernate Search ITs - ORM</name>
     <description>Hibernate Search integration tests for the Hibernate ORM integration</description>
 
-    <properties>
-        <test.database.run.skip>false</test.database.run.skip>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.hibernate.search</groupId>

diff --git a/integrationtest/mapper/pojo-standalone-realbackend/pom.xml b/integrationtest/mapper/pojo-standalone-realbackend/pom.xml
@@ -12,10 +12,6 @@
     <name>Hibernate Search ITs - POJO Standalone - Real backend</name>
     <description>Hibernate Search integration tests for the POJO Standalone mapper with a real (non-mock) backend</description>
 
-    <properties>
-        <test.elasticsearch.run.skip>${test.elasticsearch.run.skip.forRelevantModules}</test.elasticsearch.run.skip>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.hibernate.search</groupId>

diff --git a/integrationtest/performance/backend/elasticsearch/pom.xml b/integrationtest/performance/backend/elasticsearch/pom.xml
@@ -21,8 +21,6 @@
     <properties>
         <!-- We don't want to use a Jacoco agent here, and we don't want to rely on these tests for coverage either -->
         <jacoco.skip>true</jacoco.skip>
-
-        <test.elasticsearch.run.skip>${test.elasticsearch.run.skip.forRelevantModules}</test.elasticsearch.run.skip>
     </properties>
 
     <dependencies>

diff --git a/integrationtest/showcase/library/pom.xml b/integrationtest/showcase/library/pom.xml
@@ -13,9 +13,6 @@
     <description>Hibernate Search showcase based on the ORM and Elasticsearch integrations, using libraries and books as business objects</description>
 
     <properties>
-        <test.elasticsearch.run.skip>${test.elasticsearch.run.skip.forRelevantModules}</test.elasticsearch.run.skip>
-        <test.database.run.skip>false</test.database.run.skip>
-
         <test.lucene.skip>${failsafe.spring.skip}</test.lucene.skip>
         <test.elasticsearch.skip>${failsafe.spring.skip}</test.elasticsearch.skip>
 

diff --git a/pom.xml b/pom.xml
@@ -391,8 +391,6 @@
         <test.testcontainers.run.image.name>testcontainers/ryuk</test.testcontainers.run.image.name>
         <test.testcontainers.run.image.tag>0.5.1</test.testcontainers.run.image.tag>
 
-        <!-- Run containers for additional ORM databases -->
-        <test.database.run.skip>true</test.database.run.skip>
         <!-- PostgreSQL -->
         <!-- See https://hub.docker.com/_/postgres -->
         <test.database.run.postgres.skip>true</test.database.run.postgres.skip>