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
The following commit(s) were added to refs/heads/4_0_X by this push:
new 499aa2ad99 Upgrading commons-text and java-uuid-generator
499aa2ad99 is described below
commit 499aa2ad998a90bff9bfefff35ef4c170cf30408
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Mon Dec 8 07:50:43 2025 +0100
Upgrading commons-text and java-uuid-generator
---
.../core/persistence/jpa/inner/UserTest.java | 22 +++++++++-------------
.../core/persistence/neo4j/inner/UserTest.java | 22 +++++++++-------------
pom.xml | 4 ++--
3 files changed, 20 insertions(+), 28 deletions(-)
diff --git
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
index a67b68d36c..ad8a4ea977 100644
---
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
+++
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/UserTest.java
@@ -18,21 +18,16 @@
*/
package org.apache.syncope.core.persistence.jpa.inner;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
import java.time.OffsetDateTime;
import java.util.List;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
import org.apache.syncope.common.lib.types.CipherAlgorithm;
import org.apache.syncope.core.persistence.api.EncryptorManager;
import org.apache.syncope.core.persistence.api.dao.DerSchemaDAO;
@@ -261,9 +256,7 @@ public class UserTest extends AbstractTest {
}
@Test
- public void issueSYNCOPE1937()
- throws NoSuchPaddingException, IllegalBlockSizeException,
NoSuchAlgorithmException, BadPaddingException,
- InvalidKeyException {
+ public void issueSYNCOPE1937() throws Exception {
User user = entityFactory.newEntity(User.class);
user.setUsername("username");
user.setRealm(realmDAO.getRoot());
@@ -273,7 +266,8 @@ public class UserTest extends AbstractTest {
user.setCipherAlgorithm(CipherAlgorithm.SHA1);
user.setPassword("password123");
- User actual = userDAO.save(user);
+ user = userDAO.save(user);
+ assertNotNull(user);
assertEquals(0, user.getPasswordHistory().size());
@@ -292,8 +286,10 @@ public class UserTest extends AbstractTest {
assertEquals(3, user.getPasswordHistory().size());
// try with an exceeding number
- assertDoesNotThrow(() ->
user.removeOldestEntriesFromPasswordHistory(user.getPasswordHistory().size() +
5));
-
- assertNotNull(actual);
+ try {
+
user.removeOldestEntriesFromPasswordHistory(user.getPasswordHistory().size() +
5);
+ } catch (Exception e) {
+ fail(e);
+ }
}
}
diff --git
a/core/persistence-neo4j/src/test/java/org/apache/syncope/core/persistence/neo4j/inner/UserTest.java
b/core/persistence-neo4j/src/test/java/org/apache/syncope/core/persistence/neo4j/inner/UserTest.java
index 9a1ed7549c..af058ee7b2 100644
---
a/core/persistence-neo4j/src/test/java/org/apache/syncope/core/persistence/neo4j/inner/UserTest.java
+++
b/core/persistence-neo4j/src/test/java/org/apache/syncope/core/persistence/neo4j/inner/UserTest.java
@@ -18,21 +18,16 @@
*/
package org.apache.syncope.core.persistence.neo4j.inner;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
import java.time.OffsetDateTime;
import java.util.List;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
import org.apache.syncope.common.lib.types.CipherAlgorithm;
import org.apache.syncope.core.persistence.api.EncryptorManager;
import org.apache.syncope.core.persistence.api.dao.DerSchemaDAO;
@@ -261,9 +256,7 @@ public class UserTest extends AbstractTest {
}
@Test
- public void issueSYNCOPE1937()
- throws NoSuchPaddingException, IllegalBlockSizeException,
NoSuchAlgorithmException, BadPaddingException,
- InvalidKeyException {
+ public void issueSYNCOPE1937() throws Exception {
User user = entityFactory.newEntity(User.class);
user.setUsername("username");
user.setRealm(realmDAO.getRoot());
@@ -273,7 +266,8 @@ public class UserTest extends AbstractTest {
user.setCipherAlgorithm(CipherAlgorithm.SHA1);
user.setPassword("password123");
- User actual = userDAO.save(user);
+ user = userDAO.save(user);
+ assertNotNull(user);
assertEquals(0, user.getPasswordHistory().size());
@@ -292,8 +286,10 @@ public class UserTest extends AbstractTest {
assertEquals(3, user.getPasswordHistory().size());
// try with an exceeding number
- assertDoesNotThrow(() ->
user.removeOldestEntriesFromPasswordHistory(user.getPasswordHistory().size() +
5));
-
- assertNotNull(actual);
+ try {
+
user.removeOldestEntriesFromPasswordHistory(user.getPasswordHistory().size() +
5);
+ } catch (Exception e) {
+ fail(e);
+ }
}
}
diff --git a/pom.xml b/pom.xml
index d3e6787dd5..643d39e05a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -459,7 +459,7 @@ under the License.
<commons-lang3.version>3.20.0</commons-lang3.version>
<commons-jexl.version>3.6.0</commons-jexl.version>
- <commons-text.version>1.14.0</commons-text.version>
+ <commons-text.version>1.15.0</commons-text.version>
<pac4j.version>6.1.1</pac4j.version>
@@ -681,7 +681,7 @@ under the License.
<dependency>
<groupId>com.fasterxml.uuid</groupId>
<artifactId>java-uuid-generator</artifactId>
- <version>5.1.1</version>
+ <version>5.2.0</version>
</dependency>
<dependency>
