This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 592081cd94ddf30e8810684474386c3553702a69
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Aug 20 08:29:15 2025 +0200
Upgrading OpenSearch and modernizer-maven-plugin
---
.../syncope/core/persistence/jpa/inner/SAML2SPEntityTest.java | 3 +--
.../syncope/core/flowable/impl/FlowableBpmnProcessManager.java | 3 +--
.../syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java | 6 ++++--
.../java/org/apache/syncope/core/logic/init/FlowableLoader.java | 3 +--
.../src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java | 2 +-
pom.xml | 4 ++--
.../syncope/wa/starter/pac4j/saml/WASAML2MetadataResolverTest.java | 3 +--
7 files changed, 11 insertions(+), 13 deletions(-)
diff --git
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPEntityTest.java
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPEntityTest.java
index 371c064ef9..6341009dc3 100644
---
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPEntityTest.java
+++
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/SAML2SPEntityTest.java
@@ -34,7 +34,6 @@ import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
import java.util.Date;
import java.util.UUID;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.core.persistence.api.dao.SAML2SPEntityDAO;
import org.apache.syncope.core.persistence.api.entity.am.SAML2SPEntity;
import org.apache.syncope.core.persistence.jpa.AbstractTest;
@@ -135,7 +134,7 @@ public class SAML2SPEntityTest extends AbstractTest {
private SAML2SPEntity create(final String owner) throws Exception {
SAML2SPEntity entity = entityFactory.newEntity(SAML2SPEntity.class);
entity.setKey(owner);
- entity.setMetadata(IOUtils.toByteArray(new
ClassPathResource("sp-metadata.xml").getInputStream()));
+ entity.setMetadata(new
ClassPathResource("sp-metadata.xml").getInputStream().readAllBytes());
KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
char[] pwdArray = "password".toCharArray();
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 8be0161943..4225aad6a9 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
@@ -26,7 +26,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.util.stream.Collectors;
-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;
@@ -116,7 +115,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/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
index b27a196c0c..6470e8c0b4 100644
---
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
+++
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
@@ -326,9 +326,11 @@ public class FlowableUserWorkflowAdapter extends
AbstractUserWorkflowAdapter imp
Optional.ofNullable(propByLinkedAccountBeforeUpdate).orElse(propByLinkedAccount));
if (inFormTask) {
- propByRes = engine.getRuntimeService().getVariable(
+ @SuppressWarnings("unchecked")
+ PropagationByResource<String> propByResAfterForm =
engine.getRuntimeService().getVariable(
procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE,
PropagationByResource.class);
- }
+ propByRes = propByResAfterForm;
+ }
Boolean propagateEnable = engine.getRuntimeService().getVariable(
procInstID, FlowableRuntimeUtils.PROPAGATE_ENABLE,
Boolean.class);
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 5a0fb08788..f73083c3fc 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
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import javax.sql.DataSource;
-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;
@@ -65,7 +64,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 6801078e6a..879021c09d 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
@@ -252,7 +252,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);
diff --git a/pom.xml b/pom.xml
index 1c739a2523..b372dc7633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -431,7 +431,7 @@ under the License.
<slf4j.version>1.7.36</slf4j.version>
<elasticsearch.version>8.17.10</elasticsearch.version>
- <opensearch.version>2.19.2</opensearch.version>
+ <opensearch.version>2.19.3</opensearch.version>
<opensearch-java.version>2.26.0</opensearch-java.version>
<log4j2.version>2.22.0</log4j2.version>
@@ -1868,7 +1868,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>
diff --git
a/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/WASAML2MetadataResolverTest.java
b/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/WASAML2MetadataResolverTest.java
index c30758ecea..db5aabc8dd 100644
---
a/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/WASAML2MetadataResolverTest.java
+++
b/wa/starter/src/test/java/org/apache/syncope/wa/starter/pac4j/saml/WASAML2MetadataResolverTest.java
@@ -27,7 +27,6 @@ import static org.mockito.Mockito.when;
import java.io.File;
import java.util.Base64;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.to.SAML2SPEntityTO;
import org.apache.syncope.common.rest.api.service.SAML2SPEntityService;
import org.apache.syncope.wa.bootstrap.WARestClient;
@@ -46,7 +45,7 @@ public class WASAML2MetadataResolverTest extends
BaseWASAML2ClientTest {
SAML2SPEntityTO metadataTO = new SAML2SPEntityTO.Builder()
.key("Syncope")
.metadata(Base64.getEncoder().encodeToString(
- IOUtils.toByteArray(new
ClassPathResource("sp-metadata.xml").getInputStream())))
+ new
ClassPathResource("sp-metadata.xml").getInputStream().readAllBytes()))
.build();
SAML2SPEntityService saml2SPMetadataService =
mock(SAML2SPEntityService.class);
