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
The following commit(s) were added to refs/heads/3_0_X by this push:
new 48a9fa4fae Upgrading Tomcat
48a9fa4fae is described below
commit 48a9fa4faea895c8d5e74af993ffba181b1f4a1e
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue Feb 11 11:47:49 2025 +0100
Upgrading Tomcat
---
.../apache/syncope/fit/core/AbstractTaskITCase.java | 2 +-
.../org/apache/syncope/fit/core/PullTaskITCase.java | 21 ++++++++++-----------
pom.xml | 2 +-
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
index 1d39e25235..53b0d7f374 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
@@ -57,7 +57,7 @@ public abstract class AbstractTaskITCase extends
AbstractITCase {
/**
* Remove initial and synchronized users to make test re-runnable.
*/
- protected void removeTestUsers() {
+ protected static void removeTestUsers() {
for (int i = 0; i < 10; i++) {
String cUserName = "test" + i;
try {
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 2c4f753c16..6801078e6a 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
@@ -186,6 +186,11 @@ public class PullTaskITCase extends AbstractTaskITCase {
return Pair.of(entryDn, attributes);
}
+ private static void cleanUpRemediations() {
+ REMEDIATION_SERVICE.list(new
RemediationQuery.Builder().page(1).size(100).build()).getResult().forEach(
+ r -> REMEDIATION_SERVICE.delete(r.getKey()));
+ }
+
@Test
public void getPullActionsClasses() {
Set<String> actions = ANONYMOUS_CLIENT.platform().
@@ -1603,12 +1608,10 @@ public class PullTaskITCase extends AbstractTaskITCase {
UserTO user = null;
PullTaskTO pullTask = null;
- ConnInstanceTO resourceConnector = null;
- ConnConfProperty property = null;
try {
// 1. create user in LDAP
String oldCleanPassword = "security123";
- UserCR userCR =
UserITCase.getUniqueSample("[email protected]");
+ UserCR userCR =
UserITCase.getUniqueSample("[email protected]");
userCR.setPassword(oldCleanPassword);
userCR.getResources().add(RESOURCE_NAME_LDAP);
userCR.getResources().add(RESOURCE_NAME_DBPULL);
@@ -1626,7 +1629,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
pullActions.setKey("AddResourcePullActions");
pullActions.setEngine(ImplementationEngine.GROOVY);
pullActions.setType(IdMImplementationType.PULL_ACTIONS);
- pullActions.setBody(org.apache.commons.io.IOUtils.toString(
+ pullActions.setBody(IOUtils.toString(
getClass().getResourceAsStream("/AddResourcePullActions.groovy"),
StandardCharsets.UTF_8));
Response response = IMPLEMENTATION_SERVICE.create(pullActions);
pullActions = IMPLEMENTATION_SERVICE.read(
@@ -1677,13 +1680,9 @@ public class PullTaskITCase extends AbstractTaskITCase {
&& AttributeUtil.getPasswordValue(attributes) == null;
}));
} finally {
- // remove test entity
- deleteUser(user.getKey());
+ // remove test entities
+ Optional.ofNullable(pullTask).ifPresent(t ->
TASK_SERVICE.delete(TaskType.PULL, t.getKey()));
+ Optional.ofNullable(user).ifPresent(u -> deleteUser(u.getKey()));
}
}
-
- private static void cleanUpRemediations() {
- REMEDIATION_SERVICE.list(new
RemediationQuery.Builder().page(1).size(100).build()).getResult().forEach(
- r -> REMEDIATION_SERVICE.delete(r.getKey()));
- }
}
diff --git a/pom.xml b/pom.xml
index 053082c032..d42500d8b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -498,7 +498,7 @@ under the License.
<cargo.rmi.port>9805</cargo.rmi.port>
<cargo.deployable.ping.timeout>60000</cargo.deployable.ping.timeout>
- <tomcat.version>9.0.98</tomcat.version>
+ <tomcat.version>9.0.99</tomcat.version>
<wildfly.version>26.1.3.Final</wildfly.version>
<payara.version>5.2022.5</payara.version>
<javax.faces.version>2.3.14</javax.faces.version>
