This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 4_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 0b34b1bbfb3f9e9c9e2cd3b7e6d840524e9ac637 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Wed May 27 12:55:37 2026 +0200 Fixing Docker WA image --- .../syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java | 10 +++------- docker/wa/pom.xml | 7 +++++++ 2 files changed, 10 insertions(+), 7 deletions(-) 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..75576dd5c5 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 class Neo4jTaskDAO extends AbstractDAO implements TaskDAO { 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(); @@ -294,8 +291,7 @@ public class Neo4jTaskDAO extends AbstractDAO implements TaskDAO { query.append("(n)-[:").append(execRelationship(type)).append("]-() "); } - query.append("RETURN n.id "). - append(toOrderByStatement(taskUtils.getTaskEntity(), pageable.getSort().get())); + query.append("RETURN n.id ").append(toOrderByStatement(pageable.getSort().get())); if (pageable.isPaged()) { query.append(" SKIP ").append(pageable.getPageSize() * pageable.getPageNumber()). @@ -467,7 +463,7 @@ public class Neo4jTaskDAO extends AbstractDAO implements TaskDAO { 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/docker/wa/pom.xml b/docker/wa/pom.xml index 24553951cb..255087ad4d 100644 --- a/docker/wa/pom.xml +++ b/docker/wa/pom.xml @@ -35,6 +35,13 @@ under the License. <dependencyManagement> <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>${spring-boot.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> <dependency> <groupId>org.apereo.cas</groupId> <artifactId>cas-server-support-bom</artifactId>
