From defbbf74829e0a994f018a324b30fef4048dc8d8 Mon Sep 17 00:00:00 2001 From: Vladislav Yukharin Date: Sun, 2 Oct 2022 23:14:56 +0600 Subject: [PATCH 01/11] Remove 'fetch' part in 'join fetch' clause during generation of count query --- .../data/jpa/repository/query/QueryUtils.java | 3 +++ .../jpa/repository/query/DefaultQueryUtilsUnitTests.java | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java index cdd49c6241..f3807f9a4e 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java @@ -87,6 +87,7 @@ public abstract class QueryUtils { private static final String SIMPLE_COUNT_VALUE = "$2"; private static final String COMPLEX_COUNT_VALUE = "$3 $6"; private static final String COMPLEX_COUNT_LAST_VALUE = "$6"; + private static final String FETCH_COMING_AFTER_JOIN_PART = "(?iu)(?<=join)(\\s*fetch\\s*)"; private static final String ORDER_BY_PART = "(?iu)\\s+order\\s+by\\s+.*"; private static final Pattern ALIAS_MATCH; @@ -601,6 +602,8 @@ public static String createCountQueryFor(String originalQuery, @Nullable String countQuery = matcher.replaceFirst(String.format(COUNT_REPLACEMENT_TEMPLATE, countProjection)); } + countQuery = countQuery.replaceAll(FETCH_COMING_AFTER_JOIN_PART, " "); + return countQuery.replaceFirst(ORDER_BY_PART, ""); } diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/DefaultQueryUtilsUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/DefaultQueryUtilsUnitTests.java index 828f8a835b..3de3a010f7 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/DefaultQueryUtilsUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/DefaultQueryUtilsUnitTests.java @@ -40,6 +40,7 @@ * @author Grégoire Druant * @author Mohammad Hewedy * @author Greg Turnquist + * @author Vladislav Yukharin */ class DefaultQueryUtilsUnitTests { @@ -224,6 +225,13 @@ void doesNotPrefixSortsIfFunction() { .isThrownBy(() -> applySorting("select p from Person p", sort, "p")); } + @Test // GH-2348 + void removesFetchPartInJoinFetchClauseInGeneratedCountQueryIfPresent() { + + assertCountQuery("select u from User u left outer join fetch u.roles r left outer JOIN FETCH u.accounts a", + "select count(u) from User u left outer join u.roles r left outer JOIN u.accounts a"); + } + @Test // DATAJPA-377 void removesOrderByInGeneratedCountQueryFromOriginalQueryIfPresent() { From 56653781a46c93f27e9d5d5e089c43d825894fad Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 5 Oct 2022 11:39:03 +0200 Subject: [PATCH 02/11] Follow API changes in Spring Framework Closes: #2658 See: spring-projects/spring-data-build#1809 --- .../JpaRepositoryRegistrationAotProcessorUnitTests.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryRegistrationAotProcessorUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryRegistrationAotProcessorUnitTests.java index 5204de044c..a267cf4dae 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryRegistrationAotProcessorUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryRegistrationAotProcessorUnitTests.java @@ -33,6 +33,7 @@ import org.springframework.core.annotation.MergedAnnotation; import org.springframework.data.aot.AotRepositoryContext; import org.springframework.data.repository.core.RepositoryInformation; +import org.springframework.javapoet.ClassName; /** * @author Christoph Strobl @@ -42,7 +43,7 @@ class JpaRepositoryRegistrationAotProcessorUnitTests { @Test // GH-2628 void aotProcessorMustNotRegisterDomainTypes() { - GenerationContext ctx = new DefaultGenerationContext(new ClassNameGenerator(Object.class), + GenerationContext ctx = new DefaultGenerationContext(new ClassNameGenerator(ClassName.OBJECT), new InMemoryGeneratedFiles()); new JpaRepositoryConfigExtension.JpaRepositoryRegistrationAotProcessor() @@ -59,7 +60,7 @@ public Set> getResolvedTypes() { @Test // GH-2628 void aotProcessorMustNotRegisterAnnotations() { - GenerationContext ctx = new DefaultGenerationContext(new ClassNameGenerator(Object.class), + GenerationContext ctx = new DefaultGenerationContext(new ClassNameGenerator(ClassName.OBJECT), new InMemoryGeneratedFiles()); new JpaRepositoryConfigExtension.JpaRepositoryRegistrationAotProcessor() From b7df09ce89e82461093641ba2464ca4c6ec8a150 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 11 Oct 2022 11:40:05 +0200 Subject: [PATCH 03/11] Adapt to changed AOT packages in Spring Data Commons. Closes #2661 --- .../jpa/{ => repository}/aot/JpaRuntimeHints.java | 13 ++++++++----- .../config/JpaRepositoryConfigExtension.java | 4 ++-- .../main/resources/META-INF/spring/aot.factories | 2 +- .../aot/JpaRuntimeHintsUnitTests.java | 7 +++++-- ...RepositoryRegistrationAotProcessorUnitTests.java | 2 +- 5 files changed, 17 insertions(+), 11 deletions(-) rename spring-data-jpa/src/main/java/org/springframework/data/jpa/{ => repository}/aot/JpaRuntimeHints.java (88%) rename spring-data-jpa/src/test/java/org/springframework/data/jpa/{ => repository}/aot/JpaRuntimeHintsUnitTests.java (94%) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/aot/JpaRuntimeHints.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java similarity index 88% rename from spring-data-jpa/src/main/java/org/springframework/data/jpa/aot/JpaRuntimeHints.java rename to spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java index a8026d6eb2..0f4a4a7689 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/aot/JpaRuntimeHints.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jpa.aot; +package org.springframework.data.jpa.repository.aot; import java.util.Arrays; @@ -29,10 +29,12 @@ import org.springframework.util.ClassUtils; /** + * Runtime hints for JPA AOT processing. + * * @author Christoph Strobl * @since 3.0 */ -public class JpaRuntimeHints implements RuntimeHintsRegistrar { +class JpaRuntimeHints implements RuntimeHintsRegistrar { @Override public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) { @@ -49,9 +51,10 @@ public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) .withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS)); hints.reflection().registerTypes(Arrays.asList( // - TypeReference.of(AuditingBeanFactoryPostProcessor.class), // - TypeReference.of(AuditingEntityListener.class)), - hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS)); + TypeReference.of(AuditingBeanFactoryPostProcessor.class), // + TypeReference.of(AuditingEntityListener.class)), + hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, + MemberCategory.INVOKE_DECLARED_METHODS)); } hints.reflection().registerType(TypeReference.of(SimpleJpaRepository.class), diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java index e06e6abb0f..4f4317f77d 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java @@ -46,13 +46,13 @@ import org.springframework.core.io.ResourceLoader; import org.springframework.dao.DataAccessException; import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor; -import org.springframework.data.aot.AotRepositoryContext; -import org.springframework.data.aot.RepositoryRegistrationAotProcessor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.support.DefaultJpaContext; import org.springframework.data.jpa.repository.support.EntityManagerBeanDefinitionRegistrarPostProcessor; import org.springframework.data.jpa.repository.support.JpaEvaluationContextExtension; import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; +import org.springframework.data.repository.aot.AotRepositoryContext; +import org.springframework.data.repository.aot.RepositoryRegistrationAotProcessor; import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource; import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport; import org.springframework.data.repository.config.RepositoryConfigurationSource; diff --git a/spring-data-jpa/src/main/resources/META-INF/spring/aot.factories b/spring-data-jpa/src/main/resources/META-INF/spring/aot.factories index 4363dcaeb8..50d5fc795e 100644 --- a/spring-data-jpa/src/main/resources/META-INF/spring/aot.factories +++ b/spring-data-jpa/src/main/resources/META-INF/spring/aot.factories @@ -1,2 +1,2 @@ org.springframework.aot.hint.RuntimeHintsRegistrar=\ - org.springframework.data.jpa.aot.JpaRuntimeHints + org.springframework.data.jpa.repository.aot.JpaRuntimeHints diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/aot/JpaRuntimeHintsUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHintsUnitTests.java similarity index 94% rename from spring-data-jpa/src/test/java/org/springframework/data/jpa/aot/JpaRuntimeHintsUnitTests.java rename to spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHintsUnitTests.java index c992375198..c457ffcf80 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/aot/JpaRuntimeHintsUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHintsUnitTests.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jpa.aot; +package org.springframework.data.jpa.repository.aot; import static org.assertj.core.api.AssertionsForClassTypes.*; -import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.reflection; +import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.*; import org.junit.jupiter.api.Test; + import org.springframework.aot.hint.RuntimeHints; import org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect; import org.springframework.data.jpa.domain.support.AuditingBeanFactoryPostProcessor; @@ -26,6 +27,8 @@ import org.springframework.data.jpa.util.HidingClassLoader; /** + * Unit tests for {@link JpaRuntimeHints}. + * * @author Christoph Strobl */ class JpaRuntimeHintsUnitTests { diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryRegistrationAotProcessorUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryRegistrationAotProcessorUnitTests.java index a267cf4dae..7b2ade3424 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryRegistrationAotProcessorUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryRegistrationAotProcessorUnitTests.java @@ -31,7 +31,7 @@ import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.core.annotation.MergedAnnotation; -import org.springframework.data.aot.AotRepositoryContext; +import org.springframework.data.repository.aot.AotRepositoryContext; import org.springframework.data.repository.core.RepositoryInformation; import org.springframework.javapoet.ClassName; From f30fe3e06cc2705660fdae60ce9add65bce8674c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Oct 2022 17:24:03 +0200 Subject: [PATCH 04/11] Prepare 3.0 RC1 (2022.0.0). See #2638 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5ba0fde025..0604fc8477 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.springframework.data.build spring-data-parent - 3.0.0-SNAPSHOT + 3.0.0-RC1 @@ -35,7 +35,7 @@ 4.3 8.0.23 42.2.19 - 3.0.0-SNAPSHOT + 3.0.0-RC1 0.10.3 org.hibernate @@ -224,8 +224,8 @@ - spring-libs-snapshot - https://repo.spring.io/libs-snapshot + spring-libs-milestone + https://repo.spring.io/libs-milestone From 072cfadc924058de74abd2b2a5dc337790a99111 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Oct 2022 17:24:25 +0200 Subject: [PATCH 05/11] Release version 3.0 RC1 (2022.0.0). See #2638 --- pom.xml | 2 +- spring-data-envers/pom.xml | 4 ++-- spring-data-jpa-distribution/pom.xml | 2 +- spring-data-jpa/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 0604fc8477..7018dad9ad 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-jpa-parent - 3.0.0-SNAPSHOT + 3.0.0-RC1 pom Spring Data JPA Parent diff --git a/spring-data-envers/pom.xml b/spring-data-envers/pom.xml index 540834bb60..a4689278de 100755 --- a/spring-data-envers/pom.xml +++ b/spring-data-envers/pom.xml @@ -5,12 +5,12 @@ org.springframework.data spring-data-envers - 3.0.0-SNAPSHOT + 3.0.0-RC1 org.springframework.data spring-data-jpa-parent - 3.0.0-SNAPSHOT + 3.0.0-RC1 ../pom.xml diff --git a/spring-data-jpa-distribution/pom.xml b/spring-data-jpa-distribution/pom.xml index bba8571672..1e05a48bcf 100644 --- a/spring-data-jpa-distribution/pom.xml +++ b/spring-data-jpa-distribution/pom.xml @@ -14,7 +14,7 @@ org.springframework.data spring-data-jpa-parent - 3.0.0-SNAPSHOT + 3.0.0-RC1 ../pom.xml diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml index 3ad9c39a2a..dddfb42e1a 100644 --- a/spring-data-jpa/pom.xml +++ b/spring-data-jpa/pom.xml @@ -6,7 +6,7 @@ org.springframework.data spring-data-jpa - 3.0.0-SNAPSHOT + 3.0.0-RC1 Spring Data JPA Spring Data module for JPA repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-jpa-parent - 3.0.0-SNAPSHOT + 3.0.0-RC1 ../pom.xml From ad2498be9410a6ff1cf0af530563b1c81671bba5 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Oct 2022 17:31:15 +0200 Subject: [PATCH 06/11] Prepare next development iteration. See #2638 --- pom.xml | 2 +- spring-data-envers/pom.xml | 4 ++-- spring-data-jpa-distribution/pom.xml | 2 +- spring-data-jpa/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 7018dad9ad..0604fc8477 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-jpa-parent - 3.0.0-RC1 + 3.0.0-SNAPSHOT pom Spring Data JPA Parent diff --git a/spring-data-envers/pom.xml b/spring-data-envers/pom.xml index a4689278de..540834bb60 100755 --- a/spring-data-envers/pom.xml +++ b/spring-data-envers/pom.xml @@ -5,12 +5,12 @@ org.springframework.data spring-data-envers - 3.0.0-RC1 + 3.0.0-SNAPSHOT org.springframework.data spring-data-jpa-parent - 3.0.0-RC1 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/spring-data-jpa-distribution/pom.xml b/spring-data-jpa-distribution/pom.xml index 1e05a48bcf..bba8571672 100644 --- a/spring-data-jpa-distribution/pom.xml +++ b/spring-data-jpa-distribution/pom.xml @@ -14,7 +14,7 @@ org.springframework.data spring-data-jpa-parent - 3.0.0-RC1 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml index dddfb42e1a..3ad9c39a2a 100644 --- a/spring-data-jpa/pom.xml +++ b/spring-data-jpa/pom.xml @@ -6,7 +6,7 @@ org.springframework.data spring-data-jpa - 3.0.0-RC1 + 3.0.0-SNAPSHOT Spring Data JPA Spring Data module for JPA repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-jpa-parent - 3.0.0-RC1 + 3.0.0-SNAPSHOT ../pom.xml From dbb45bbe19713779567c9e8b93b6f0c894ad7d6f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Oct 2022 17:31:16 +0200 Subject: [PATCH 07/11] After release cleanups. See #2638 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0604fc8477..5ba0fde025 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.springframework.data.build spring-data-parent - 3.0.0-RC1 + 3.0.0-SNAPSHOT @@ -35,7 +35,7 @@ 4.3 8.0.23 42.2.19 - 3.0.0-RC1 + 3.0.0-SNAPSHOT 0.10.3 org.hibernate @@ -224,8 +224,8 @@ - spring-libs-milestone - https://repo.spring.io/libs-milestone + spring-libs-snapshot + https://repo.spring.io/libs-snapshot From f93fa2dd71e6b5bd519f25a668f07cfc4a235943 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 19 Oct 2022 14:49:59 +0200 Subject: [PATCH 08/11] Add missing reflection hint for `QuerydslJpaPredicateExecutor`. Closes: #2673 Original pull request: #2674 --- .../data/jpa/repository/aot/JpaRuntimeHints.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java index 0f4a4a7689..c06e6f1b5b 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java @@ -24,7 +24,10 @@ import org.springframework.data.jpa.domain.support.AuditingBeanFactoryPostProcessor; import org.springframework.data.jpa.domain.support.AuditingEntityListener; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.support.QuerydslJpaPredicateExecutor; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; +import org.springframework.data.querydsl.QuerydslPredicateExecutor; +import org.springframework.data.querydsl.QuerydslUtils; import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; @@ -62,5 +65,12 @@ public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) // needs to present for evaluating default attribute values in JpaQueryMethod hints.reflection().registerType(Query.class, hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS)); + + if(QuerydslUtils.QUERY_DSL_PRESENT) { + + hints.reflection().registerType(QuerydslJpaPredicateExecutor.class, + hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_METHODS) + .onReachableType(QuerydslPredicateExecutor.class)); + } } } From 6ecdaa07ba17eb7bfc7d7b5fda36725c9eaa3562 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 20 Oct 2022 15:53:27 +0200 Subject: [PATCH 09/11] Polishing. Reformat code. See: #2673 Original pull request: #2674 --- .../data/jpa/repository/aot/JpaRuntimeHints.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java index c06e6f1b5b..65bb6e357e 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java @@ -66,7 +66,7 @@ public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) // needs to present for evaluating default attribute values in JpaQueryMethod hints.reflection().registerType(Query.class, hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS)); - if(QuerydslUtils.QUERY_DSL_PRESENT) { + if (QuerydslUtils.QUERY_DSL_PRESENT) { hints.reflection().registerType(QuerydslJpaPredicateExecutor.class, hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_METHODS) From 96fd5f540cc087a573f2c4268d5e6067d889bd1b Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 20 Oct 2022 17:26:16 +0200 Subject: [PATCH 10/11] Upgrade eclipselink-next profile to Eclipselink 4.0. Fixes #2676. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5ba0fde025..48bec13dc6 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ eclipselink-next - 4.0.0-RC2 + 4.0.0 From 90c4119a3836d4e60111a57a9cd897f993dd6670 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 31 Oct 2022 10:36:32 +0100 Subject: [PATCH 11/11] Update CI properties. See #2675 --- ci/pipeline.properties | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 57e4868d49..1ab126263d 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -1,18 +1,19 @@ # Java versions -java.main.tag=17.0.3_7-jdk +java.main.tag=17.0.4.1_1-jdk-focal # Docker container images - standard docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag} # Supported versions of MongoDB -docker.mongodb.4.4.version=4.4.12 -docker.mongodb.5.0.version=5.0.6 +docker.mongodb.4.4.version=4.4.17 +docker.mongodb.5.0.version=5.0.13 +docker.mongodb.6.0.version=6.0.2 # Supported versions of Redis docker.redis.6.version=6.2.6 # Supported versions of Cassandra -docker.cassandra.3.version=3.11.12 +docker.cassandra.3.version=3.11.14 # Docker environment settings docker.java.inside.basic=-v $HOME:/tmp/jenkins-home