From 6a20dcb8c76b74e2b11bb93bc39f0fb7d14646f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Aug 2024 22:43:07 +0000
Subject: [PATCH 1/2] 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] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.
       <dependency>
         <groupId>org.apache.pdfbox</groupId>
         <artifactId>pdfbox</artifactId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
         <exclusions>
           <exclusion>
             <groupId>commons-logging</groupId>

From 79fc891dda593b8c5f6445ae764fc229c30a89d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <ilgrosso@apache.org>
Date: Sat, 10 Aug 2024 08:33:46 +0200
Subject: [PATCH 2/2] Fixing previous Elasticsearch upgrade

---
 .../elasticsearch/dao/ElasticsearchAuditEventDAO.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 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());
         }