Repository: syncope Updated Branches: refs/heads/2_0_X 400927ef0 -> 3bf402797 refs/heads/master 046c354bd -> 90ef36741
Upgrading Jackson and Spring Security Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3bf40279 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3bf40279 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3bf40279 Branch: refs/heads/2_0_X Commit: 3bf402797f161c4caa8d02d4a78b836aec2e545d Parents: 400927e Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Thu Jan 25 16:38:24 2018 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Jan 25 16:38:24 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/syncope/common/lib/info/NumbersInfo.java | 7 ------- .../java/org/apache/syncope/common/lib/patch/GroupPatch.java | 1 - .../org/apache/syncope/common/lib/policy/PullPolicySpec.java | 2 -- .../org/apache/syncope/common/lib/to/BulkActionResult.java | 1 - .../java/org/apache/syncope/common/lib/to/DynRealmTO.java | 2 -- .../main/java/org/apache/syncope/common/lib/to/GroupTO.java | 1 - .../java/org/apache/syncope/common/lib/to/NotificationTO.java | 2 -- .../org/apache/syncope/common/lib/to/ProvisioningResult.java | 2 -- .../java/org/apache/syncope/common/lib/to/PullTaskTO.java | 2 -- .../java/org/apache/syncope/common/lib/to/PushTaskTO.java | 2 -- .../main/java/org/apache/syncope/common/lib/to/RealmTO.java | 2 -- .../apache/syncope/common/lib/to/WorkflowFormPropertyTO.java | 2 -- .../apache/syncope/common/lib/types/ClientExceptionType.java | 1 - pom.xml | 4 ++-- 14 files changed, 2 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/info/NumbersInfo.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/info/NumbersInfo.java b/common/lib/src/main/java/org/apache/syncope/common/lib/info/NumbersInfo.java index 6176b95..c12f1a3 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/info/NumbersInfo.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/info/NumbersInfo.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.common.lib.info; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.HashMap; import java.util.Map; @@ -70,17 +69,14 @@ public class NumbersInfo extends AbstractBaseBean { private int totalUsers; @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, Integer> usersByRealm = new HashMap<>(); @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, Integer> usersByStatus = new HashMap<>(); private int totalGroups; @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, Integer> groupsByRealm = new HashMap<>(); private String anyType1; @@ -88,7 +84,6 @@ public class NumbersInfo extends AbstractBaseBean { private Integer totalAny1; @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, Integer> any1ByRealm = new HashMap<>(); private String anyType2; @@ -96,7 +91,6 @@ public class NumbersInfo extends AbstractBaseBean { private Integer totalAny2; @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, Integer> any2ByRealm = new HashMap<>(); private int totalResources; @@ -104,7 +98,6 @@ public class NumbersInfo extends AbstractBaseBean { private int totalRoles; @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, Boolean> confCompleteness = new HashMap<>(); public int getTotalUsers() { http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/patch/GroupPatch.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/GroupPatch.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/GroupPatch.java index 0cf5f31..027ba41 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/GroupPatch.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/GroupPatch.java @@ -49,7 +49,6 @@ public class GroupPatch extends AnyPatch { private String udynMembershipCond; @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, String> adynMembershipConds = new HashMap<>(); private final List<TypeExtensionTO> typeExtensions = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicySpec.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicySpec.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicySpec.java index a6b5338..9d9aa72 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicySpec.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/PullPolicySpec.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.common.lib.policy; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.HashMap; import java.util.Map; @@ -44,7 +43,6 @@ public class PullPolicySpec extends AbstractBaseBean { * </ol> */ @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, String> correlationRules = new HashMap<>(); public ConflictResolutionAction getConflictResolutionAction() { http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkActionResult.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkActionResult.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkActionResult.java index c2e67f4..da908d5 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkActionResult.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/BulkActionResult.java @@ -57,7 +57,6 @@ public class BulkActionResult extends AbstractBaseBean { } @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, Status> results = new HashMap<>(); @JsonProperty http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/to/DynRealmTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/DynRealmTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/DynRealmTO.java index d3fff01..675020f 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/DynRealmTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/DynRealmTO.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.HashMap; import java.util.Map; @@ -38,7 +37,6 @@ public class DynRealmTO extends AbstractBaseBean implements EntityTO { private String key; @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, String> dynMembershipConds = new HashMap<>(); @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java index 4b6d1a1..82c4fe3 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java @@ -57,7 +57,6 @@ public class GroupTO extends AnyTO { private int dynamicAnyObjectMembershipCount; @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, String> adynMembershipConds = new HashMap<>(); private final List<TypeExtensionTO> typeExtensions = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTO.java index 428efde..2288c11 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTO.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.HashMap; @@ -45,7 +44,6 @@ public class NotificationTO extends AbstractBaseBean implements EntityTO { private final List<String> events = new ArrayList<>(); @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, String> abouts = new HashMap<>(); private String recipientsFIQL; http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningResult.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningResult.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningResult.java index 3fe4790..c36f97e 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningResult.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ProvisioningResult.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; import java.util.ArrayList; @@ -39,7 +38,6 @@ public class ProvisioningResult<E extends EntityTO> extends AbstractBaseBean { private static final long serialVersionUID = 351317476398082746L; @XmlJavaTypeAdapter(XmlEntityTOAdapter.class) - @JsonIgnore private E entity; private final List<PropagationStatus> propagationStatuses = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/to/PullTaskTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PullTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PullTaskTO.java index 9aaccf2..c65d592 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PullTaskTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PullTaskTO.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.HashMap; import java.util.Map; @@ -44,7 +43,6 @@ public class PullTaskTO extends AbstractProvisioningTaskTO implements Templatabl private String destinationRealm; @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, AnyTO> templates = new HashMap<>(); public PullMode getPullMode() { http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/to/PushTaskTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PushTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PushTaskTO.java index 4528f11..7dfc623 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PushTaskTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PushTaskTO.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.HashMap; import java.util.Map; @@ -39,7 +38,6 @@ public class PushTaskTO extends AbstractProvisioningTaskTO { private String sourceRealm; @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, String> filters = new HashMap<>(); public String getSourceRealm() { http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java index db770e7..3902cd3 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.HashMap; import java.util.HashSet; @@ -54,7 +53,6 @@ public class RealmTO extends AbstractBaseBean implements EntityTO, TemplatableTO private final Set<String> actionsClassNames = new HashSet<>(); @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, AnyTO> templates = new HashMap<>(); private final Set<String> resources = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormPropertyTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormPropertyTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormPropertyTO.java index 9fa5928..59bfc1e 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormPropertyTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/WorkflowFormPropertyTO.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.common.lib.to; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.HashMap; import java.util.Map; @@ -52,7 +51,6 @@ public class WorkflowFormPropertyTO extends AbstractBaseBean { private String datePattern; @XmlJavaTypeAdapter(XmlGenericMapAdapter.class) - @JsonIgnore private final Map<String, String> enumValues = new HashMap<>(); public String getId() { http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/common/lib/src/main/java/org/apache/syncope/common/lib/types/ClientExceptionType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ClientExceptionType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ClientExceptionType.java index 1927737..6e9f509 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ClientExceptionType.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ClientExceptionType.java @@ -67,7 +67,6 @@ public enum ClientExceptionType { InvalidPullTask(Response.Status.BAD_REQUEST), InvalidValues(Response.Status.BAD_REQUEST), NotFound(Response.Status.NOT_FOUND), - RejectedUserCreate(Response.Status.BAD_REQUEST), RequiredValuesMissing(Response.Status.BAD_REQUEST), RESTValidation(Response.Status.BAD_REQUEST), GroupOwnership(Response.Status.BAD_REQUEST), http://git-wip-us.apache.org/repos/asf/syncope/blob/3bf40279/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3f9eb09..422b281 100644 --- a/pom.xml +++ b/pom.xml @@ -367,10 +367,10 @@ under the License. <cxf.version>3.1.15-SNAPSHOT</cxf.version> - <jackson.version>2.9.3</jackson.version> + <jackson.version>2.9.4</jackson.version> <spring.version>4.3.14.RELEASE</spring.version> - <spring-security.version>4.2.3.RELEASE</spring-security.version> + <spring-security.version>4.2.4.RELEASE</spring-security.version> <openjpa.version>2.4.2</openjpa.version> <hikaricp.version>2.4.13</hikaricp.version>
