Merge remote-tracking branch 'origin/master'

Evolveum · Jul 15, 2021 · 05622ed · 05622ed
2 parents 2d5c6b6 + f4fced3
commit 05622ed
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/...va/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java b/...va/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
@@ -16,7 +16,6 @@
 import com.evolveum.midpoint.repo.common.expression.ExpressionSyntaxException;
 import com.evolveum.midpoint.schema.constants.MidPointConstants;
 import com.evolveum.midpoint.util.exception.*;
-
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 
@@ -41,7 +40,10 @@ public Jsr223ScriptEvaluator(String engineName, PrismContext prismContext,
 
         this.engineName = engineName;
         ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
+        long initStartMs = System.currentTimeMillis();
         scriptEngine = scriptEngineManager.getEngineByName(engineName);
+        LOGGER.debug("Script engine for '{}' initialized in {} ms.",
+                engineName, System.currentTimeMillis() - initStartMs);
         if (scriptEngine == null) {
             SystemException e = new SystemException("The JSR-223 scripting engine for '" + engineName + "' was not found");
             LOGGER.error(e.getMessage(), e);

diff --git a/pom.xml b/pom.xml
@@ -892,7 +892,7 @@
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-ldap</artifactId>
                 <!-- Do not forget to update provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml when changing connector version. -->
-                <version>3.3-M2</version>
+                <version>3.3-M3</version>
                 <exclusions>
                     <!-- Needed otherwise the JDK14 SLF4J binding can override the midpoint's logback binding -->
                     <exclusion>

diff --git a/provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml b/provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml
@@ -14,7 +14,7 @@
     <name>ICF com.evolveum.polygon.connector.ldap.LdapConnector</name>
     <framework>http://midpoint.evolveum.com/xml/ns/public/connector/icf-1</framework>
     <connectorType>com.evolveum.polygon.connector.ldap.LdapConnector</connectorType>
-    <connectorVersion>3.3-M2</connectorVersion>
+    <connectorVersion>3.3-M3</connectorVersion>
     <connectorBundle>com.evolveum.polygon.connector-ldap</connectorBundle>
     <namespace>http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/com.evolveum.polygon.connector-ldap/com.evolveum.polygon.connector.ldap.LdapConnector</namespace>
     <schema>

diff --git a/...src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapSynchronizationTest.java b/...src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapSynchronizationTest.java
@@ -412,7 +412,7 @@ public void test822ModifyAccountHt() throws Exception {
     }
 
     /**
-     * Add a new group. Check that this event is ignored.
+     * Add a new group. Check that this event is ignored (because group is not inetOrgPerson, object class limitation is set in the sync task).
      */
     @Test
     public void test830AddGroupFools() throws Exception {