You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2026/05/12 08:00:47 UTC
(syncope) branch 4_0_X updated (2196736fdd -> a60802560c)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
from 2196736fdd Improve Topology UX (#1373)
new d6f09644ba Bump org.apache:apache from 37 to 38
new a60802560c Upgrading Groovy and Tomcat
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/idrepo/logic/pom.xml | 5 -----
.../syncope/core/rest/cxf/service/MailTemplateServiceImpl.java | 6 ++----
.../org/apache/syncope/core/rest/cxf/service/RoleServiceImpl.java | 6 ++----
pom.xml | 8 ++++----
4 files changed, 8 insertions(+), 17 deletions(-)
(syncope) 01/02: Bump org.apache:apache from 37 to 38
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit d6f09644ba9c1bbddbb55f6784632d69c7ddcde6
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue May 12 04:37:58 2026 +0000
Bump org.apache:apache from 37 to 38
Bumps [org.apache:apache](https://github.com/apache/maven-apache-parent) from 37 to 38.
- [Release notes](https://github.com/apache/maven-apache-parent/releases)
- [Commits](https://github.com/apache/maven-apache-parent/commits)
---
updated-dependencies:
- dependency-name: org.apache:apache
dependency-version: '38'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 693637b9aa..16ed2203ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@ under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>37</version>
+ <version>38</version>
<relativePath />
</parent>
(syncope) 02/02: Upgrading Groovy and Tomcat
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit a60802560cb104adcef45616c0e351d235d94f7f
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue May 12 09:56:33 2026 +0200
Upgrading Groovy and Tomcat
---
core/idrepo/logic/pom.xml | 5 -----
.../syncope/core/rest/cxf/service/MailTemplateServiceImpl.java | 6 ++----
.../org/apache/syncope/core/rest/cxf/service/RoleServiceImpl.java | 6 ++----
pom.xml | 6 +++---
4 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/core/idrepo/logic/pom.xml b/core/idrepo/logic/pom.xml
index 2dc889af7f..91301b9a83 100644
--- a/core/idrepo/logic/pom.xml
+++ b/core/idrepo/logic/pom.xml
@@ -47,11 +47,6 @@ under the License.
<artifactId>spring-context-support</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.syncope.core</groupId>
<artifactId>syncope-core-provisioning-java</artifactId>
diff --git a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
index c1859b681b..e43bde1a8d 100644
--- a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
+++ b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
@@ -21,12 +21,10 @@ package org.apache.syncope.core.rest.cxf.service;
import jakarta.ws.rs.InternalServerErrorException;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.StreamingOutput;
-import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.List;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.to.MailTemplateTO;
import org.apache.syncope.common.lib.types.MailTemplateFormat;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -78,8 +76,8 @@ public class MailTemplateServiceImpl extends AbstractService implements MailTemp
@Override
public void setFormat(final String key, final MailTemplateFormat format, final InputStream templateIn) {
try {
- logic.setFormat(key, format, IOUtils.toString(templateIn, StandardCharsets.UTF_8));
- } catch (final IOException e) {
+ logic.setFormat(key, format, new String(templateIn.readAllBytes(), StandardCharsets.UTF_8));
+ } catch (Exception e) {
LOG.error("While setting format {} for mail template {}", format, key, e);
throw new InternalServerErrorException("Could not read entity", e);
}
diff --git a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/RoleServiceImpl.java b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/RoleServiceImpl.java
index 9b2c717e8a..3b4dc19d35 100644
--- a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/RoleServiceImpl.java
+++ b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/RoleServiceImpl.java
@@ -22,12 +22,10 @@ import jakarta.ws.rs.InternalServerErrorException;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.StreamingOutput;
-import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.List;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.to.RoleTO;
import org.apache.syncope.common.rest.api.RESTHeaders;
import org.apache.syncope.common.rest.api.service.RoleService;
@@ -83,8 +81,8 @@ public class RoleServiceImpl extends AbstractService implements RoleService {
@Override
public void setAnyLayout(final String key, final InputStream anyLayoutIn) {
try {
- logic.setAnyLayout(key, IOUtils.toString(anyLayoutIn, StandardCharsets.UTF_8.name()));
- } catch (final IOException e) {
+ logic.setAnyLayout(key, new String(anyLayoutIn.readAllBytes(), StandardCharsets.UTF_8.name()));
+ } catch (Exception e) {
LOG.error("While setting console layout info for role {}", key, e);
throw new InternalServerErrorException("Could not read entity", e);
}
diff --git a/pom.xml b/pom.xml
index 16ed2203ce..dc4f452a77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -443,7 +443,7 @@ under the License.
<jasypt.version>1.9.3</jasypt.version>
- <groovy.version>5.0.5</groovy.version>
+ <groovy.version>5.0.6</groovy.version>
<flowable.version>7.2.0</flowable.version>
<flowable-old.version>6.8.1</flowable-old.version>
@@ -527,8 +527,8 @@ under the License.
<cargo.rmi.port>9805</cargo.rmi.port>
<cargo.deployable.ping.timeout>60000</cargo.deployable.ping.timeout>
- <tomcat.version>10.1.54</tomcat.version>
- <wildfly.version>39.0.0.Final</wildfly.version>
+ <tomcat.version>10.1.55</tomcat.version>
+ <wildfly.version>39.0.1.Final</wildfly.version>
<payara.version>6.2025.11</payara.version>
<jakarta.faces.version>4.1.9</jakarta.faces.version>