(syncope) branch 3_0_X updated: Upgrading exec-maven-plugin

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/3_0_X by this push:
     new 571686f14a Upgrading exec-maven-plugin
571686f14a is described below

commit 571686f14adbd47511700a28230afb8413ae1fe7
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Oct 1 08:46:22 2025 +0200

    Upgrading exec-maven-plugin
---
 .../java/pushpull/AbstractPushResultHandler.java   | 23 +++++++++++-----------
 pom.xml                                            |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
index 14689fd8e4..b457b42f52 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
@@ -175,6 +175,16 @@ public abstract class AbstractPushResultHandler extends 
AbstractSyncopeResultHan
         }
     }
 
+    protected void copyDynMembershipConds(final Any<?> any, final AnyUR req) {
+        if (any instanceof Group && req instanceof GroupUR) {
+            Optional.ofNullable(((Group) any).getUDynMembership()).
+                    ifPresent(udc -> ((GroupUR) 
req).setUDynMembershipCond(udc.getFIQLCond()));
+
+            ((Group) any).getADynMemberships().forEach(adc -> ((GroupUR) 
req).getADynMembershipConds().
+                    put(adc.getAnyType().getKey(), adc.getFIQLCond()));
+        }
+    }
+
     protected void link(final Any<?> any, final boolean unlink, final 
ProvisioningReport result) {
         AnyUR req = getAnyUtils().newAnyUR(any.getKey());
         req.getResources().add(new StringPatchItem.Builder().
@@ -195,7 +205,7 @@ public abstract class AbstractPushResultHandler extends 
AbstractSyncopeResultHan
                 value(profile.getTask().getResource().getKey()).build());
 
         copyDynMembershipConds(any, req);
-    
+
         update(req);
 
         deprovision(any, beforeObj, result);
@@ -214,17 +224,6 @@ public abstract class AbstractPushResultHandler extends 
AbstractSyncopeResultHan
         provision(any, enabled, result);
     }
 
-    protected void copyDynMembershipConds(final Any<?> any, final AnyUR req) {
-        if (any instanceof Group) {
-            Optional.ofNullable(((Group) any).getUDynMembership()).
-            ifPresent(udc ->  ((GroupUR) 
req).setUDynMembershipCond(udc.getFIQLCond()));
-
-            ((Group) any).getADynMemberships().forEach(aDynGroupMembership ->
-                    ((GroupUR) req).getADynMembershipConds().put(
-                            aDynGroupMembership.getAnyType().getKey(), 
aDynGroupMembership.getFIQLCond()));
-        }
-    }
-
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     @Override
     public boolean handle(final String anyKey) {
diff --git a/pom.xml b/pom.xml
index 4464c6346c..83db42c4d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1823,7 +1823,7 @@ under the License.
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
-          <version>3.5.1</version>
+          <version>3.6.0</version>
         </plugin>
 
         <plugin>