From 8f28a9ef2c9362df2ea0fc337575b23987d901ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 09:39:17 +0200 Subject: [PATCH] Bump org.apache.pdfbox:pdfbox from 3.0.2 to 3.0.3 (#813) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump org.apache.pdfbox:pdfbox from 3.0.2 to 3.0.3 Bumps org.apache.pdfbox:pdfbox from 3.0.2 to 3.0.3. --- updated-dependencies: - dependency-name: org.apache.pdfbox:pdfbox dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Fixing previous Elasticsearch upgrade --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Francesco Chicchiriccò --- .../elasticsearch/dao/ElasticsearchAuditEventDAO.java | 9 +++++---- pom.xml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) 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 7aae45a866..43404adceb 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 @@ -30,6 +30,7 @@ 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 +111,16 @@ protected Query getQuery( build()); if (before != null) { - queries.add(new Query.Builder().range(RangeQuery.of(r -> r.number(n -> n. + queries.add(new Query.Builder().range(RangeQuery.of(r -> r.untyped(n -> n. field("when"). - lte((Double.valueOf(before.toInstant().toEpochMilli())))))). + lte(JsonData.of(before.toInstant().toEpochMilli()))))). build()); } if (after != null) { - queries.add(new Query.Builder().range(RangeQuery.of(r -> r.number(n -> n. + queries.add(new Query.Builder().range(RangeQuery.of(r -> r.untyped(n -> n. field("when"). - gte((Double.valueOf(after.toInstant().toEpochMilli())))))). + gte(JsonData.of(after.toInstant().toEpochMilli()))))). build()); } diff --git a/pom.xml b/pom.xml index 5a44f392af..60fb2a4736 100644 --- a/pom.xml +++ b/pom.xml @@ -1130,7 +1130,7 @@ under the License. org.apache.pdfbox pdfbox - 3.0.2 + 3.0.3 commons-logging