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
commit 51ed0070a21d44193de60adb245a57285fe205aa Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Wed Jun 10 10:07:40 2026 +0200 Upgrading OpenSearch --- ext/opensearch/client-opensearch/pom.xml | 10 ---------- .../ext/opensearch/client/OpenSearchClientFactoryBean.java | 8 +++----- pom.xml | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/ext/opensearch/client-opensearch/pom.xml b/ext/opensearch/client-opensearch/pom.xml index 7677d742c0..2a907a7be2 100644 --- a/ext/opensearch/client-opensearch/pom.xml +++ b/ext/opensearch/client-opensearch/pom.xml @@ -53,16 +53,6 @@ under the License. <artifactId>opensearch-java</artifactId> </dependency> - <!-- Required until https://github.com/opensearch-project/opensearch-java/issues/1810 --> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </dependency> - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-health</artifactId> diff --git a/ext/opensearch/client-opensearch/src/main/java/org/apache/syncope/ext/opensearch/client/OpenSearchClientFactoryBean.java b/ext/opensearch/client-opensearch/src/main/java/org/apache/syncope/ext/opensearch/client/OpenSearchClientFactoryBean.java index d21cbe0f05..9a43eebb4c 100644 --- a/ext/opensearch/client-opensearch/src/main/java/org/apache/syncope/ext/opensearch/client/OpenSearchClientFactoryBean.java +++ b/ext/opensearch/client-opensearch/src/main/java/org/apache/syncope/ext/opensearch/client/OpenSearchClientFactoryBean.java @@ -18,8 +18,6 @@ */ package org.apache.syncope.ext.opensearch.client; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.json.JsonMapper; import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.List; @@ -27,12 +25,13 @@ import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.message.BasicHeader; -import org.opensearch.client.json.jackson.JacksonJsonpMapper; +import org.opensearch.client.json.jackson3.JacksonJsonpMapper; import org.opensearch.client.opensearch.OpenSearchClient; import org.opensearch.client.transport.httpclient5.ApacheHttpClient5Transport; import org.opensearch.client.transport.httpclient5.ApacheHttpClient5TransportBuilder; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; +import tools.jackson.databind.json.JsonMapper; /** * Spring {@link FactoryBean} for getting the {@link OpenSearchClient} singleton instance. @@ -97,8 +96,7 @@ public class OpenSearchClientFactoryBean implements FactoryBean<OpenSearchClient if (client == null) { ApacheHttpClient5TransportBuilder builder = ApacheHttpClient5TransportBuilder. builder(hosts.toArray(HttpHost[]::new)). - setMapper(new JacksonJsonpMapper(JsonMapper.builder(). - findAndAddModules().disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS).build())); + setMapper(new JacksonJsonpMapper(JsonMapper.builder().findAndAddModules().build())); if (username != null && password != null) { String encodedAuth = Base64.getEncoder(). encodeToString((username + ":" + password).getBytes(StandardCharsets.UTF_8)); diff --git a/pom.xml b/pom.xml index 1a14f0caf8..5e655ddeff 100644 --- a/pom.xml +++ b/pom.xml @@ -452,7 +452,7 @@ under the License. <disruptor.version>4.0.0</disruptor.version> <elasticsearch.version>9.4.2</elasticsearch.version> - <opensearch.version>3.6.0</opensearch.version> + <opensearch.version>3.7.0</opensearch.version> <opensearch-java.version>3.9.0</opensearch-java.version> <openfga.version>v1</openfga.version>
