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 2022/02/09 15:18:12 UTC
[syncope] branch master updated (892e5bb -> 75b8924)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 892e5bb Enabling GH actions for Oracle DB (#311)
new be349a1 Upgrading Nimbus JOSE JWT and Swagger Core
new 75b8924 Upgrading slf4j
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:
.../java/org/apache/syncope/fit/core/UserSelfITCase.java | 12 ++++++++++--
pom.xml | 6 +++---
2 files changed, 13 insertions(+), 5 deletions(-)
[syncope] 01/02: Upgrading Nimbus JOSE JWT and Swagger Core
Posted by il...@apache.org.
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 be349a14861ed7c2ab3c0d4ff26a918d8774cbe4
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Feb 8 17:06:43 2022 +0100
Upgrading Nimbus JOSE JWT and Swagger Core
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 30070dc..c0d85f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -405,7 +405,7 @@ under the License.
<cxf.version>3.5.0</cxf.version>
<bouncycastle.version>1.70</bouncycastle.version>
- <nimbus-jose-jwt.version>9.18</nimbus-jose-jwt.version>
+ <nimbus-jose-jwt.version>9.19</nimbus-jose-jwt.version>
<jackson.version>2.13.1</jackson.version>
@@ -453,7 +453,7 @@ under the License.
<h2.version>1.4.200</h2.version>
- <swagger-core.version>2.1.12</swagger-core.version>
+ <swagger-core.version>2.1.13</swagger-core.version>
<swagger-ui.version>4.5.0</swagger-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
[syncope] 02/02: Upgrading slf4j
Posted by il...@apache.org.
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 75b892482fb58828ffcd146209ba3c2b2373f9b3
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Feb 9 16:10:26 2022 +0100
Upgrading slf4j
---
.../java/org/apache/syncope/fit/core/UserSelfITCase.java | 12 ++++++++++--
pom.xml | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
index 687d281..6f3ed90 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.fit.core;
+import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -31,6 +32,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.TimeUnit;
import javax.ws.rs.ForbiddenException;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
@@ -347,8 +349,14 @@ public class UserSelfITCase extends AbstractITCase {
// ignore
}
}
- PagedResult<UserTO> tokenized = userService.search(new AnyQuery.Builder().fiql("token!=$null").build());
- assertTrue(tokenized.getResult().stream().anyMatch(u -> user.getUsername().equals(u.getUsername())));
+ await().atMost(MAX_WAIT_SECONDS, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).until(() -> {
+ try {
+ PagedResult<UserTO> tokenized = userService.search(new AnyQuery.Builder().fiql("token!=$null").build());
+ return tokenized.getResult().stream().anyMatch(u -> user.getUsername().equals(u.getUsername()));
+ } catch (Exception e) {
+ return false;
+ }
+ });
// 4. get token (normally sent via e-mail, now reading as admin)
String token = userService.read(read.getKey()).getToken();
diff --git a/pom.xml b/pom.xml
index c0d85f1..8fb5996 100644
--- a/pom.xml
+++ b/pom.xml
@@ -428,7 +428,7 @@ under the License.
<camel.version>3.15.0</camel.version>
- <slf4j.version>1.7.35</slf4j.version>
+ <slf4j.version>1.7.36</slf4j.version>
<elasticsearch.version>7.17.0</elasticsearch.version>