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
The following commit(s) were added to refs/heads/master by this push:
new c5f549382e Fixing after Groovy update
c5f549382e is described below
commit c5f549382e379434043633261f2c80f44ba930ba
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Wed Aug 5 11:29:59 2026 +0200
Fixing after Groovy update
---
core/persistence-api/pom.xml | 16 +++++++++++++++
.../spring/implementation/GroovySandboxTest.java | 23 ++++++++++++++++++++++
fit/build-tools/pom.xml | 16 +++++++++++++++
pom.xml | 10 +++++-----
4 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/core/persistence-api/pom.xml b/core/persistence-api/pom.xml
index 168766d1fd..daf6b1fe74 100644
--- a/core/persistence-api/pom.xml
+++ b/core/persistence-api/pom.xml
@@ -93,6 +93,22 @@ under the License.
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-sql</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-json</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-yaml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-nio</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-callsite</artifactId>
+ </dependency>
<dependency>
<groupId>net.tirasa</groupId>
diff --git
a/core/spring/src/test/java/org/apache/syncope/core/spring/implementation/GroovySandboxTest.java
b/core/spring/src/test/java/org/apache/syncope/core/spring/implementation/GroovySandboxTest.java
index b301f9f2a7..79865ab9e0 100644
---
a/core/spring/src/test/java/org/apache/syncope/core/spring/implementation/GroovySandboxTest.java
+++
b/core/spring/src/test/java/org/apache/syncope/core/spring/implementation/GroovySandboxTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.core.spring.implementation;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
@@ -25,6 +26,7 @@ import static org.mockito.Mockito.when;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -35,6 +37,10 @@ import
org.apache.syncope.common.lib.types.ImplementationEngine;
import org.apache.syncope.core.persistence.api.entity.Implementation;
import org.apache.syncope.core.provisioning.api.macro.MacroActions;
import org.apache.syncope.core.spring.SpringTestConfiguration;
+import org.identityconnectors.common.logging.Log;
+import org.identityconnectors.common.script.ScriptExecutor;
+import org.identityconnectors.common.script.ScriptExecutorFactory;
+import org.identityconnectors.framework.common.objects.ObjectClass;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS;
@@ -48,6 +54,23 @@ class GroovySandboxTest {
@TempDir
private Path tempDir;
+ @Test
+ void script() {
+ String script =
+ """
+ log.info("Entering {0} Script for {1}", action, objectClass)
+ """;
+ ScriptExecutor scriptExecutor =
ScriptExecutorFactory.newInstance("GROOVY").
+ newScriptExecutor(getClass().getClassLoader(), script, true);
+
+ Map<String, Object> arguments = new HashMap<>();
+ arguments.put("objectClass", ObjectClass.ACCOUNT_NAME);
+ arguments.put("action", "SEARCH");
+ arguments.put("log", Log.getLog(GroovySandboxTest.class));
+
+ assertDoesNotThrow(() -> scriptExecutor.execute(arguments));
+ }
+
@Test
void processBuilder() throws Exception {
final MacroActions actions = actions("processBuilder",
"/ProcessBuilderMacroActions.groovy");
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index 20b0bd11fd..b0217e9400 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -177,6 +177,22 @@ under the License.
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-sql</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-json</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-yaml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-nio</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-callsite</artifactId>
+ </dependency>
<dependency>
<groupId>net.tirasa</groupId>
diff --git a/pom.xml b/pom.xml
index 3df120d2ec..ddd74daeb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -417,8 +417,8 @@ under the License.
<connid.version>1.7.0.0-SNAPSHOT</connid.version>
<connid.soap.version>1.5.0</connid.soap.version>
- <connid.rest.version>1.1.2</connid.rest.version>
- <connid.db.version>2.4.2</connid.db.version>
+ <connid.rest.version>1.2.0-SNAPSHOT</connid.rest.version>
+ <connid.db.version>2.5.0-SNAPSHOT</connid.db.version>
<connid.csvdir.version>0.8.10</connid.csvdir.version>
<connid.ldap.version>1.5.10</connid.ldap.version>
<connid.ad.version>1.4.0</connid.ad.version>
@@ -1034,19 +1034,19 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
- <artifactId>groovy-groovysh</artifactId>
+ <artifactId>groovy-nio</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
- <artifactId>groovy-nio</artifactId>
+ <artifactId>groovy-callsite</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>net.tirasa</groupId>
<artifactId>groovy-security-sandbox</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<!-- Flowable -->
