From ae2da63366953daa7ecdc1526a6ab0fcc5aba382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <ilgrosso@apache.org>
Date: Wed, 5 Jul 2023 12:32:44 +0200
Subject: [PATCH] Upgrading ConnId SCIM bundle

---
 .../apache/syncope/core/logic/AbstractSAML2SP4UILogic.java | 7 ++-----
 pom.xml                                                    | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/AbstractSAML2SP4UILogic.java b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/AbstractSAML2SP4UILogic.java
index 5cf9208c2f..8afffd18de 100644
--- a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/AbstractSAML2SP4UILogic.java
+++ b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/AbstractSAML2SP4UILogic.java
@@ -22,7 +22,6 @@
 import java.security.KeyStore;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
-import java.util.Optional;
 import org.apache.syncope.common.lib.to.EntityTO;
 import org.apache.syncope.core.logic.saml2.NoOpLogoutHandler;
 import org.pac4j.saml.config.SAML2Configuration;
@@ -47,14 +46,12 @@ protected AbstractSAML2SP4UILogic(
     protected SAML2Configuration newSAML2Configuration() {
         SAML2Configuration cfg = new SAML2Configuration(
                 resourceResolver.getResource(props.getKeystore()),
+                props.getKeystoreAlias(),
+                props.getKeystoreType(),
                 props.getKeystoreStorepass(),
                 props.getKeystoreKeypass(),
                 null);
 
-        Optional.ofNullable(props.getKeystoreAlias()).ifPresent(cfg::setKeystoreAlias);
-
-        cfg.setKeystoreType(Optional.ofNullable(props.getKeystoreType()).orElseGet(() -> KeyStore.getDefaultType()));
-
         if (cfg.getKeystoreResource() instanceof FileUrlResource) {
             cfg.setKeystoreGenerator(new BaseSAML2KeystoreGenerator(cfg) {
 
diff --git a/pom.xml b/pom.xml
index 8293e0c09c..4e5016769d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -404,7 +404,7 @@ under the License.
     <connid.ad.version>1.3.8</connid.ad.version>
     <connid.googleapps.version>1.4.4</connid.googleapps.version>
     <connid.azure.version>2.0.1</connid.azure.version>
-    <connid.scim.version>1.0.1</connid.scim.version>
+    <connid.scim.version>1.0.2</connid.scim.version>
     <connid.servicenow.version>1.0.2</connid.servicenow.version>
     <connid.okta.version>3.0.0</connid.okta.version>
     <connid.cmd.version>0.5</connid.cmd.version>