From f287ccd5a5cdf5920a5de97bbf78b8111006fc17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 May 2026 02:31:42 +0000
Subject: [PATCH 1/2] Bump hibernate.version from 7.3.6.Final to 7.4.0.Final

Bumps `hibernate.version` from 7.3.6.Final to 7.4.0.Final.

Updates `org.hibernate.orm:hibernate-core` from 7.3.6.Final to 7.4.0.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.0/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/7.3.6...7.4.0)

Updates `org.hibernate.orm:hibernate-jcache` from 7.3.6.Final to 7.4.0.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.0/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/7.3.6...7.4.0)

Updates `org.hibernate.orm:hibernate-maven-plugin` from 7.3.6.Final to 7.4.0.Final
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.0/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/7.3.6...7.4.0)

---
updated-dependencies:
- dependency-name: org.hibernate.orm:hibernate-core
  dependency-version: 7.4.0.Final
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.hibernate.orm:hibernate-jcache
  dependency-version: 7.4.0.Final
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.hibernate.orm:hibernate-maven-plugin
  dependency-version: 7.4.0.Final
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 86fdb1f4f9..2cbedc30b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -438,7 +438,7 @@ under the License.
     <spring-boot.version>4.0.6</spring-boot.version>
     <spring-cloud-version>5.0.1</spring-cloud-version>
 
-    <hibernate.version>7.3.6.Final</hibernate.version>
+    <hibernate.version>7.4.0.Final</hibernate.version>
 
     <jasypt.version>1.9.3</jasypt.version>
 

From ffddb86d6e5dc7eed274db4ac3f765f6683bc951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <ilgrosso@apache.org>
Date: Wed, 27 May 2026 08:27:10 +0200
Subject: [PATCH 2/2] Adjusting hibernate-maven-plugin configuration

---
 core/persistence-jpa/pom.xml                             | 2 +-
 .../syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java | 9 +++------
 pom.xml                                                  | 7 +++++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/persistence-jpa/pom.xml b/core/persistence-jpa/pom.xml
index 2ed47a6d3c..2e6877f604 100644
--- a/core/persistence-jpa/pom.xml
+++ b/core/persistence-jpa/pom.xml
@@ -143,7 +143,7 @@ under the License.
             <groupId>org.apache.syncope.core</groupId>
             <artifactId>syncope-core-persistence-common</artifactId>
             <version>${project.version}</version>
-          </dependency>          
+          </dependency>
         </dependencies>
         <executions>
           <execution>
diff --git a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java
index 97d6195d11..9cad80cc17 100644
--- a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java
+++ b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java
@@ -245,10 +245,7 @@ public long countToExec(final TaskType type) {
         return neo4jTemplate.count(query.toString());
     }
 
-    protected String toOrderByStatement(
-            final Class<? extends Task<?>> beanClass,
-            final Stream<Sort.Order> orderByClauses) {
-
+    protected String toOrderByStatement(final Stream<Sort.Order> orderByClauses) {
         StringBuilder subStatement = new StringBuilder();
         orderByClauses.forEach(clause -> {
             String field = clause.getProperty().trim();
@@ -295,7 +292,7 @@ public <T extends Task<T>> List<T> findToExec(final TaskType type, final Pageabl
         }
 
         query.append("RETURN n.id ").
-                append(toOrderByStatement(taskUtils.getTaskEntity(), pageable.getSort().get()));
+                append(toOrderByStatement(pageable.getSort().get()));
 
         if (pageable.isPaged()) {
             query.append(" SKIP ").append(pageable.getPageSize() * pageable.getPageNumber()).
@@ -467,7 +464,7 @@ public <T extends Task<T>> List<T> findAll(
 
         query.append(" WITH n ");
 
-        query.append(toOrderByStatement(taskUtils.getTaskEntity(), pageable.getSort().get()));
+        query.append(toOrderByStatement(pageable.getSort().get()));
 
         if (pageable.isPaged()) {
             query.append(" SKIP ").append(pageable.getPageSize() * pageable.getPageNumber()).
diff --git a/pom.xml b/pom.xml
index 2cbedc30b2..df441f17d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1649,6 +1649,13 @@ under the License.
           <groupId>org.hibernate.orm</groupId>
           <artifactId>hibernate-maven-plugin</artifactId>
           <version>${hibernate.version}</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.codehaus.plexus</groupId>
+              <artifactId>plexus-utils</artifactId>
+              <version>4.0.3</version>
+            </dependency>
+          </dependencies>         
         </plugin>
 
         <plugin>