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 12c3a6a8a327de733a40c997b2c11c1ccf2b72db
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Aug 20 08:08:00 2025 +0200
Upgrading OpenSearch and modernizer-maven-plugin
---
.../resources/docker-compose/docker-compose-mariadb.yml | 2 +-
.../core/flowable/impl/FlowableBpmnProcessManager.java | 3 +--
.../org/apache/syncope/core/logic/init/FlowableLoader.java | 3 +--
.../java/org/apache/syncope/fit/core/PullTaskITCase.java | 14 +++++++-------
pom.xml | 6 +++---
5 files changed, 13 insertions(+), 15 deletions(-)
diff --git
a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
index 17447baf60..037afcef3c 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
@@ -19,7 +19,7 @@
services:
db:
- image: mariadb:11
+ image: mariadb:12
restart: always
environment:
MYSQL_ROOT_PASSWORD: password
diff --git
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableBpmnProcessManager.java
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableBpmnProcessManager.java
index 770d1e58bd..166a1f29a9 100644
---
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableBpmnProcessManager.java
+++
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableBpmnProcessManager.java
@@ -25,7 +25,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.to.BpmnProcess;
import org.apache.syncope.common.lib.types.BpmnProcessFormat;
import org.apache.syncope.core.flowable.api.BpmnProcessManager;
@@ -115,7 +114,7 @@ public class FlowableBpmnProcessManager implements
BpmnProcessManager {
protected void exportProcessResource(final String deploymentId, final
String resourceName, final OutputStream os) {
try (InputStream procDefIS =
engine.getRepositoryService().getResourceAsStream(deploymentId, resourceName)) {
- IOUtils.copy(procDefIS, os);
+ procDefIS.transferTo(os);
} catch (IOException e) {
LOG.error("While exporting {}", resourceName, e);
}
diff --git
a/ext/flowable/logic/src/main/java/org/apache/syncope/core/logic/init/FlowableLoader.java
b/ext/flowable/logic/src/main/java/org/apache/syncope/core/logic/init/FlowableLoader.java
index 3e741d47eb..83376a3a1c 100644
---
a/ext/flowable/logic/src/main/java/org/apache/syncope/core/logic/init/FlowableLoader.java
+++
b/ext/flowable/logic/src/main/java/org/apache/syncope/core/logic/init/FlowableLoader.java
@@ -22,7 +22,6 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.types.EntitlementsHolder;
import org.apache.syncope.common.lib.types.FlowableEntitlement;
import org.apache.syncope.core.flowable.impl.FlowableDeployUtils;
@@ -64,7 +63,7 @@ public class FlowableLoader implements SyncopeCoreLoader {
byte[] wfDef = new byte[0];
try (InputStream wfIn = userWorkflowDef.getInputStream()) {
- wfDef = IOUtils.toByteArray(wfIn);
+ wfDef = wfIn.readAllBytes();
} catch (IOException e) {
LOG.error("While loading {}", userWorkflowDef.getFilename(), e);
}
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
index fcb7ed5981..6f467bca97 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
@@ -255,7 +255,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
try (InputStream src =
Files.newInputStream(Path.of(props.getProperty("test.csv.src")));
OutputStream dst =
Files.newOutputStream(Path.of(props.getProperty("test.csv.dst")))) {
- IOUtils.copy(src, dst);
+ src.transferTo(dst);
}
} catch (IOException e) {
fail(e.getMessage(), e);
@@ -1660,12 +1660,12 @@ public class PullTaskITCase extends AbstractTaskITCase {
ProvisioningReport result = null;
try {
List<ProvisioningReport> results =
- RECONCILIATION_SERVICE.pull(new
ReconQuery.Builder(AnyTypeKind.GROUP.name(),
- RESOURCE_NAME_LDAP).fiql(
- SyncopeClient.getConnObjectTOFiqlSearchConditionBuilder()
- .is(Uid.NAME)
- .equalToIgnoreCase("testLDAPGroup")
- .query()).build(), pullTaskTO);
+ RECONCILIATION_SERVICE.pull(new
ReconQuery.Builder(AnyTypeKind.GROUP.name(),
+ RESOURCE_NAME_LDAP).fiql(
+
SyncopeClient.getConnObjectTOFiqlSearchConditionBuilder()
+ .is(Uid.NAME)
+ .equalToIgnoreCase("testLDAPGroup")
+ .query()).build(), pullTaskTO);
assertNotNull(results.getFirst());
result = results.getFirst();
diff --git a/pom.xml b/pom.xml
index 2c69545859..2425cf1721 100644
--- a/pom.xml
+++ b/pom.xml
@@ -430,7 +430,7 @@ under the License.
<disruptor.version>4.0.0</disruptor.version>
<elasticsearch.version>9.1.1</elasticsearch.version>
- <opensearch.version>3.1.0</opensearch.version>
+ <opensearch.version>3.2.0</opensearch.version>
<opensearch-java.version>3.2.0</opensearch-java.version>
<openfga.version>v1</openfga.version>
@@ -510,7 +510,7 @@ under the License.
<docker.postgresql.version>17-alpine</docker.postgresql.version>
<docker.mysql.version>9.0</docker.mysql.version>
- <docker.mariadb.version>11</docker.mariadb.version>
+ <docker.mariadb.version>12</docker.mariadb.version>
<docker.oracle.version>23-slim-faststart</docker.oracle.version>
<docker.neo4j.version>5.26</docker.neo4j.version>
@@ -1840,7 +1840,7 @@ under the License.
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<configuration>
<javaVersion>${targetJdk}</javaVersion>
<ignorePackages>
