From fbd8064b453ac574a5ecab0b8f3ce2da8490e00a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 10:56:49 +0200 Subject: [PATCH 01/13] HSEARCH-4522 Remove build configuration for obsolete JDKs --- Jenkinsfile | 6 ------ pom.xml | 14 -------------- 2 files changed, 20 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6bdafec2760..4168429cea9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -177,12 +177,6 @@ stage('Configure') { new JdkBuildEnvironment(version: '11', testCompilerTool: 'OpenJDK 11 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', diff --git a/pom.xml b/pom.xml index 08fac0cc04a..edf43151096 100644 --- a/pom.xml +++ b/pom.xml @@ -2375,20 +2375,6 @@ - - testWithJdk16 - - - java-version.test.release - 16 - - - - - true - - - testWithJdk17 From 464a41276b46128347ae4702013edd96ad188c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 10:07:10 +0200 Subject: [PATCH 02/13] HSEARCH-4522 Reduce duplication around JVM properties related to Elasticsearch connection --- integrationtest/jdk/java-modules/pom.xml | 9 +-------- integrationtest/mapper/orm-batch-jsr352/pom.xml | 9 +-------- jakarta/integrationtest/jdk/java-modules/pom.xml | 9 +-------- .../integrationtest/mapper/orm-batch-jsr352/pom.xml | 9 +-------- orm6/integrationtest/jdk/java-modules/pom.xml | 9 +-------- orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml | 9 +-------- pom.xml | 12 ++++++++++++ 7 files changed, 18 insertions(+), 48 deletions(-) diff --git a/integrationtest/jdk/java-modules/pom.xml b/integrationtest/jdk/java-modules/pom.xml index e6e922746d0..873a30fc368 100644 --- a/integrationtest/jdk/java-modules/pom.xml +++ b/integrationtest/jdk/java-modules/pom.xml @@ -25,14 +25,7 @@ true - -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} diff --git a/integrationtest/mapper/orm-batch-jsr352/pom.xml b/integrationtest/mapper/orm-batch-jsr352/pom.xml index b269f4b13bb..c790836654d 100644 --- a/integrationtest/mapper/orm-batch-jsr352/pom.xml +++ b/integrationtest/mapper/orm-batch-jsr352/pom.xml @@ -16,14 +16,7 @@ ${test.elasticsearch.connection.uris.defined} - -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} diff --git a/jakarta/integrationtest/jdk/java-modules/pom.xml b/jakarta/integrationtest/jdk/java-modules/pom.xml index bab833773a0..e856dac61a6 100644 --- a/jakarta/integrationtest/jdk/java-modules/pom.xml +++ b/jakarta/integrationtest/jdk/java-modules/pom.xml @@ -27,14 +27,7 @@ true - -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} diff --git a/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml b/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml index ccfd8673d0c..97d19ce5f34 100644 --- a/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml +++ b/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml @@ -18,14 +18,7 @@ ${test.elasticsearch.connection.uris.defined} - -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} diff --git a/orm6/integrationtest/jdk/java-modules/pom.xml b/orm6/integrationtest/jdk/java-modules/pom.xml index 3367d0ff622..508f1d41d6b 100644 --- a/orm6/integrationtest/jdk/java-modules/pom.xml +++ b/orm6/integrationtest/jdk/java-modules/pom.xml @@ -27,14 +27,7 @@ true - -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} diff --git a/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml b/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml index 02cb5b6f87f..e79df739f2a 100644 --- a/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml +++ b/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml @@ -18,14 +18,7 @@ ${test.elasticsearch.connection.uris.defined} - -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} diff --git a/pom.xml b/pom.xml index edf43151096..a96a2fca8e9 100644 --- a/pom.xml +++ b/pom.xml @@ -563,6 +563,18 @@ + + + -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} + From e94ef04d05995587abf3ab67898b0db51d42b386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 11:54:48 +0200 Subject: [PATCH 03/13] HSEARCH-4522 Simplify test configuration common to all JDKs above JDK11 --- .../mapper/orm-batch-jsr352/pom.xml | 20 +-------------- integrationtest/mapper/orm-cdi/pom.xml | 25 +++++-------------- .../mapper/orm-batch-jsr352/pom.xml | 20 +-------------- .../integrationtest/mapper/orm-cdi/pom.xml | 23 +++-------------- .../mapper/orm-batch-jsr352/pom.xml | 20 +-------------- orm6/integrationtest/mapper/orm-cdi/pom.xml | 23 +++-------------- pom.xml | 12 +++++++++ 7 files changed, 29 insertions(+), 114 deletions(-) diff --git a/integrationtest/mapper/orm-batch-jsr352/pom.xml b/integrationtest/mapper/orm-batch-jsr352/pom.xml index c790836654d..b457f22ddf1 100644 --- a/integrationtest/mapper/orm-batch-jsr352/pom.xml +++ b/integrationtest/mapper/orm-batch-jsr352/pom.xml @@ -17,6 +17,7 @@ ${test.elasticsearch.connection.jvm.args} + ${test.weld.jvm.args} @@ -177,24 +178,5 @@ - - - testWithJdk11+ - - - java-version.test.release - !8 - - - - - - --add-opens java.base/java.security=ALL-UNNAMED - --add-opens java.base/java.lang=ALL-UNNAMED - - - - - 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 @@ Hibernate Search ITs - ORM - CDI Hibernate Search integration tests for the Hibernate ORM integration with CDI + + + ${test.weld.jvm.args} + + + org.hibernate.search @@ -62,24 +68,5 @@ - - - testWithJdk11+ - - - java-version.test.release - !8 - - - - - - --add-opens java.base/java.security=ALL-UNNAMED - --add-opens java.base/java.lang=ALL-UNNAMED - - - - - diff --git a/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml b/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml index 97d19ce5f34..12521358036 100644 --- a/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml +++ b/jakarta/integrationtest/mapper/orm-batch-jsr352/pom.xml @@ -19,6 +19,7 @@ ${test.elasticsearch.connection.jvm.args} + ${test.weld.jvm.args} @@ -182,24 +183,5 @@ - - - testWithJdk11+ - - - java-version.test.release - !8 - - - - - - --add-opens java.base/java.security=ALL-UNNAMED - --add-opens java.base/java.lang=ALL-UNNAMED - - - - - 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 @@ integrationtest/mapper/orm-cdi + + + ${test.weld.jvm.args} + @@ -69,24 +73,5 @@ - - - testWithJdk11+ - - - java-version.test.release - !8 - - - - - - --add-opens java.base/java.security=ALL-UNNAMED - --add-opens java.base/java.lang=ALL-UNNAMED - - - - - diff --git a/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml b/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml index e79df739f2a..f526460f7bd 100644 --- a/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml +++ b/orm6/integrationtest/mapper/orm-batch-jsr352/pom.xml @@ -19,6 +19,7 @@ ${test.elasticsearch.connection.jvm.args} + ${test.weld.jvm.args} @@ -182,24 +183,5 @@ - - - testWithJdk11+ - - - java-version.test.release - !8 - - - - - - --add-opens java.base/java.security=ALL-UNNAMED - --add-opens java.base/java.lang=ALL-UNNAMED - - - - - 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 @@ integrationtest/mapper/orm-cdi + + + ${test.weld.jvm.args} + @@ -69,24 +73,5 @@ - - - testWithJdk11+ - - - java-version.test.release - !8 - - - - - - --add-opens java.base/java.security=ALL-UNNAMED - --add-opens java.base/java.lang=ALL-UNNAMED - - - - - diff --git a/pom.xml b/pom.xml index a96a2fca8e9..9300320cbfc 100644 --- a/pom.xml +++ b/pom.xml @@ -505,6 +505,7 @@ + + + + --add-opens java.base/java.security=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED + + jdt_apt @@ -2357,6 +2366,9 @@ false + + From 6e55df7b48e423ceb359823b8646d8f73c19dac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 12:05:36 +0200 Subject: [PATCH 04/13] HSEARCH-4522 Document JDK8-specific build configuration --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 9300320cbfc..5a0107caeb2 100644 --- a/pom.xml +++ b/pom.xml @@ -2364,7 +2364,10 @@ + + false From 4a460f76039361a5af839835877e33ef93544930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 12:30:35 +0200 Subject: [PATCH 05/13] HSEARCH-4522 Enable Spring-based ITs on JDK 17/18 Spring seems to be working fine on JDK 17/18 now. --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 5a0107caeb2..6fae6ecd7e5 100644 --- a/pom.xml +++ b/pom.xml @@ -2410,10 +2410,6 @@ 17 - - - true - @@ -2424,10 +2420,6 @@ 18 - - - true - From b8f320eabc9f2a5eb39c1cc8f0cbfdb1b5079f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 14:01:14 +0200 Subject: [PATCH 06/13] HSEARCH-4522 Disable javadoc warnings for missing comments --- parents/public/pom.xml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/parents/public/pom.xml b/parents/public/pom.xml index 37a6c4c1032..d9e8a5aa294 100644 --- a/parents/public/pom.xml +++ b/parents/public/pom.xml @@ -114,8 +114,21 @@ Experimental - - -html5 + + + -html5 + + -Xdoclint:all,-missing + From ea675ac48ef3e4a5fb7966e5c803cee5b7fafc80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 14:31:55 +0200 Subject: [PATCH 07/13] HSEARCH-4522 Fix new javadoc warnings with JDK 17 --- .../org/hibernate/search/engine/cfg/package-info.java | 6 +++--- .../predicate/dsl/BooleanPredicateOptionsCollector.java | 8 ++++---- .../predicate/dsl/MatchIdPredicateMatchingStep.java | 4 ---- .../predicate/dsl/MinimumShouldMatchConditionStep.java | 6 +++--- .../search/mapper/pojo/model/spi/PojoRawTypeModel.java | 1 - .../org/hibernate/search/query/dsl/BooleanJunction.java | 5 +++-- 6 files changed, 13 insertions(+), 17 deletions(-) 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. * - *

Common expected types for property values

+ *

Common expected types for property values

* * Below are some commonly used property types across all Hibernate Search settings * (engine, backends, mappers, ...). * - *

Bean reference

+ *

Bean reference

* * A reference to a bean of type {@code T} can be passed as either: *
    @@ -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. * - *

    Multi-valued bean reference

    + *

    Multi-valued bean reference

    * * A multi-valued reference to a bean of type {@code T} can be passed as either: *
      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 @@ *

      * Different types of clauses have different effects, see below. * - *

      "must" clauses

      + *

      "must" clauses

      *

      * "must" clauses are required to match: if they don't match, then the boolean predicate will not match. *

      * Matching "must" clauses are taken into account during score computation. * - *

      "must not" clauses

      + *

      "must not" clauses

      *

      * "must not" clauses are required to not match: if they match, then the boolean predicate will not match. *

      * "must not" clauses are ignored during score computation. * - *

      "filter" clauses

      + *

      "filter" clauses

      *

      * "filter" clauses are required to match: if they don't match, then the boolean predicate will not match. *

      * "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). * - *

      "should" clauses

      + *

      "should" clauses

      *

      * "should" clauses may optionally match, and are required to match depending on the context. *

      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 * If used multiple times, it will target any of the specified values. - *

      * @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. *

      * If used multiple times, it will target any of the specified values. - *

      * @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. - *

      * @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. - *

      * @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. * - *

      "minimumShouldMatch" constraints

      + *

      "minimumShouldMatch" constraints

      *

      * "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 @@ * {@code minimum_should_match} * in Elasticsearch. * - *

      Definition of the minimum

      + *

      Definition of the minimum

      *

      * 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). * - *

      Conditional constraints

      + *

      Conditional constraints

      *

      * Multiple conditional constraints may be defined, * only one of them being applied depending on the total number of "should" clauses. 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}. * 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. - *

      * * @see PojoTypeModel * @param The pojo type 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 - *

      "minimumShouldMatch" constraints

      + * + *

      "minimumShouldMatch" constraints

      *

      * "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 * {@code minimum_should_match} * in Elasticsearch. - *

      Definition of the minimum

      + *

      Definition of the minimum

      *

      * 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. From cec3c44891dee2a4069874f6ccfe60557affba1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 12:39:51 +0200 Subject: [PATCH 08/13] HSEARCH-4522 Add JVM options necessary for JQAssistant to run correctly on JDK17 See http://jqassistant.github.io/jqassistant/doc/1.11.1/manual/#_requirements_3 --- .mvn/jvm.config | 1 + 1 file changed, 1 insertion(+) create mode 100644 .mvn/jvm.config 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 From 3b621825931847f0c64d8e98392843fc59b9c068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 16:53:56 +0200 Subject: [PATCH 09/13] HSEARCH-4522 Use maven-compiler-plugin to apply jboss-logging-processor This seems to get rid of some problems with the eclipse compiler. I don't really understand what those problems are, but since this configuration is less exotic than what we used to have, I won't investigate. --- jakarta/util/internal/test/orm/pom.xml | 4 -- orm6/util/internal/test/orm/pom.xml | 4 -- parents/public/pom.xml | 4 -- pom.xml | 47 +++++++------------ .../integrationtest/v5migrationhelper/pom.xml | 4 -- util/internal/test/common/pom.xml | 4 -- util/internal/test/orm/pom.xml | 4 -- 7 files changed, 18 insertions(+), 53 deletions(-) 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 @@ org.apache.maven.plugins maven-checkstyle-plugin - - org.bsc.maven - maven-processor-plugin - 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 @@ org.apache.maven.plugins maven-checkstyle-plugin - - org.bsc.maven - maven-processor-plugin - diff --git a/parents/public/pom.xml b/parents/public/pom.xml index d9e8a5aa294..28460324980 100644 --- a/parents/public/pom.xml +++ b/parents/public/pom.xml @@ -138,10 +138,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - - org.bsc.maven - maven-processor-plugin - org.apache.maven.plugins maven-source-plugin diff --git a/pom.xml b/pom.xml index 6fae6ecd7e5..9380d2bd56d 100644 --- a/pom.xml +++ b/pom.xml @@ -1695,8 +1695,6 @@ ${maven.compiler.release} ${maven.compiler.testRelease} UTF-8 - - none -Xlint:unchecked @@ -1707,12 +1705,25 @@ true ${java-version.main.compiler} + + + org.jboss.logging + jboss-logging-processor + ${version.org.jboss.logging.jboss-logging-tools} + + + org.jboss.logging + jboss-logging + ${version.org.jboss.logging.jboss-logging} + + default-testCompile true + none ${java-version.test.compiler} @@ -1722,31 +1733,6 @@ org.bsc.maven maven-processor-plugin ${version.processor.plugin} - - - - process - - process - - process-sources - - - org.jboss.logging.processor.apt.LoggingToolsProcessor - - - true - - - - - - org.jboss.logging - jboss-logging-processor - ${version.org.jboss.logging.jboss-logging-tools} - compile - - org.sonatype.plugins @@ -2547,17 +2533,20 @@ + org.jboss.logging jboss-logging-processor ${version.org.jboss.logging.jboss-logging-tools} - compile + provided org.openjdk.jmh jmh-generator-annprocess ${version.org.openjdk.jmh} - compile + provided 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 @@ false - - org.bsc.maven - maven-processor-plugin - org.apache.maven.plugins maven-surefire-plugin 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 @@ org.apache.maven.plugins maven-checkstyle-plugin - - org.bsc.maven - maven-processor-plugin - 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 @@ org.apache.maven.plugins maven-checkstyle-plugin - - org.bsc.maven - maven-processor-plugin - From 063c5fede1b35c27e0f4240510d6795bf34e0a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Fri, 1 Apr 2022 10:37:33 +0200 Subject: [PATCH 10/13] HSEARCH-4522 Fix warnings reported by the Eclipse compiler with -release 17 --- .../util/common/reflect/impl/MethodHandleValueReadHandle.java | 1 + 1 file changed, 1 insertion(+) 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 ); From c67db2758ca7a96cc997f0ba28c4a75d9a836f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 11:55:55 +0200 Subject: [PATCH 11/13] HSEARCH-4522 Use JDK17 by default when building Hibernate Search --- CONTRIBUTING.md | 10 +++++----- Jenkinsfile | 8 ++++---- pom.xml | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) 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 4168429cea9..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,14 +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: '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/pom.xml b/pom.xml index 9380d2bd56d..35b943bf5f0 100644 --- a/pom.xml +++ b/pom.xml @@ -419,8 +419,8 @@ UTF-8 UTF-8 - - 11 + + 17 8 @@ -428,7 +428,7 @@ ${java-version.main.compiler.java_home}/bin/javac - + ${java.specification.version} ${java.home} ${java-version.test.compiler.java_home}/bin/javac From 771086fe208674cbadbf55f8de56a231c490aca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 09:45:13 +0200 Subject: [PATCH 12/13] HSEARCH-4522 Rename integrationtest/jdk/java-modules directory and packages To match the artifact name. --- integrationtest/{jdk/java-modules => java/modules}/pom.xml | 4 ++-- .../modules}/src/main/java/module-info.java | 6 +++--- .../modules}/config/MyElasticsearchAnalysisConfigurer.java | 2 +- .../search/integrationtest/java/modules}/entity/Author.java | 4 ++-- .../java/modules}/service/AuthorService.java | 4 ++-- .../modules}/src/main/resources/hibernate.properties | 2 +- .../java/modules}/service/JavaModulePathIT.java | 2 +- integrationtest/pom.xml | 2 +- .../{jdk/java-modules => java/modules}/pom.xml | 4 ++-- jakarta/integrationtest/pom.xml | 2 +- .../{jdk/java-modules => java/modules}/pom.xml | 4 ++-- orm6/integrationtest/pom.xml | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) rename integrationtest/{jdk/java-modules => java/modules}/pom.xml (94%) rename integrationtest/{jdk/java-modules => java/modules}/src/main/java/module-info.java (84%) rename integrationtest/{jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module => java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules}/config/MyElasticsearchAnalysisConfigurer.java (93%) rename integrationtest/{jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module => java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules}/entity/Author.java (83%) rename integrationtest/{jdk/java-modules/src/main/java/org/hibernate/search/integrationtest/java/module => java/modules/src/main/java/org/hibernate/search/integrationtest/java/modules}/service/AuthorService.java (94%) rename integrationtest/{jdk/java-modules => java/modules}/src/main/resources/hibernate.properties (90%) rename integrationtest/{jdk/java-modules/src/test/java/org/hibernate/search/integrationtest/java/module => java/modules/src/test/java/org/hibernate/search/integrationtest/java/modules}/service/JavaModulePathIT.java (94%) rename jakarta/integrationtest/{jdk/java-modules => java/modules}/pom.xml (92%) rename orm6/integrationtest/{jdk/java-modules => java/modules}/pom.xml (93%) diff --git a/integrationtest/jdk/java-modules/pom.xml b/integrationtest/java/modules/pom.xml similarity index 94% rename from integrationtest/jdk/java-modules/pom.xml rename to integrationtest/java/modules/pom.xml index 873a30fc368..1957dd176d9 100644 --- a/integrationtest/jdk/java-modules/pom.xml +++ b/integrationtest/java/modules/pom.xml @@ -13,8 +13,8 @@ hibernate-search-integrationtest-java-modules jar - Hibernate Search ITs - JDK - Java modules - Hibernate Search integration tests for (JDK 11+) Java modules + Hibernate Search ITs - Java - Modules + Hibernate Search integration tests for Java 11+ modules ${test.elasticsearch.connection.uris.defined} 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 . */ -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 . */ -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 . */ -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 . */ -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/pom.xml b/integrationtest/pom.xml index 1f029ca4734..ac9bd1f10c7 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -41,7 +41,7 @@ - jdk/java-modules + java/modules diff --git a/jakarta/integrationtest/jdk/java-modules/pom.xml b/jakarta/integrationtest/java/modules/pom.xml similarity index 92% rename from jakarta/integrationtest/jdk/java-modules/pom.xml rename to jakarta/integrationtest/java/modules/pom.xml index e856dac61a6..53b08b36fd5 100644 --- a/jakarta/integrationtest/jdk/java-modules/pom.xml +++ b/jakarta/integrationtest/java/modules/pom.xml @@ -14,10 +14,10 @@ jar Hibernate Search ITs - JDK - Java modules - Jakarta EE - Hibernate Search integration tests for (JDK 11+) Java modules - Jakarta EE version + Hibernate Search integration tests for Java 11+ modules - Jakarta EE version - integrationtest/jdk/java-modules + integrationtest/java/modules ${test.elasticsearch.connection.uris.defined} false 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 @@ - jdk/java-modules + java/modules diff --git a/orm6/integrationtest/jdk/java-modules/pom.xml b/orm6/integrationtest/java/modules/pom.xml similarity index 93% rename from orm6/integrationtest/jdk/java-modules/pom.xml rename to orm6/integrationtest/java/modules/pom.xml index 508f1d41d6b..8689395fee4 100644 --- a/orm6/integrationtest/jdk/java-modules/pom.xml +++ b/orm6/integrationtest/java/modules/pom.xml @@ -14,10 +14,10 @@ jar Hibernate Search ITs - JDK - Java modules - ORM6 - Hibernate Search integration tests for (JDK 11+) Java modules - ORM6 version + Hibernate Search integration tests for Java 11+ modules - ORM6 version - integrationtest/jdk/java-modules + integrationtest/java/modules ${test.elasticsearch.connection.uris.defined} false 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 @@ - jdk/java-modules + java/modules From e7edb64a8557a1e5f24eda3dcdc27f536f9d27f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Mar 2022 12:31:42 +0200 Subject: [PATCH 13/13] HSEARCH-4522 Clean up profiles related to the JDK used in tests --- pom.xml | 48 ++++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 35b943bf5f0..6d59a903ee0 100644 --- a/pom.xml +++ b/pom.xml @@ -2341,36 +2341,6 @@ - - testWithJdk8 - - - java-version.test.release - 8 - - - - - - - false - - - - - - - testWithJdk11 - - - java-version.test.release - 11 - - - - testWithJdkSpecifiedExplicitly @@ -2389,21 +2359,31 @@ - testWithJdk17 + testWithJdk8 java-version.test.release - 17 + 8 + + + + + false + + + - testWithJdk18 + testWithJdk11 java-version.test.release - 18 + 11