Skip to content

Commit 571686f

Browse files
committed
Upgrading exec-maven-plugin
1 parent 4ba8c30 commit 571686f

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,16 @@ protected void provision(final Any<?> any, final Boolean enable, final Provision
175175
}
176176
}
177177

178+
protected void copyDynMembershipConds(final Any<?> any, final AnyUR req) {
179+
if (any instanceof Group && req instanceof GroupUR) {
180+
Optional.ofNullable(((Group) any).getUDynMembership()).
181+
ifPresent(udc -> ((GroupUR) req).setUDynMembershipCond(udc.getFIQLCond()));
182+
183+
((Group) any).getADynMemberships().forEach(adc -> ((GroupUR) req).getADynMembershipConds().
184+
put(adc.getAnyType().getKey(), adc.getFIQLCond()));
185+
}
186+
}
187+
178188
protected void link(final Any<?> any, final boolean unlink, final ProvisioningReport result) {
179189
AnyUR req = getAnyUtils().newAnyUR(any.getKey());
180190
req.getResources().add(new StringPatchItem.Builder().
@@ -195,7 +205,7 @@ protected void unassign(final Any<?> any, final ConnectorObject beforeObj, final
195205
value(profile.getTask().getResource().getKey()).build());
196206

197207
copyDynMembershipConds(any, req);
198-
208+
199209
update(req);
200210

201211
deprovision(any, beforeObj, result);
@@ -214,17 +224,6 @@ protected void assign(final Any<?> any, final Boolean enabled, final Provisionin
214224
provision(any, enabled, result);
215225
}
216226

217-
protected void copyDynMembershipConds(final Any<?> any, final AnyUR req) {
218-
if (any instanceof Group) {
219-
Optional.ofNullable(((Group) any).getUDynMembership()).
220-
ifPresent(udc -> ((GroupUR) req).setUDynMembershipCond(udc.getFIQLCond()));
221-
222-
((Group) any).getADynMemberships().forEach(aDynGroupMembership ->
223-
((GroupUR) req).getADynMembershipConds().put(
224-
aDynGroupMembership.getAnyType().getKey(), aDynGroupMembership.getFIQLCond()));
225-
}
226-
}
227-
228227
@Transactional(propagation = Propagation.REQUIRES_NEW)
229228
@Override
230229
public boolean handle(final String anyKey) {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1823,7 +1823,7 @@ under the License.
18231823
<plugin>
18241824
<groupId>org.codehaus.mojo</groupId>
18251825
<artifactId>exec-maven-plugin</artifactId>
1826-
<version>3.5.1</version>
1826+
<version>3.6.0</version>
18271827
</plugin>
18281828

18291829
<plugin>

0 commit comments

Comments
 (0)