Bump junit:junit from 4.12 to 4.13.1 in /jooq/jooq-core

core/pom.xml

@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-7.1</artifactId>
             <version>${blaze-persistence.version}</version>
         </dependency>
 
@@ -88,13 +88,12 @@
             </plugin>
 
             <plugin>
-                <groupId>org.hibernate.orm.tooling</groupId>
-                <artifactId>hibernate-enhance-maven-plugin</artifactId>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
                 <version>${hibernate.version}</version>
                 <executions>
                     <execution>
                         <configuration>
-                            <failOnError>true</failOnError>
                             <enableLazyInitialization>false</enableLazyInitialization>
                             <enableDirtyTracking>false</enableDirtyTracking>
                             <enableAssociationManagement>false</enableAssociationManagement>

core/src/main/java/com/vladmihalcea/hpjp/hibernate/forum/Post.java

@@ -1,8 +1,5 @@
 package com.vladmihalcea.hpjp.hibernate.forum;
 
-import org.hibernate.annotations.LazyToOne;
-import org.hibernate.annotations.LazyToOneOption;
-
 import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +28,6 @@ public class Post {
         cascade = CascadeType.ALL,
         fetch = FetchType.LAZY
     )
-    @LazyToOne(LazyToOneOption.NO_PROXY)
     private PostDetails details;
 
     @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})

core/src/test/java/com/vladmihalcea/hpjp/hibernate/access/property/FluentApiPropertyAccessTest.java

@@ -1,7 +1,7 @@
 package com.vladmihalcea.hpjp.hibernate.access.property;
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 import java.sql.Timestamp;
@@ -11,7 +11,7 @@
 import java.util.Date;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/AllAssociationTest.java

@@ -2,13 +2,13 @@
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
 import jakarta.persistence.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalManyToManyExtraColumnsTest.java

@@ -26,7 +26,7 @@
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.annotations.NaturalIdCache;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
 

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalManyToManyLinkEntityEmbeddableTest.java

@@ -25,7 +25,7 @@
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.annotations.NaturalIdCache;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
 

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalManyToManyLinkEntityIdColumnsTest.java

@@ -1,9 +1,9 @@
 package com.vladmihalcea.hpjp.hibernate.association;
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
-import org.junit.Test;
-
 import jakarta.persistence.*;
+import org.junit.jupiter.api.Test;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -53,45 +53,6 @@ public void testLifecycle() {
         });
     }
 
-    @Test
-    public void testShuffle() {
-        final Long postId = doInJPA(entityManager -> {
-            Post post1 = new Post("JPA with Hibernate");
-            Post post2 = new Post("Native Hibernate");
-
-            Tag tag1 = new Tag("Java");
-            tag1.setId(1L);
-            Tag tag2 = new Tag("Hibernate");
-            tag2.setId(2L);
-
-            entityManager.persist(post1);
-            entityManager.persist(post2);
-
-            entityManager.persist(tag1);
-            entityManager.persist(tag2);
-
-            post1.addTag(tag1);
-            post1.addTag(tag2);
-
-            post2.addTag(tag1);
-
-            entityManager.flush();
-
-            return post1.getId();
-        });
-        doInJPA(entityManager -> {
-            LOGGER.info("Shuffle");
-            Post post1 = entityManager.find(Post.class, postId);
-            Tag tag1 = entityManager.find(Tag.class, 1L);
-
-            PostTag postTag = entityManager.find(PostTag.class, new PostTag(post1, tag1));
-
-            post1.getTags().sort((postTag1, postTag2) ->
-                postTag2.getTag().getId().compareTo(postTag1.getTag().getId())
-            );
-        });
-    }
-
     @Entity(name = "Post")
     public static class Post {
 

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalManyToManyLinkEntityMapKeyJoinColumnTest.java

@@ -22,7 +22,7 @@
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.annotations.NaturalIdCache;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
 import java.util.HashMap;

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalManyToManyLinkEntityOrderColumnTest.java

@@ -1,7 +1,7 @@
 package com.vladmihalcea.hpjp.hibernate.association;
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 import java.io.Serializable;

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalManyToManyLinkEntityTest.java

@@ -4,7 +4,7 @@
 import com.vladmihalcea.hpjp.util.providers.Database;
 import org.hibernate.Session;
 import org.hibernate.annotations.NaturalId;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 import java.io.Serializable;

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalManyToManyListTest.java

@@ -2,11 +2,11 @@
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
 import com.vladmihalcea.hpjp.util.providers.Database;
+import jakarta.persistence.*;
 import org.hibernate.annotations.NaturalId;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -80,7 +80,7 @@ public void testRemovePost() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testRemoveTag() {
         final Long tagId = doInJPA(entityManager -> {
             Post post1 = new Post("JPA with Hibernate");

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalManyToManyOrderColumnTest.java

@@ -1,7 +1,7 @@
 package com.vladmihalcea.hpjp.hibernate.association;
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 import java.util.*;

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalManyToManySetTest.java

@@ -4,7 +4,7 @@
 import com.vladmihalcea.hpjp.util.providers.Database;
 import org.hibernate.Session;
 import org.hibernate.annotations.NaturalId;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 import java.util.HashSet;

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalManyToManyTest.java

@@ -1,7 +1,7 @@
 package com.vladmihalcea.hpjp.hibernate.association;
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 import java.util.*;

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalOneToManyJoinColumnTest.java

@@ -1,7 +1,7 @@
 package com.vladmihalcea.hpjp.hibernate.association;
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 import java.util.ArrayList;

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalOneToManyMergeTest.java

@@ -3,13 +3,13 @@
 import com.vladmihalcea.hpjp.util.AbstractTest;
 import jakarta.persistence.*;
 import org.hibernate.jpa.AvailableHints;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea
@@ -45,7 +45,7 @@ protected void afterInit() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testCollectionOverwrite() {
         List<PostComment> comments = fetchPostComments(1L);
 

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalOneToManyOrphanRemovalWithoutCascadeTest.java

@@ -2,13 +2,13 @@
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
 import net.ttddyy.dsproxy.QueryCountHolder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalOneToManySetTest.java

@@ -3,14 +3,14 @@
 import com.vladmihalcea.hpjp.util.AbstractTest;
 import jakarta.persistence.*;
 import net.ttddyy.dsproxy.QueryCountHolder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalOneToManyTest.java

@@ -2,13 +2,13 @@
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
 import net.ttddyy.dsproxy.QueryCountHolder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalOneToManyUniquenessTest.java

@@ -1,15 +1,15 @@
 package com.vladmihalcea.hpjp.hibernate.association;
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalOneToOneMapsIdStringTest.java

@@ -1,7 +1,7 @@
 package com.vladmihalcea.hpjp.hibernate.association;
 
 import com.vladmihalcea.hpjp.util.AbstractTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalOneToOneMapsIdTest.java

@@ -2,14 +2,14 @@
 
 import com.vladmihalcea.hpjp.hibernate.logging.validator.sql.SQLStatementCountValidator;
 import com.vladmihalcea.hpjp.util.AbstractTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author Vlad Mihalcea

core/src/test/java/com/vladmihalcea/hpjp/hibernate/association/BidirectionalOneToOneNPlusOneBytecodeEnhancementTest.java

@@ -1,22 +1,21 @@
 package com.vladmihalcea.hpjp.hibernate.association;
 
 import com.vladmihalcea.hpjp.hibernate.logging.validator.sql.SQLStatementCountValidator;
-import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
 import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea
  */
-@RunWith(BytecodeEnhancerRunner.class)
 @EnhancementOptions(
     lazyLoading = true
 )
+@BytecodeEnhanced
 public class BidirectionalOneToOneNPlusOneBytecodeEnhancementTest extends BidirectionalOneToOneNPlusOneTest {
 
     @Test