diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 00000000000..1be7d02aa6f
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1 @@
+--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c31de21788e..1bf0398848b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -154,7 +154,7 @@ and transform it to use Hibernate ORM 6 instead of Hibernate ORM 5.x.
 
 ### Basic build
 
-You will need JDK 11 exactly;
+You will need JDK 17 exactly;
 newer JDKs will require you to [pass additional properties](#other-jdks)
 in order for tests to run correctly.
 
@@ -198,16 +198,16 @@ To test Hibernate Search against JDK 8:
 ./mvnw clean install -Djava-version.test.release=8 -Djava-version.test.launcher.java_home=/path/to/jdk8
 ```
 
-To test Hibernate Search against JDKs newer than 11:
+To test Hibernate Search against JDKs other than 8 or the default 17:
 
 ```bash
-./mvnw clean install -Djava-version.test.release=17 -Djava-version.test.compiler.java_home=/path/to/jdk17
+./mvnw clean install -Djava-version.test.release=11 -Djava-version.test.compiler.java_home=/path/to/jdk11
 ```
 
-Or more simply, if the newer JDK you want to test against is your default JDK:
+Or more simply, if the newer JDK you want to test against is newer than 17 and is your default JDK:
 
 ```bash
-./mvnw clean install -Djava-version.test.release=17
+./mvnw clean install -Djava-version.test.release=18
 ```
 
 ### Elasticsearch
diff --git a/Jenkinsfile b/Jenkinsfile
index 6bdafec2760..3a8a819ae72 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -145,7 +145,7 @@ import org.hibernate.jenkins.pipeline.helpers.alternative.AlternativeMultiMap
  *         settingsId: ...
  */
 
-@Field final String DEFAULT_JDK_TOOL = 'OpenJDK 11 Latest'
+@Field final String DEFAULT_JDK_TOOL = 'OpenJDK 17 Latest'
 @Field final String MAVEN_TOOL = 'Apache Maven 3.8'
 
 // Default node pattern, to be used for resource-intensive stages.
@@ -171,20 +171,14 @@ stage('Configure') {
 			jdk: [
 					// This should not include every JDK; in particular let's not care too much about EOL'd JDKs like version 9
 					// See http://www.oracle.com/technetwork/java/javase/eol-135779.html
-					// We only run the tests with JDK8, but we compile them with JDK11 (with --release 8).
+					// We only run the tests with JDK8, but we compile them with JDK17 (with --release 8).
 					new JdkBuildEnvironment(version: '8', testLauncherTool: 'OpenJDK 8 Latest',
 							condition: TestCondition.AFTER_MERGE),
 					new JdkBuildEnvironment(version: '11', testCompilerTool: 'OpenJDK 11 Latest',
+							condition: TestCondition.AFTER_MERGE),
+					new JdkBuildEnvironment(version: '17', testCompilerTool: 'OpenJDK 17 Latest',
 							condition: TestCondition.BEFORE_MERGE,
 							isDefault: true),
-					new JdkBuildEnvironment(version: '14', testCompilerTool: 'OpenJDK 14 Latest',
-							condition: TestCondition.ON_DEMAND),
-					new JdkBuildEnvironment(version: '15', testCompilerTool: 'OpenJDK 15 Latest',
-							condition: TestCondition.ON_DEMAND),
-					new JdkBuildEnvironment(version: '16', testCompilerTool: 'OpenJDK 16 Latest',
-							condition: TestCondition.ON_DEMAND),
-					new JdkBuildEnvironment(version: '17', testCompilerTool: 'OpenJDK 17 Latest',
-							condition: TestCondition.AFTER_MERGE),
 					new JdkBuildEnvironment(version: '18', testCompilerTool: 'OpenJDK 18 Latest',
 							condition: TestCondition.AFTER_MERGE),
 					new JdkBuildEnvironment(version: '19', testCompilerTool: 'OpenJDK 19 Latest',
diff --git a/engine/src/main/java/org/hibernate/search/engine/cfg/package-info.java b/engine/src/main/java/org/hibernate/search/engine/cfg/package-info.java
index 1485952fa1e..ef2a652da24 100644
--- a/engine/src/main/java/org/hibernate/search/engine/cfg/package-info.java
+++ b/engine/src/main/java/org/hibernate/search/engine/cfg/package-info.java
@@ -8,12 +8,12 @@
 /**
  * This package contains everything related to the configuration of the Hibernate Search engine.
  *
- * <h3>Common expected types for property values</h3>
+ * <h2>Common expected types for property values</h2>
  *
  * Below are some commonly used property types across all Hibernate Search settings
  * (engine, backends, mappers, ...).
  *
- * <h4 id="bean-reference">Bean reference</h4>
+ * <h2 id="bean-reference">Bean reference</h2>
  *
  * A reference to a bean of type {@code T} can be passed as either:
  * <ul>
@@ -33,7 +33,7 @@
  * representing the type of a CDI bean which happens to expose a public, no-arg constructor,
  * then Hibernate Search will retrieve the bean through CDI, not by calling the constructor directly.
  *
- * <h4 id="bean-reference-multi">Multi-valued bean reference</h4>
+ * <h2 id="bean-reference-multi">Multi-valued bean reference</h2>
  *
  * A multi-valued reference to a bean of type {@code T} can be passed as either:
  * <ul>
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/BooleanPredicateOptionsCollector.java b/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/BooleanPredicateOptionsCollector.java
index ce27dfc0bf5..66d49f06a4e 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/BooleanPredicateOptionsCollector.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/BooleanPredicateOptionsCollector.java
@@ -16,26 +16,26 @@
  * <p>
  * Different types of clauses have different effects, see below.
  *
- * <h3 id="must">"must" clauses</h3>
+ * <h2 id="must">"must" clauses</h2>
  * <p>
  * "must" clauses are required to match: if they don't match, then the boolean predicate will not match.
  * <p>
  * Matching "must" clauses are taken into account during score computation.
  *
- * <h3 id="mustnot">"must not" clauses</h3>
+ * <h2 id="mustnot">"must not" clauses</h2>
  * <p>
  * "must not" clauses are required to not match: if they match, then the boolean predicate will not match.
  * <p>
  * "must not" clauses are ignored during score computation.
  *
- * <h3 id="filter">"filter" clauses</h3>
+ * <h2 id="filter">"filter" clauses</h2>
  * <p>
  * "filter" clauses are required to match: if they don't match, then the boolean predicate will not match.
  * <p>
  * "filter" clauses are ignored during score computation,
  * and so are any clauses of boolean predicates contained in the filter clause (even "must" or "should" clauses).
  *
- * <h3 id="should">"should" clauses</h3>
+ * <h2 id="should">"should" clauses</h2>
  * <p>
  * "should" clauses may optionally match, and are required to match depending on the context.
  * <p>
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/MatchIdPredicateMatchingStep.java b/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/MatchIdPredicateMatchingStep.java
index 9511e1e3b64..4a45c5df1fa 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/MatchIdPredicateMatchingStep.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/MatchIdPredicateMatchingStep.java
@@ -21,7 +21,6 @@ public interface MatchIdPredicateMatchingStep<N extends MatchIdPredicateMatching
 	 * Target the identifier with the given id.
 	 * <p>
 	 * If used multiple times, it will target any of the specified values.
-	 * <p>
 	 * @see #matchingAny(Collection)
 	 * @param value the value of the id we want to match.
 	 * @return The next step.
@@ -34,7 +33,6 @@ default N matching(Object value) {
 	 * Target the identifier with the given id.
 	 * <p>
 	 * If used multiple times, it will target any of the specified values.
-	 * <p>
 	 * @see #matchingAny(Collection)
 	 * @param value the value of the id we want to match.
 	 * @param convert Controls how the {@code value} should be converted
@@ -46,7 +44,6 @@ default N matching(Object value) {
 
 	/**
 	 * Target the identifiers matching any of the values in a collection.
-	 * <p>
 	 * @param values the collection of identifiers to match.
 	 * @return The next step.
 	 */
@@ -56,7 +53,6 @@ default N matchingAny(Collection<?> values) {
 
 	/**
 	 * Target the identifiers matching any of the values in a collection.
-	 * <p>
 	 * @param values the collection of identifiers to match.
 	 * @param convert Controls how the {@code value} should be converted
 	 * before Hibernate Search attempts to interpret it as an identifier value.
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/MinimumShouldMatchConditionStep.java b/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/MinimumShouldMatchConditionStep.java
index 3e5c6c3d567..d5124709453 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/MinimumShouldMatchConditionStep.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/predicate/dsl/MinimumShouldMatchConditionStep.java
@@ -10,7 +10,7 @@
  * The step in a "minimum should match" constraint definition
  * where a condition can be defined as necessary for the following requirements to be enforced.
  *
- * <h3 id="minimumshouldmatch">"minimumShouldMatch" constraints</h3>
+ * <h2 id="minimumshouldmatch">"minimumShouldMatch" constraints</h2>
  * <p>
  * "minimumShouldMatch" constraints define a minimum number of "should" clauses that have to match
  * in order for the boolean predicate to match.
@@ -21,7 +21,7 @@
  * <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html">{@code minimum_should_match}</a>
  * in Elasticsearch.
  *
- * <h4 id="minimumshouldmatch-minimum">Definition of the minimum</h4>
+ * <h3 id="minimumshouldmatch-minimum">Definition of the minimum</h3>
  * <p>
  * The minimum may be defined either directly as a positive number, or indirectly as a negative number
  * or positive or negative percentage representing a ratio of the total number of "should" clauses in this boolean predicate.
@@ -54,7 +54,7 @@
  * behavior is backend-specific (it may throw an exception, or produce unpredictable results,
  * or fall back to some default behavior).
  *
- * <h4 id="minimumshouldmatch-conditionalconstraints">Conditional constraints</h4>
+ * <h3 id="minimumshouldmatch-conditionalconstraints">Conditional constraints</h3>
  * <p>
  * Multiple conditional constraints may be defined,
  * only one of them being applied depending on the total number of "should" clauses.
diff --git a/integrationtest/jdk/java-modules/pom.xml b/integrationtest/java/modules/pom.xml
similarity index 71%
rename from integrationtest/jdk/java-modules/pom.xml
rename to integrationtest/java/modules/pom.xml
index e6e922746d0..1957dd176d9 100644
--- a/integrationtest/jdk/java-modules/pom.xml
+++ b/integrationtest/java/modules/pom.xml
@@ -13,8 +13,8 @@
     <artifactId>hibernate-search-integrationtest-java-modules</artifactId>
     <packaging>jar</packaging>
 
-    <name>Hibernate Search ITs - JDK - Java modules</name>
-    <description>Hibernate Search integration tests for (JDK 11+) Java modules</description>
+    <name>Hibernate Search ITs - Java - Modules</name>
+    <description>Hibernate Search integration tests for Java 11+ modules</description>
 
     <properties>
         <test.elasticsearch.run.skip>${test.elasticsearch.connection.uris.defined}</test.elasticsearch.run.skip>
@@ -25,14 +25,7 @@
         <failsafe.useModulePath>true</failsafe.useModulePath>
 
         <surefire.jvm.args.module>
-            -Dhibernate.search.backend.uris=${test.elasticsearch.connection.uris}
-            -Dhibernate.search.backend.username=${test.elasticsearch.connection.username}
-            -Dhibernate.search.backend.password=${test.elasticsearch.connection.password}
-            -Dhibernate.search.backend.aws.signing.enabled=${test.elasticsearch.connection.aws.signing.enabled}
-            -Dhibernate.search.backend.aws.region=${test.elasticsearch.connection.aws.region}
-            -Dhibernate.search.backend.aws.credentials.type=${test.elasticsearch.connection.aws.credentials.type}
-            -Dhibernate.search.backend.aws.credentials.access_key_id=${test.elasticsearch.connection.aws.credentials.access_key_id}
-            -Dhibernate.search.backend.aws.credentials.secret_access_key=${test.elasticsearch.connection.aws.credentials.secret_access_key}
+            ${test.elasticsearch.connection.jvm.args}
         </surefire.jvm.args.module>
     </properties>
 
diff --git a/integrationtest/jdk/java-modules/src/main/java/module-info.java b/integrationtest/java/modules/src/main/java/module-info.java
similarity index 84%
rename from integrationtest/jdk/java-modules/src/main/java/module-info.java
rename to integrationtest/java/modules/src/main/java/module-info.java
index c928b1fdbf5..8f4bd276b3a 100644
--- a/integrationtest/jdk/java-modules/src/main/java/module-info.java
+++ b/integrationtest/java/modules/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 module org.hibernate.search.integrationtest.java.module {
-	exports org.hibernate.search.integrationtest.java.module.service;
-	opens org.hibernate.search.integrationtest.java.module.entity to
+	exports org.hibernate.search.integrationtest.java.modules.service;
+	opens org.hibernate.search.integrationtest.java.modules.entity to
 			org.hibernate.orm.core,
 			/*
 			 * TODO HSEARCH-4302 This part of the "opens" directive ideally should not be necessary.
@@ -8,7 +8,7 @@
 			 *  and take advantage of the fact the package is already open to Hibernate ORM?
 			 */
 			org.hibernate.search.mapper.orm;
-	opens org.hibernate.search.integrationtest.java.module.config to
+	opens org.hibernate.search.integrationtest.java.modules.config to
 			org.hibernate.search.engine; // For reflective instantiation of the analysis configurer
 
 	requires java.persistence;
diff --git a/integrationtest/jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module/config/MyElasticsearchAnalysisConfigurer.java b/integrationtest/java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules/config/MyElasticsearchAnalysisConfigurer.java
similarity index 93%
rename from integrationtest/jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module/config/MyElasticsearchAnalysisConfigurer.java
rename to integrationtest/java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules/config/MyElasticsearchAnalysisConfigurer.java
index 0e358dafcf5..93944454698 100644
--- a/integrationtest/jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module/config/MyElasticsearchAnalysisConfigurer.java
+++ b/integrationtest/java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules/config/MyElasticsearchAnalysisConfigurer.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.java.module.config;
+package org.hibernate.search.integrationtest.java.modules.config;
 
 import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer;
 import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext;
diff --git a/integrationtest/jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module/entity/Author.java b/integrationtest/java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules/entity/Author.java
similarity index 83%
rename from integrationtest/jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module/entity/Author.java
rename to integrationtest/java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules/entity/Author.java
index 313a971e880..1ceb8ebbc1a 100644
--- a/integrationtest/jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module/entity/Author.java
+++ b/integrationtest/java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules/entity/Author.java
@@ -4,13 +4,13 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.java.module.entity;
+package org.hibernate.search.integrationtest.java.modules.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
-import org.hibernate.search.integrationtest.java.module.config.MyElasticsearchAnalysisConfigurer;
+import org.hibernate.search.integrationtest.java.modules.config.MyElasticsearchAnalysisConfigurer;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 
diff --git a/integrationtest/jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module/service/AuthorService.java b/integrationtest/java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules/service/AuthorService.java
similarity index 94%
rename from integrationtest/jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module/service/AuthorService.java
rename to integrationtest/java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules/service/AuthorService.java
index ab503afe729..c6e85d3828b 100644
--- a/integrationtest/jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module/service/AuthorService.java
+++ b/integrationtest/java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules/service/AuthorService.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.java.module.service;
+package org.hibernate.search.integrationtest.java.modules.service;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.SessionFactoryBuilder;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.search.integrationtest.java.module.entity.Author;
+import org.hibernate.search.integrationtest.java.modules.entity.Author;
 import org.hibernate.search.mapper.orm.Search;
 import org.hibernate.search.engine.search.query.SearchQuery;
 import org.hibernate.search.mapper.orm.session.SearchSession;
diff --git a/integrationtest/jdk/java-modules/src/main/resources/hibernate.properties b/integrationtest/java/modules/src/main/resources/hibernate.properties
similarity index 90%
rename from integrationtest/jdk/java-modules/src/main/resources/hibernate.properties
rename to integrationtest/java/modules/src/main/resources/hibernate.properties
index f7f095bb39d..25deb105fc6 100644
--- a/integrationtest/jdk/java-modules/src/main/resources/hibernate.properties
+++ b/integrationtest/java/modules/src/main/resources/hibernate.properties
@@ -12,4 +12,4 @@ hibernate.max_fetch_depth = 5
 ## Connection info: see POM
 hibernate.search.automatic_indexing.synchronization.strategy = sync
 hibernate.search.backend.log.json_pretty_printing = true
-hibernate.search.backend.analysis.configurer = org.hibernate.search.integrationtest.java.module.config.MyElasticsearchAnalysisConfigurer
+hibernate.search.backend.analysis.configurer = org.hibernate.search.integrationtest.java.modules.config.MyElasticsearchAnalysisConfigurer
diff --git a/integrationtest/jdk/java-modules/src/test/java/org/hibernate/search/integrationtest/java/module/service/JavaModulePathIT.java b/integrationtest/java/modules/src/test/java/org/hibernate/search/integrationtest/java/modules/service/JavaModulePathIT.java
similarity index 94%
rename from integrationtest/jdk/java-modules/src/test/java/org/hibernate/search/integrationtest/java/module/service/JavaModulePathIT.java
rename to integrationtest/java/modules/src/test/java/org/hibernate/search/integrationtest/java/modules/service/JavaModulePathIT.java
index 58fcb720395..c8c0ae9d4ff 100644
--- a/integrationtest/jdk/java-modules/src/test/java/org/hibernate/search/integrationtest/java/module/service/JavaModulePathIT.java
+++ b/integrationtest/java/modules/src/test/java/org/hibernate/search/integrationtest/java/modules/service/JavaModulePathIT.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.integrationtest.java.module.service;
+package org.hibernate.search.integrationtest.java.modules.service;
 
 
 import static org.junit.Assert.assertEquals;
diff --git a/integrationtest/mapper/orm-batch-jsr352/pom.xml b/integrationtest/mapper/orm-batch-jsr352/pom.xml
index b269f4b13bb..b457f22ddf1 100644
--- a/integrationtest/mapper/orm-batch-jsr352/pom.xml
+++ b/integrationtest/mapper/orm-batch-jsr352/pom.xml
@@ -16,14 +16,8 @@
         <test.elasticsearch.run.skip>${test.elasticsearch.connection.uris.defined}</test.elasticsearch.run.skip>
 
         <surefire.jvm.args.module>
-            -Dhibernate.search.backend.uris=${test.elasticsearch.connection.uris}
-            -Dhibernate.search.backend.username=${test.elasticsearch.connection.username}
-            -Dhibernate.search.backend.password=${test.elasticsearch.connection.password}
-            -Dhibernate.search.backend.aws.signing.enabled=${test.elasticsearch.connection.aws.signing.enabled}
-            -Dhibernate.search.backend.aws.region=${test.elasticsearch.connection.aws.region}
-            -Dhibernate.search.backend.aws.credentials.type=${test.elasticsearch.connection.aws.credentials.type}
-            -Dhibernate.search.backend.aws.credentials.access_key_id=${test.elasticsearch.connection.aws.credentials.access_key_id}
-            -Dhibernate.search.backend.aws.credentials.secret_access_key=${test.elasticsearch.connection.aws.credentials.secret_access_key}
+            ${test.elasticsearch.connection.jvm.args}
+            ${test.weld.jvm.args}
         </surefire.jvm.args.module>
     </properties>
 
@@ -184,24 +178,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>testWithJdk11+</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>!8</value>
-                </property>
-            </activation>
-            <properties>
-                <!-- Weld performs illegal accesses to java.base to generate proxies, so we need to allow them -->
-                <surefire.jvm.args.module>
-                    --add-opens java.base/java.security=ALL-UNNAMED
-                    --add-opens java.base/java.lang=ALL-UNNAMED
-                </surefire.jvm.args.module>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
 
diff --git a/integrationtest/mapper/orm-cdi/pom.xml b/integrationtest/mapper/orm-cdi/pom.xml
index fb2e363a25f..7146faae35c 100644
--- a/integrationtest/mapper/orm-cdi/pom.xml
+++ b/integrationtest/mapper/orm-cdi/pom.xml
@@ -12,6 +12,12 @@
     <name>Hibernate Search ITs - ORM - CDI</name>
     <description>Hibernate Search integration tests for the Hibernate ORM integration with CDI</description>
 
+    <properties>
+        <surefire.jvm.args.module>
+            ${test.weld.jvm.args}
+        </surefire.jvm.args.module>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.hibernate.search</groupId>
@@ -62,24 +68,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>testWithJdk11+</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>!8</value>
-                </property>
-            </activation>
-            <properties>
-                <!-- Weld performs illegal accesses to java.base to generate proxies, so we need to allow them -->
-                <surefire.jvm.args.module>
-                    --add-opens java.base/java.security=ALL-UNNAMED
-                    --add-opens java.base/java.lang=ALL-UNNAMED
-                </surefire.jvm.args.module>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
 
diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 1f029ca4734..ac9bd1f10c7 100644
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -41,7 +41,7 @@
                 </property>
             </activation>
             <modules>
-                <module>jdk/java-modules</module>
+                <module>java/modules</module>
             </modules>
         </profile>
     </profiles>
diff --git a/jakarta/integrationtest/jdk/java-modules/pom.xml b/jakarta/integrationtest/java/modules/pom.xml
similarity index 72%
rename from jakarta/integrationtest/jdk/java-modules/pom.xml
rename to jakarta/integrationtest/java/modules/pom.xml
index bab833773a0..53b08b36fd5 100644
--- a/jakarta/integrationtest/jdk/java-modules/pom.xml
+++ b/jakarta/integrationtest/java/modules/pom.xml
@@ -14,10 +14,10 @@
     <packaging>jar</packaging>
 
     <name>Hibernate Search ITs - JDK - Java modules - Jakarta EE</name>
-    <description>Hibernate Search integration tests for (JDK 11+) Java modules - Jakarta EE version</description>
+    <description>Hibernate Search integration tests for Java 11+ modules - Jakarta EE version</description>
 
     <properties>
-        <transform.original.pathFromRoot>integrationtest/jdk/java-modules</transform.original.pathFromRoot>
+        <transform.original.pathFromRoot>integrationtest/java/modules</transform.original.pathFromRoot>
 
         <test.elasticsearch.run.skip>${test.elasticsearch.connection.uris.defined}</test.elasticsearch.run.skip>
         <test.database.run.skip>false</test.database.run.skip>
@@ -27,14 +27,7 @@
         <failsafe.useModulePath>true</failsafe.useModulePath>
 
         <surefire.jvm.args.module>
-            -Dhibernate.search.backend.uris=${test.elasticsearch.connection.uris}
-            -Dhibernate.search.backend.username=${test.elasticsearch.connection.username}
-            -Dhibernate.search.backend.password=${test.elasticsearch.connection.password}
-            -Dhibernate.search.backend.aws.signing.enabled=${test.elasticsearch.connection.aws.signing.enabled}
-            -Dhibernate.search.backend.aws.region=${test.elasticsearch.connection.aws.region}
-            -Dhibernate.search.backend.aws.credentials.type=${test.elasticsearch.connection.aws.credentials.type}
-            -Dhibernate.search.backend.aws.credentials.access_key_id=${test.elasticsearch.connection.aws.credentials.access_key_id}
-            -Dhibernate.search.backend.aws.credentials.secret_access_key=${test.elasticsearch.connection.aws.credentials.secret_access_key}
+            ${test.elasticsearch.connection.jvm.args}
         </surefire.jvm.args.module>
     </properties>
 
diff --git a/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml b/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml
index ccfd8673d0c..12521358036 100644
--- a/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml
+++ b/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml
@@ -18,14 +18,8 @@
         <test.elasticsearch.run.skip>${test.elasticsearch.connection.uris.defined}</test.elasticsearch.run.skip>
 
         <surefire.jvm.args.module>
-            -Dhibernate.search.backend.uris=${test.elasticsearch.connection.uris}
-            -Dhibernate.search.backend.username=${test.elasticsearch.connection.username}
-            -Dhibernate.search.backend.password=${test.elasticsearch.connection.password}
-            -Dhibernate.search.backend.aws.signing.enabled=${test.elasticsearch.connection.aws.signing.enabled}
-            -Dhibernate.search.backend.aws.region=${test.elasticsearch.connection.aws.region}
-            -Dhibernate.search.backend.aws.credentials.type=${test.elasticsearch.connection.aws.credentials.type}
-            -Dhibernate.search.backend.aws.credentials.access_key_id=${test.elasticsearch.connection.aws.credentials.access_key_id}
-            -Dhibernate.search.backend.aws.credentials.secret_access_key=${test.elasticsearch.connection.aws.credentials.secret_access_key}
+            ${test.elasticsearch.connection.jvm.args}
+            ${test.weld.jvm.args}
         </surefire.jvm.args.module>
     </properties>
 
@@ -189,24 +183,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>testWithJdk11+</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>!8</value>
-                </property>
-            </activation>
-            <properties>
-                <!-- Weld performs illegal accesses to java.base to generate proxies, so we need to allow them -->
-                <surefire.jvm.args.module>
-                    --add-opens java.base/java.security=ALL-UNNAMED
-                    --add-opens java.base/java.lang=ALL-UNNAMED
-                </surefire.jvm.args.module>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
 
diff --git a/jakarta/integrationtest/mapper/orm-cdi/pom.xml b/jakarta/integrationtest/mapper/orm-cdi/pom.xml
index 55043bee643..67705aaa3be 100644
--- a/jakarta/integrationtest/mapper/orm-cdi/pom.xml
+++ b/jakarta/integrationtest/mapper/orm-cdi/pom.xml
@@ -14,6 +14,10 @@
 
     <properties>
         <transform.original.pathFromRoot>integrationtest/mapper/orm-cdi</transform.original.pathFromRoot>
+
+        <surefire.jvm.args.module>
+            ${test.weld.jvm.args}
+        </surefire.jvm.args.module>
     </properties>
 
     <dependencies>
@@ -69,24 +73,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>testWithJdk11+</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>!8</value>
-                </property>
-            </activation>
-            <properties>
-                <!-- Weld performs illegal accesses to java.base to generate proxies, so we need to allow them -->
-                <surefire.jvm.args.module>
-                    --add-opens java.base/java.security=ALL-UNNAMED
-                    --add-opens java.base/java.lang=ALL-UNNAMED
-                </surefire.jvm.args.module>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
 
diff --git a/jakarta/integrationtest/pom.xml b/jakarta/integrationtest/pom.xml
index 7d57b81dafb..d7df2c8843f 100644
--- a/jakarta/integrationtest/pom.xml
+++ b/jakarta/integrationtest/pom.xml
@@ -33,7 +33,7 @@
                 </property>
             </activation>
             <modules>
-                <module>jdk/java-modules</module>
+                <module>java/modules</module>
             </modules>
         </profile>
     </profiles>
diff --git a/jakarta/util/internal/test/orm/pom.xml b/jakarta/util/internal/test/orm/pom.xml
index 956bd000cf2..1f9e0e2c9e6 100644
--- a/jakarta/util/internal/test/orm/pom.xml
+++ b/jakarta/util/internal/test/orm/pom.xml
@@ -39,10 +39,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/model/spi/PojoRawTypeModel.java b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/model/spi/PojoRawTypeModel.java
index 4ea4c945097..f67eed7c8ce 100644
--- a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/model/spi/PojoRawTypeModel.java
+++ b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/model/spi/PojoRawTypeModel.java
@@ -21,7 +21,6 @@
  * with different parameters, such as {@code ArrayList<String>}.
  * Thus the mapper would be unable to find which mapping to use when indexing such an instance,
  * and it would be impossible to target the index from the {@link Class} only.
- * <p>
  *
  * @see PojoTypeModel
  * @param <T> The pojo type
diff --git a/orm6/integrationtest/jdk/java-modules/pom.xml b/orm6/integrationtest/java/modules/pom.xml
similarity index 72%
rename from orm6/integrationtest/jdk/java-modules/pom.xml
rename to orm6/integrationtest/java/modules/pom.xml
index 3367d0ff622..8689395fee4 100644
--- a/orm6/integrationtest/jdk/java-modules/pom.xml
+++ b/orm6/integrationtest/java/modules/pom.xml
@@ -14,10 +14,10 @@
     <packaging>jar</packaging>
 
     <name>Hibernate Search ITs - JDK - Java modules - ORM6</name>
-    <description>Hibernate Search integration tests for (JDK 11+) Java modules - ORM6 version</description>
+    <description>Hibernate Search integration tests for Java 11+ modules - ORM6 version</description>
 
     <properties>
-        <transform.original.pathFromRoot>integrationtest/jdk/java-modules</transform.original.pathFromRoot>
+        <transform.original.pathFromRoot>integrationtest/java/modules</transform.original.pathFromRoot>
 
         <test.elasticsearch.run.skip>${test.elasticsearch.connection.uris.defined}</test.elasticsearch.run.skip>
         <test.database.run.skip>false</test.database.run.skip>
@@ -27,14 +27,7 @@
         <failsafe.useModulePath>true</failsafe.useModulePath>
 
         <surefire.jvm.args.module>
-            -Dhibernate.search.backend.uris=${test.elasticsearch.connection.uris}
-            -Dhibernate.search.backend.username=${test.elasticsearch.connection.username}
-            -Dhibernate.search.backend.password=${test.elasticsearch.connection.password}
-            -Dhibernate.search.backend.aws.signing.enabled=${test.elasticsearch.connection.aws.signing.enabled}
-            -Dhibernate.search.backend.aws.region=${test.elasticsearch.connection.aws.region}
-            -Dhibernate.search.backend.aws.credentials.type=${test.elasticsearch.connection.aws.credentials.type}
-            -Dhibernate.search.backend.aws.credentials.access_key_id=${test.elasticsearch.connection.aws.credentials.access_key_id}
-            -Dhibernate.search.backend.aws.credentials.secret_access_key=${test.elasticsearch.connection.aws.credentials.secret_access_key}
+            ${test.elasticsearch.connection.jvm.args}
         </surefire.jvm.args.module>
     </properties>
 
diff --git a/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml b/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml
index 02cb5b6f87f..f526460f7bd 100644
--- a/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml
+++ b/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml
@@ -18,14 +18,8 @@
         <test.elasticsearch.run.skip>${test.elasticsearch.connection.uris.defined}</test.elasticsearch.run.skip>
 
         <surefire.jvm.args.module>
-            -Dhibernate.search.backend.uris=${test.elasticsearch.connection.uris}
-            -Dhibernate.search.backend.username=${test.elasticsearch.connection.username}
-            -Dhibernate.search.backend.password=${test.elasticsearch.connection.password}
-            -Dhibernate.search.backend.aws.signing.enabled=${test.elasticsearch.connection.aws.signing.enabled}
-            -Dhibernate.search.backend.aws.region=${test.elasticsearch.connection.aws.region}
-            -Dhibernate.search.backend.aws.credentials.type=${test.elasticsearch.connection.aws.credentials.type}
-            -Dhibernate.search.backend.aws.credentials.access_key_id=${test.elasticsearch.connection.aws.credentials.access_key_id}
-            -Dhibernate.search.backend.aws.credentials.secret_access_key=${test.elasticsearch.connection.aws.credentials.secret_access_key}
+            ${test.elasticsearch.connection.jvm.args}
+            ${test.weld.jvm.args}
         </surefire.jvm.args.module>
     </properties>
 
@@ -189,24 +183,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>testWithJdk11+</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>!8</value>
-                </property>
-            </activation>
-            <properties>
-                <!-- Weld performs illegal accesses to java.base to generate proxies, so we need to allow them -->
-                <surefire.jvm.args.module>
-                    --add-opens java.base/java.security=ALL-UNNAMED
-                    --add-opens java.base/java.lang=ALL-UNNAMED
-                </surefire.jvm.args.module>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
 
diff --git a/orm6/integrationtest/mapper/orm-cdi/pom.xml b/orm6/integrationtest/mapper/orm-cdi/pom.xml
index 90d200aff96..746155657a1 100644
--- a/orm6/integrationtest/mapper/orm-cdi/pom.xml
+++ b/orm6/integrationtest/mapper/orm-cdi/pom.xml
@@ -14,6 +14,10 @@
 
     <properties>
         <transform.original.pathFromRoot>integrationtest/mapper/orm-cdi</transform.original.pathFromRoot>
+
+        <surefire.jvm.args.module>
+            ${test.weld.jvm.args}
+        </surefire.jvm.args.module>
     </properties>
 
     <dependencies>
@@ -69,24 +73,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>testWithJdk11+</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>!8</value>
-                </property>
-            </activation>
-            <properties>
-                <!-- Weld performs illegal accesses to java.base to generate proxies, so we need to allow them -->
-                <surefire.jvm.args.module>
-                    --add-opens java.base/java.security=ALL-UNNAMED
-                    --add-opens java.base/java.lang=ALL-UNNAMED
-                </surefire.jvm.args.module>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
 
diff --git a/orm6/integrationtest/pom.xml b/orm6/integrationtest/pom.xml
index d3568d60427..2b428ed4d98 100644
--- a/orm6/integrationtest/pom.xml
+++ b/orm6/integrationtest/pom.xml
@@ -33,7 +33,7 @@
                 </property>
             </activation>
             <modules>
-                <module>jdk/java-modules</module>
+                <module>java/modules</module>
             </modules>
         </profile>
     </profiles>
diff --git a/orm6/util/internal/test/orm/pom.xml b/orm6/util/internal/test/orm/pom.xml
index 97deea467d4..6d6055316d0 100644
--- a/orm6/util/internal/test/orm/pom.xml
+++ b/orm6/util/internal/test/orm/pom.xml
@@ -39,10 +39,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/parents/public/pom.xml b/parents/public/pom.xml
index 37a6c4c1032..28460324980 100644
--- a/parents/public/pom.xml
+++ b/parents/public/pom.xml
@@ -114,8 +114,21 @@
                                 <head>Experimental</head>
                             </tag>
                         </tags>
-                        <!-- Java 9+ supports HTML5 for javadoc generation -->
-                        <additionalOptions>-html5</additionalOptions>
+                        <additionalOptions>
+                            <!-- Java 9+ supports HTML5 for javadoc generation -->
+                            <additionalOption>-html5</additionalOption>
+                            <!-- Java 17+ adds a warning for every single class/method/etc. without a javadoc comment,
+                                 and we have lots of those.
+                                 The only way to disable those warnings is to disable the group of checks "missing",
+                                 and unfortunately this also disables checks such as "no @return" or "missing @param".
+                                 I've looked into the javadoc code and there doesn't seem to be a more precise setting.
+                                 See https://github.com/openjdk/jdk/blob/9862cd07c162fcc9cd5cbdd0aab564f446f9256c/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlOptions.java#L428-L439
+                                 See https://github.com/openjdk/jdk/blob/9862cd07c162fcc9cd5cbdd0aab564f446f9256c/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/DocLint.java#L367
+                                 See https://github.com/openjdk/jdk/blob/9862cd07c162fcc9cd5cbdd0aab564f446f9256c/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Messages.java#L181-L182
+                                 See https://github.com/openjdk/jdk/blob/9862cd07c162fcc9cd5cbdd0aab564f446f9256c/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Messages.java#L74-L78
+                                  -->
+                            <additionalOption>-Xdoclint:all,-missing</additionalOption>
+                        </additionalOptions>
                     </configuration>
                 </plugin>
             </plugins>
@@ -125,10 +138,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 08fac0cc04a..6d59a903ee0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -419,8 +419,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <!-- JDK version required for the build; we target 8 but require at least 11 for the build -->
-        <jdk.min.version>11</jdk.min.version>
+        <!-- JDK version required for the build; we target 8 but require at least 17 for the build -->
+        <jdk.min.version>17</jdk.min.version>
         <!-- The lowest supported version of Java for applications using Hibernate Search -->
         <!-- Set statically, independently from the current JDK: we want our code to comply with this version -->
         <java-version.main.release>8</java-version.main.release>
@@ -428,7 +428,7 @@
         <java-version.main.compiler>${java-version.main.compiler.java_home}/bin/javac</java-version.main.compiler>
         <!-- The version of test bytecode, useful for testing compatibility with newer JDKs -->
         <!-- Set to the version of the JDK running Maven by default, but overridden on CI -->
-        <!-- 'java.specification.version' is only correct from Java 9 onwards, but we require Java 11 for the build anyway -->
+        <!-- 'java.specification.version' is only correct from Java 9 onwards, but we require Java 17 for the build anyway -->
         <java-version.test.release>${java.specification.version}</java-version.test.release>
         <java-version.test.compiler.java_home>${java.home}</java-version.test.compiler.java_home>
         <java-version.test.compiler>${java-version.test.compiler.java_home}/bin/javac</java-version.test.compiler>
@@ -505,6 +505,7 @@
         <failsafe.jvm.args.jacoco></failsafe.jvm.args.jacoco>
         <!-- JVM args to be customized by each Maven module -->
         <surefire.jvm.args.module></surefire.jvm.args.module>
+        <surefire.jvm.args.module.add-opens></surefire.jvm.args.module.add-opens>
         <!--
              Pass these properties as system properties to be able to switch to
              a different database without re-compiling the hibernate.properties file
@@ -563,6 +564,18 @@
         <test.elasticsearch.connection.aws.credentials.type></test.elasticsearch.connection.aws.credentials.type>
         <test.elasticsearch.connection.aws.credentials.access_key_id></test.elasticsearch.connection.aws.credentials.access_key_id>
         <test.elasticsearch.connection.aws.credentials.secret_access_key></test.elasticsearch.connection.aws.credentials.secret_access_key>
+        <!-- Property whose sole purpose is to be referenced in the definition of surefire.jvm.args.module
+             when elasticsearch connection is necessary -->
+        <test.elasticsearch.connection.jvm.args>
+            -Dhibernate.search.backend.uris=${test.elasticsearch.connection.uris}
+            -Dhibernate.search.backend.username=${test.elasticsearch.connection.username}
+            -Dhibernate.search.backend.password=${test.elasticsearch.connection.password}
+            -Dhibernate.search.backend.aws.signing.enabled=${test.elasticsearch.connection.aws.signing.enabled}
+            -Dhibernate.search.backend.aws.region=${test.elasticsearch.connection.aws.region}
+            -Dhibernate.search.backend.aws.credentials.type=${test.elasticsearch.connection.aws.credentials.type}
+            -Dhibernate.search.backend.aws.credentials.access_key_id=${test.elasticsearch.connection.aws.credentials.access_key_id}
+            -Dhibernate.search.backend.aws.credentials.secret_access_key=${test.elasticsearch.connection.aws.credentials.secret_access_key}
+        </test.elasticsearch.connection.jvm.args>
         <!-- Control how integration tests format the requests sent to Elasticsearch -->
         <test.elasticsearch.testdialect></test.elasticsearch.testdialect>
 
@@ -600,6 +613,14 @@
         <test.database.run.mssql.image.name>mcr.microsoft.com/mssql/server</test.database.run.mssql.image.name>
         <test.database.run.mssql.image.tag>2019-CU8-ubuntu-16.04</test.database.run.mssql.image.tag>
 
+        <!-- Property whose sole purpose is to be referenced in the definition of surefire.jvm.args.module
+             when Weld is used. -->
+        <!-- Weld performs illegal accesses to java.base to generate proxies, so we need to allow them. -->
+        <test.weld.jvm.args>
+            --add-opens java.base/java.security=ALL-UNNAMED
+            --add-opens java.base/java.lang=ALL-UNNAMED
+        </test.weld.jvm.args>
+
         <!-- Eclipse plugin options -->
 
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
@@ -1674,8 +1695,6 @@
                         <release>${maven.compiler.release}</release>
                         <testRelease>${maven.compiler.testRelease}</testRelease>
                         <encoding>UTF-8</encoding>
-                        <!-- needed because of compiler bug: http://bugs.sun.com/view_bug.do?bug_id=6512707 -->
-                        <proc>none</proc>
                         <compilerArgs>
                             <compilerArg>-Xlint:unchecked</compilerArg>
                         </compilerArgs>
@@ -1686,12 +1705,25 @@
                             <configuration>
                                 <fork>true</fork>
                                 <executable>${java-version.main.compiler}</executable>
+                                <annotationProcessorPaths>
+                                    <path>
+                                        <groupId>org.jboss.logging</groupId>
+                                        <artifactId>jboss-logging-processor</artifactId>
+                                        <version>${version.org.jboss.logging.jboss-logging-tools}</version>
+                                    </path>
+                                    <path>
+                                        <groupId>org.jboss.logging</groupId>
+                                        <artifactId>jboss-logging</artifactId>
+                                        <version>${version.org.jboss.logging.jboss-logging}</version>
+                                    </path>
+                                </annotationProcessorPaths>
                             </configuration>
                         </execution>
                         <execution>
                             <id>default-testCompile</id>
                             <configuration>
                                 <fork>true</fork>
+                                <proc>none</proc>
                                 <executable>${java-version.test.compiler}</executable>
                             </configuration>
                         </execution>
@@ -1701,31 +1733,6 @@
                     <groupId>org.bsc.maven</groupId>
                     <artifactId>maven-processor-plugin</artifactId>
                     <version>${version.processor.plugin}</version>
-                    <executions>
-                        <!-- Run annotation processors on src/main/java sources -->
-                        <execution>
-                            <id>process</id>
-                            <goals>
-                                <goal>process</goal>
-                            </goals>
-                            <phase>process-sources</phase>
-                            <configuration>
-                                <processors>
-                                    <processor>org.jboss.logging.processor.apt.LoggingToolsProcessor</processor>
-                                </processors>
-                                <!-- Necessary for the Jakarta artifacts, where sources are copied from other modules -->
-                                <addCompileSourceRoots>true</addCompileSourceRoots>
-                            </configuration>
-                        </execution>
-                    </executions>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.jboss.logging</groupId>
-                            <artifactId>jboss-logging-processor</artifactId>
-                            <version>${version.org.jboss.logging.jboss-logging-tools}</version>
-                            <scope>compile</scope>
-                        </dependency>
-                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
@@ -2334,30 +2341,6 @@
             </modules>
         </profile>
 
-        <profile>
-            <id>testWithJdk8</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>8</value>
-                </property>
-            </activation>
-            <properties>
-                <surefire.jvm.args.java-version></surefire.jvm.args.java-version>
-                <maven.compiler.failOnWarning>false</maven.compiler.failOnWarning>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>testWithJdk11</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>11</value>
-                </property>
-            </activation>
-        </profile>
-
         <profile>
             <id>testWithJdkSpecifiedExplicitly</id>
             <activation>
@@ -2376,45 +2359,33 @@
         </profile>
 
         <profile>
-            <id>testWithJdk16</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>16</value>
-                </property>
-            </activation>
-            <properties>
-                <!-- Spring isn't ready for JDK16 yet -->
-                <failsafe.spring.skip>true</failsafe.spring.skip>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>testWithJdk17</id>
+            <id>testWithJdk8</id>
             <activation>
                 <property>
                     <name>java-version.test.release</name>
-                    <value>17</value>
+                    <value>8</value>
                 </property>
             </activation>
             <properties>
-                <!-- Spring isn't ready for JDK17 yet -->
-                <failsafe.spring.skip>true</failsafe.spring.skip>
+                <!-- JDK 8 doesn't support the settings mentioned in the default value of this property,
+                     but it doesn't need them either, so we just omit them. -->
+                <surefire.jvm.args.java-version></surefire.jvm.args.java-version>
+                <!-- JDK 8 produces so many false positives that warnings are worthless -->
+                <maven.compiler.failOnWarning>false</maven.compiler.failOnWarning>
+                <!-- JDK 8 doesn't support the add-opens mentioned in the default value of this property,
+                     but it doesn't need them either, so we just omit them. -->
+                <test.weld.jvm.args></test.weld.jvm.args>
             </properties>
         </profile>
 
         <profile>
-            <id>testWithJdk18</id>
+            <id>testWithJdk11</id>
             <activation>
                 <property>
                     <name>java-version.test.release</name>
-                    <value>18</value>
+                    <value>11</value>
                 </property>
             </activation>
-            <properties>
-                <!-- Spring isn't ready for JDK18 yet -->
-                <failsafe.spring.skip>true</failsafe.spring.skip>
-            </properties>
         </profile>
 
         <profile>
@@ -2542,17 +2513,20 @@
                 </property>
             </activation>
             <dependencies>
+                <!-- Intellij IDEA doesn't understand <annotationProcessorPaths> in
+                     the maven-compiler-plugin configuration, so we need this in order
+                     for compilation to work in the IDE. -->
                 <dependency>
                     <groupId>org.jboss.logging</groupId>
                     <artifactId>jboss-logging-processor</artifactId>
                     <version>${version.org.jboss.logging.jboss-logging-tools}</version>
-                    <scope>compile</scope>
+                    <scope>provided</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.openjdk.jmh</groupId>
                     <artifactId>jmh-generator-annprocess</artifactId>
                     <version>${version.org.openjdk.jmh}</version>
-                    <scope>compile</scope>
+                    <scope>provided</scope>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/util/common/src/main/java/org/hibernate/search/util/common/reflect/impl/MethodHandleValueReadHandle.java b/util/common/src/main/java/org/hibernate/search/util/common/reflect/impl/MethodHandleValueReadHandle.java
index 1e682882059..e460a41cf36 100644
--- a/util/common/src/main/java/org/hibernate/search/util/common/reflect/impl/MethodHandleValueReadHandle.java
+++ b/util/common/src/main/java/org/hibernate/search/util/common/reflect/impl/MethodHandleValueReadHandle.java
@@ -34,6 +34,7 @@ public String toString() {
 	}
 
 	@Override
+	@SuppressWarnings("unchecked")
 	public T get(Object thiz) {
 		try {
 			return (T) getter.invoke( thiz );
diff --git a/util/internal/integrationtest/v5migrationhelper/pom.xml b/util/internal/integrationtest/v5migrationhelper/pom.xml
index cf9606a182c..fa0c8c20a10 100644
--- a/util/internal/integrationtest/v5migrationhelper/pom.xml
+++ b/util/internal/integrationtest/v5migrationhelper/pom.xml
@@ -80,10 +80,6 @@
                     <failOnWarning>false</failOnWarning>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/util/internal/test/common/pom.xml b/util/internal/test/common/pom.xml
index 28b8279c813..f200ffa61b0 100644
--- a/util/internal/test/common/pom.xml
+++ b/util/internal/test/common/pom.xml
@@ -84,10 +84,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/util/internal/test/orm/pom.xml b/util/internal/test/orm/pom.xml
index b67911d347c..3346a20d41e 100644
--- a/util/internal/test/orm/pom.xml
+++ b/util/internal/test/orm/pom.xml
@@ -36,10 +36,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/v5migrationhelper/engine/src/main/java/org/hibernate/search/query/dsl/BooleanJunction.java b/v5migrationhelper/engine/src/main/java/org/hibernate/search/query/dsl/BooleanJunction.java
index 993fdb5dba9..1404319929e 100644
--- a/v5migrationhelper/engine/src/main/java/org/hibernate/search/query/dsl/BooleanJunction.java
+++ b/v5migrationhelper/engine/src/main/java/org/hibernate/search/query/dsl/BooleanJunction.java
@@ -11,7 +11,8 @@
 
 /**
  * Represents a boolean query that can contains one or more elements to join
- * <h3 id="minimumshouldmatch">"minimumShouldMatch" constraints</h3>
+ *
+ * <h2 id="minimumshouldmatch">"minimumShouldMatch" constraints</h2>
  * <p>
  * "minimumShouldMatch" constraints define a minimum number of "should" clauses that have to match
  * in order for the boolean junction to match.
@@ -21,7 +22,7 @@
  * in Solr or
  * <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html">{@code minimum_should_match}</a>
  * in Elasticsearch.
- * <h4 id="minimumshouldmatch-minimum">Definition of the minimum</h4>
+ * <h3 id="minimumshouldmatch-minimum">Definition of the minimum</h3>
  * <p>
  * The minimum may be defined either directly as a positive number, or indirectly as a negative number
  * or positive or negative percentage representing a ratio of the total number of "should" clauses in this boolean junction.