This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push: new c51d6e4 Upgrading Groovy and HttpClient c51d6e4 is described below commit c51d6e4c7f672d647c07396af159b34c4328a4a7 Author: Francesco Chicchiriccò <ilgro...@apache.org> AuthorDate: Sun Mar 15 15:55:07 2020 +0100 Upgrading Groovy and HttpClient --- .../src/test/java/org/apache/syncope/fit/core/GroupITCase.java | 10 ++-------- pom.xml | 5 ++--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java index c42b60a..7069283 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java @@ -70,7 +70,6 @@ import org.apache.syncope.common.lib.to.ItemTO; import org.apache.syncope.common.lib.to.MappingTO; import org.apache.syncope.common.lib.to.MembershipTO; import org.apache.syncope.common.lib.to.PropagationStatus; -import org.apache.syncope.common.lib.to.ProvisionTO; import org.apache.syncope.common.lib.to.ProvisioningResult; import org.apache.syncope.common.lib.to.SchedTaskTO; import org.apache.syncope.common.lib.to.TypeExtensionTO; @@ -1033,10 +1032,7 @@ public class GroupITCase extends AbstractITCase { ResourceTO newLDAP = resourceService.read(RESOURCE_NAME_LDAP); newLDAP.setKey("new-ldap"); newLDAP.setPropagationPriority(0); - - for (ProvisionTO provision : newLDAP.getProvisions()) { - provision.getVirSchemas().clear(); - } + newLDAP.getProvisions().forEach(provision -> provision.getVirSchemas().clear()); MappingTO mapping = newLDAP.getProvision(AnyTypeKind.GROUP.name()).get().getMapping(); @@ -1058,9 +1054,7 @@ public class GroupITCase extends AbstractITCase { // 2. update group and give the resource created above GroupPatch patch = new GroupPatch(); patch.setKey(groupTO.getKey()); - patch.getResources().add(new StringPatchItem.Builder(). - operation(PatchOperation.ADD_REPLACE). - value("new-ldap").build()); + patch.getResources().add(new StringPatchItem.Builder().value("new-ldap").build()); groupTO = updateGroup(patch).getEntity(); assertNotNull(groupTO); diff --git a/pom.xml b/pom.xml index 4f8f257..fc0db37 100644 --- a/pom.xml +++ b/pom.xml @@ -421,7 +421,7 @@ under the License. <cocoon.version>3.0.0-alpha-3</cocoon.version> - <groovy.version>3.0.1</groovy.version> + <groovy.version>3.0.2</groovy.version> <flowable.version>6.4.2</flowable.version> @@ -501,7 +501,7 @@ under the License. <fileSaver.version>0.0.2</fileSaver.version> <izpack.version>5.1.3</izpack.version> - <httpclient.version>4.5.11</httpclient.version> + <httpclient.version>4.5.12</httpclient.version> <maven-invoker.version>3.0.1</maven-invoker.version> <ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version> @@ -2316,7 +2316,6 @@ under the License. <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.13</version> <configuration> <excludes> <exclude>nbactions.xml</exclude>