Skip to content

Commit ca989ea

Browse files
beikovbeikov
committed
Update Spring and Hibernate ORM versions
1 parent 5a26cb9 commit ca989ea

File tree

10 files changed

+36
-20
lines changed

10 files changed

+36
-20
lines changed

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if [[ "$JDK" != "" ]]; then
5555
PROPERTIES="$PROPERTIES -Djdk8.home=$JDK8_HOME"
5656
fi
5757

58-
if [[ "$JPAPROVIDER" == hibernate-6* ]]; then
58+
if [[ "$JPAPROVIDER" == hibernate-6* ]] || [[ "$JPAPROVIDER" == hibernate-7* ]]; then
5959
ADDITIONAL_PROFILES=,jakarta
6060
fi
6161

‎core/testsuite-hibernate6/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@
904904
<profile>
905905
<id>hibernate-7.2</id>
906906
<properties>
907-
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70</jpa.excludedGroups>
907+
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate72</jpa.excludedGroups>
908908
</properties>
909909
<dependencies>
910910
<dependency>

‎core/testsuite-jakarta-runner/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@
843843
<id>hibernate-7.2</id>
844844
<properties>
845845
<jpa-api-version>${version.jakarta-jpa-3.2-api}</jpa-api-version>
846-
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70</jpa.excludedGroups>
846+
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate72</jpa.excludedGroups>
847847
</properties>
848848
<dependencies>
849849
<dependency>

‎core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateDiffTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
package com.blazebit.persistence.testsuite;
77

88
import com.blazebit.persistence.CriteriaBuilder;
9+
import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate72;
910
import com.blazebit.persistence.testsuite.entity.Document;
1011
import com.blazebit.persistence.testsuite.entity.Person;
1112
import com.blazebit.persistence.testsuite.entity.Version;
1213
import com.blazebit.persistence.testsuite.tx.TxVoidWork;
1314
import org.junit.AfterClass;
1415
import org.junit.Before;
1516
import org.junit.Test;
17+
import org.junit.experimental.categories.Category;
1618

1719
import javax.persistence.EntityManager;
1820
import javax.persistence.TemporalType;
@@ -299,7 +301,9 @@ public void testTimestampWithDateDiff() {
299301
assertEquals(quartersBetween (c1, l1), actual.get(17));
300302
}
301303

304+
// Doesn't work on ORM 7.2 anymore: https://hibernate.atlassian.net/browse/HHH-20021
302305
@Test
306+
@Category(NoHibernate72.class)
303307
public void testTimestampWithParameterDiff() {
304308
CriteriaBuilder<Tuple> criteria = cbf.create(em, Tuple.class)
305309
.from(Document.class, "doc")
@@ -366,7 +370,9 @@ public void testTimestampWithParameterDiff() {
366370
assertEquals(quartersBetween (l2, l1), actual.get(24));
367371
}
368372

373+
// Doesn't work on ORM 7.2 anymore: https://hibernate.atlassian.net/browse/HHH-20021
369374
@Test
375+
@Category(NoHibernate72.class)
370376
public void testDateWithParameterDiff() {
371377
CriteriaBuilder<Tuple> criteria = cbf.create(em, Tuple.class)
372378
.from(Document.class, "doc")

‎entity-view/testsuite-jakarta-runner/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@
855855
<id>hibernate-7.2</id>
856856
<properties>
857857
<jpa-api-version>${version.jakarta-jpa-3.2-api}</jpa-api-version>
858-
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70</jpa.excludedGroups>
858+
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate72</jpa.excludedGroups>
859859
</properties>
860860
<dependencies>
861861
<dependency>

‎integration/quarkus-3/deployment/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@
899899
<id>hibernate-7.2</id>
900900
<!-- Note that Quarkus doesn't support Hibernate ORM 7.2 yet, so we test against 7.1 -->
901901
<properties>
902-
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70</jpa.excludedGroups>
902+
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate72</jpa.excludedGroups>
903903
<hibernate.integration-base>7</hibernate.integration-base>
904904
<hibernate.integration-version>7.1</hibernate.integration-version>
905905
</properties>

‎integration/spring-data/4.0/src/main/java/com/blazebit/persistence/spring/data/impl/repository/BlazePersistenceRepositoryFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ protected void validate(RepositoryMetadata repositoryMetadata) {
255255

256256
@Override
257257
protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
258-
if (repositoryBaseClass != EntityViewAwareRepositoryImpl.class) {
258+
if (repositoryBaseClass != null && repositoryBaseClass != EntityViewAwareRepositoryImpl.class) {
259259
return repositoryBaseClass;
260260
}
261261
ExtendedManagedType<?> managedType = cbf.getService(EntityMetamodel.class).getManagedType(ExtendedManagedType.class, metadata.getDomainType());

‎jpa-criteria/testsuite-jakarta-runner/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@
485485
<id>hibernate-7.2</id>
486486
<properties>
487487
<jpa-api-version>${version.jakarta-jpa-3.2-api}</jpa-api-version>
488-
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70</jpa.excludedGroups>
488+
<jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate72</jpa.excludedGroups>
489489
</properties>
490490
<dependencies>
491491
<dependency>

‎parent/pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
<version.hibernate-5.4>5.4.10.Final</version.hibernate-5.4>
6464
<version.hibernate-5.5>5.5.0.Final</version.hibernate-5.5>
6565
<version.hibernate-5.6>5.6.10.Final</version.hibernate-5.6>
66-
<version.hibernate-6.2>6.2.48.Final</version.hibernate-6.2>
66+
<version.hibernate-6.2>6.2.49.Final</version.hibernate-6.2>
6767
<version.hibernate-6.3>6.3.1.Final</version.hibernate-6.3>
6868
<version.hibernate-6.4>6.4.10.Final</version.hibernate-6.4>
6969
<version.hibernate-6.5>6.5.2.Final</version.hibernate-6.5>
70-
<version.hibernate-6.6>6.6.35.Final</version.hibernate-6.6>
71-
<version.hibernate-7.1>7.1.7.Final</version.hibernate-7.1>
72-
<version.hibernate-7.2>7.2.0.CR2</version.hibernate-7.2>
70+
<version.hibernate-6.6>6.6.40.Final</version.hibernate-6.6>
71+
<version.hibernate-7.1>7.1.13.Final</version.hibernate-7.1>
72+
<version.hibernate-7.2>7.2.0.Final</version.hibernate-7.2>
7373

7474
<version.datanucleus.base-4>4.1.17</version.datanucleus.base-4>
7575
<version.datanucleus.rdbms-4>4.1.19</version.datanucleus.rdbms-4>
@@ -129,15 +129,15 @@
129129
<version.spring-data-3.3>3.3.2</version.spring-data-3.3>
130130
<version.spring-data-3.3-spring>6.1.8</version.spring-data-3.3-spring>
131131
<version.spring-data-3.3-spring-boot>3.3.2</version.spring-data-3.3-spring-boot>
132-
<version.spring-data-3.4>3.4.12</version.spring-data-3.4>
133-
<version.spring-data-3.4-spring>6.2.13</version.spring-data-3.4-spring>
134-
<version.spring-data-3.4-spring-boot>3.4.11</version.spring-data-3.4-spring-boot>
135-
<version.spring-data-3.5>3.5.6</version.spring-data-3.5>
136-
<version.spring-data-3.5-spring>6.2.13</version.spring-data-3.5-spring>
137-
<version.spring-data-3.5-spring-boot>3.5.7</version.spring-data-3.5-spring-boot>
138-
<version.spring-data-4.0>4.0.0</version.spring-data-4.0>
139-
<version.spring-data-4.0-spring>7.0.0</version.spring-data-4.0-spring>
140-
<version.spring-data-4.0-spring-boot>4.0.0-RC2</version.spring-data-4.0-spring-boot>
132+
<version.spring-data-3.4>3.4.13</version.spring-data-3.4>
133+
<version.spring-data-3.4-spring>6.2.15</version.spring-data-3.4-spring>
134+
<version.spring-data-3.4-spring-boot>3.4.13</version.spring-data-3.4-spring-boot>
135+
<version.spring-data-3.5>3.5.7</version.spring-data-3.5>
136+
<version.spring-data-3.5-spring>6.2.15</version.spring-data-3.5-spring>
137+
<version.spring-data-3.5-spring-boot>3.5.9</version.spring-data-3.5-spring-boot>
138+
<version.spring-data-4.0>4.0.1</version.spring-data-4.0>
139+
<version.spring-data-4.0-spring>7.0.2</version.spring-data-4.0-spring>
140+
<version.spring-data-4.0-spring-boot>4.0.1</version.spring-data-4.0-spring-boot>
141141
<version.openejb>4.7.5</version.openejb>
142142
<version.openejb.javaee-api>6.0-6</version.openejb.javaee-api>
143143

‎testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate72.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
* Copyright Blazebit
4+
*/
5+
6+
package com.blazebit.persistence.testsuite.base.jpa.category;
7+
8+
public interface NoHibernate72 {
9+
10+
}

0 commit comments

Comments
 (0)