This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 5f91451418 Upgrading CAS and various other dependencies
5f91451418 is described below
commit 5f9145141888e6bbe725e9b037320091dff4075d
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Fri Aug 9 14:04:31 2024 +0200
Upgrading CAS and various other dependencies
---
.../dao/ElasticsearchAnySearchDAO.java | 21 +++++++++++++--------
.../dao/ElasticsearchAuditEventDAO.java | 14 +++++++-------
.../dao/ElasticsearchRealmSearchDAO.java | 4 ++--
pom.xml | 18 +++++++++---------
4 files changed, 31 insertions(+), 26 deletions(-)
diff --git
a/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAnySearchDAO.java
b/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAnySearchDAO.java
index afbbae98c3..bd8e1ff76a 100644
---
a/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAnySearchDAO.java
+++
b/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAnySearchDAO.java
@@ -28,6 +28,7 @@ import
co.elastic.clients.elasticsearch._types.query_dsl.BoolQuery;
import co.elastic.clients.elasticsearch._types.query_dsl.DisMaxQuery;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
+import co.elastic.clients.elasticsearch._types.query_dsl.RangeQuery;
import co.elastic.clients.elasticsearch.core.CountRequest;
import co.elastic.clients.elasticsearch.core.SearchRequest;
import co.elastic.clients.elasticsearch.core.search.Hit;
@@ -576,26 +577,30 @@ public class ElasticsearchAnySearchDAO extends
AbstractAnySearchDAO {
break;
case GE:
- query = new Query.Builder().range(QueryBuilders.range().
-
field(schema.getKey()).gte(JsonData.of(value)).build()).
+ query = new Query.Builder().range(RangeQuery.of(r ->
r.untyped(n -> n.
+ field(schema.getKey()).
+ gte(JsonData.of(value))))).
build();
break;
case GT:
- query = new Query.Builder().range(QueryBuilders.range().
- field(schema.getKey()).gt(JsonData.of(value)).build()).
+ query = new Query.Builder().range(RangeQuery.of(r ->
r.untyped(n -> n.
+ field(schema.getKey()).
+ gt(JsonData.of(value))))).
build();
break;
case LE:
- query = new Query.Builder().range(QueryBuilders.range().
-
field(schema.getKey()).lte(JsonData.of(value)).build()).
+ query = new Query.Builder().range(RangeQuery.of(r ->
r.untyped(n -> n.
+ field(schema.getKey()).
+ lte(JsonData.of(value))))).
build();
break;
case LT:
- query = new Query.Builder().range(QueryBuilders.range().
- field(schema.getKey()).lt(JsonData.of(value)).build()).
+ query = new Query.Builder().range(RangeQuery.of(r ->
r.untyped(n -> n.
+ field(schema.getKey()).
+ lt(JsonData.of(value))))).
build();
break;
diff --git
a/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAuditEventDAO.java
b/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAuditEventDAO.java
index 6e463e0190..7aae45a866 100644
---
a/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAuditEventDAO.java
+++
b/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchAuditEventDAO.java
@@ -25,11 +25,11 @@ import co.elastic.clients.elasticsearch._types.SortOptions;
import co.elastic.clients.elasticsearch._types.SortOrder;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
+import co.elastic.clients.elasticsearch._types.query_dsl.RangeQuery;
import co.elastic.clients.elasticsearch._types.query_dsl.TextQueryType;
import co.elastic.clients.elasticsearch.core.CountRequest;
import co.elastic.clients.elasticsearch.core.SearchRequest;
import co.elastic.clients.elasticsearch.core.search.Hit;
-import co.elastic.clients.json.JsonData;
import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
import java.time.OffsetDateTime;
@@ -110,16 +110,16 @@ public class ElasticsearchAuditEventDAO implements
AuditEventDAO {
build());
if (before != null) {
- queries.add(new Query.Builder().
- range(QueryBuilders.range().
-
field("when").lte(JsonData.of(before.toInstant().toEpochMilli())).build()).
+ queries.add(new Query.Builder().range(RangeQuery.of(r ->
r.number(n -> n.
+ field("when").
+
lte((Double.valueOf(before.toInstant().toEpochMilli())))))).
build());
}
if (after != null) {
- queries.add(new Query.Builder().
- range(QueryBuilders.range().
-
field("when").gte(JsonData.of(after.toInstant().toEpochMilli())).build()).
+ queries.add(new Query.Builder().range(RangeQuery.of(r ->
r.number(n -> n.
+ field("when").
+ gte((Double.valueOf(after.toInstant().toEpochMilli())))))).
build());
}
diff --git
a/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchRealmSearchDAO.java
b/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchRealmSearchDAO.java
index 11b9284bad..2155d6dc67 100644
---
a/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchRealmSearchDAO.java
+++
b/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchRealmSearchDAO.java
@@ -51,8 +51,8 @@ public class ElasticsearchRealmSearchDAO implements
RealmSearchDAO {
protected static final List<SortOptions> REALM_SORT_OPTIONS = List.of(
new SortOptions.Builder().
script(s -> s.type(ScriptSortType.Number).
- script(t -> t.inline(i -> i.lang(ScriptLanguage.Painless).
- source("doc['fullPath'].value.chars().filter(ch -> ch ==
'/').count()"))).
+ script(t -> t.lang(ScriptLanguage.Painless).
+ source("doc['fullPath'].value.chars().filter(ch -> ch ==
'/').count()")).
order(SortOrder.Asc)).
build());
diff --git a/pom.xml b/pom.xml
index 6f327b6673..5a44f392af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -427,17 +427,17 @@ under the License.
<disruptor.version>3.4.4</disruptor.version>
- <elasticsearch.version>8.14.3</elasticsearch.version>
- <opensearch.version>2.15.0</opensearch.version>
+ <elasticsearch.version>8.15.0</elasticsearch.version>
+ <opensearch.version>2.16.0</opensearch.version>
<opensearch-java.version>2.12.0</opensearch-java.version>
- <commons-lang3.version>3.15.0</commons-lang3.version>
+ <commons-lang3.version>3.16.0</commons-lang3.version>
<commons-jexl.version>3.4.0</commons-jexl.version>
<commons-text.version>1.12.0</commons-text.version>
<pac4j.version>6.0.5</pac4j.version>
- <cas.version>7.1.0-RC5</cas.version>
+ <cas.version>7.1.0-RC6</cas.version>
<cas-client.version>4.0.4</cas-client.version>
<h2.version>2.3.230</h2.version>
@@ -464,7 +464,7 @@ under the License.
<wicket-jquery-selectors.version>4.0.4</wicket-jquery-selectors.version>
<wicket-spring-boot.version>4.0.0</wicket-spring-boot.version>
- <antlr4.version>4.13.1</antlr4.version>
+ <antlr4.version>4.13.2</antlr4.version>
<curator.version>5.7.0</curator.version>
<zookeeper.version>3.9.2</zookeeper.version>
@@ -493,7 +493,7 @@ under the License.
<cargo.rmi.port>9805</cargo.rmi.port>
<cargo.deployable.ping.timeout>60000</cargo.deployable.ping.timeout>
- <tomcat.version>10.1.26</tomcat.version>
+ <tomcat.version>10.1.28</tomcat.version>
<wildfly.version>33.0.0.Final</wildfly.version>
<payara.version>6.2024.7</payara.version>
<jakarta.faces.version>4.1.1</jakarta.faces.version>
@@ -1662,7 +1662,7 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
</plugin>
<plugin>
@@ -2038,7 +2038,7 @@ under the License.
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
- <version>2.8.0</version>
+ <version>2.8.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -2117,7 +2117,7 @@ under the License.
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
- <version>2.3.17</version>
+ <version>2.3.18</version>
</dependency>
</dependencies>
<configuration>
