[4/5] syncope git commit: Upgrading maven-jar-plugin
Upgrading maven-jar-plugin Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0189a50f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0189a50f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0189a50f Branch: refs/heads/2_0_X Commit: 0189a50fde54b72f3bff00f278b5dabd71c12082 Parents: 253617c Author: Francesco ChicchiriccòAuthored: Tue Apr 10 16:16:16 2018 +0200 Committer: Francesco Chicchiriccò Committed: Tue Apr 10 16:16:16 2018 +0200 -- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/0189a50f/pom.xml -- diff --git a/pom.xml b/pom.xml index 609dad8..826f242 100644 --- a/pom.xml +++ b/pom.xml @@ -464,7 +464,6 @@ under the License. 4.5.5 3.0.0 1.0-alpha-1 -3.0.0 0.23.1 RELEASE82 @@ -1850,7 +1849,7 @@ under the License. org.apache.maven.plugins maven-jar-plugin - 3.0.2 + 3.1.0
[3/5] syncope git commit: Upgrading Spring
Upgrading Spring Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/253617c8 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/253617c8 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/253617c8 Branch: refs/heads/2_0_X Commit: 253617c886d3d973c49eef27f139596094e26683 Parents: 86aaa51 Author: Francesco ChicchiriccòAuthored: Tue Apr 10 16:10:44 2018 +0200 Committer: Francesco Chicchiriccò Committed: Tue Apr 10 16:10:44 2018 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/253617c8/pom.xml -- diff --git a/pom.xml b/pom.xml index c14b9da..609dad8 100644 --- a/pom.xml +++ b/pom.xml @@ -370,7 +370,7 @@ under the License. 2.9.5 -4.3.15.RELEASE +4.3.16.RELEASE 4.2.5.RELEASE 2.4.2
[1/5] syncope git commit: [SYNCOPE-1298] Now TaskService#listJobs also reports custom Quartz jobs
Repository: syncope Updated Branches: refs/heads/2_0_X cef777988 -> 0189a50fd refs/heads/master eabaeecb3 -> 321102374 [SYNCOPE-1298] Now TaskService#listJobs also reports custom Quartz jobs Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/86aaa515 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/86aaa515 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/86aaa515 Branch: refs/heads/2_0_X Commit: 86aaa5155167620dd4959c2e128fe3c7cd097f3a Parents: cef7779 Author: Francesco ChicchiriccòAuthored: Tue Apr 10 16:02:14 2018 +0200 Committer: Francesco Chicchiriccò Committed: Tue Apr 10 16:02:14 2018 +0200 -- .../syncope/client/console/pages/BasePage.java | 18 ++--- .../console/panels/AnyObjectDirectoryPanel.java | 10 +-- .../console/panels/GroupDirectoryPanel.java | 20 -- .../console/panels/UserDirectoryPanel.java | 9 ++- .../html/form/ActionLinksTogglePanel.java | 4 +- .../client/console/widgets/JobWidget.java | 12 ++-- .../syncope/common/lib/types/JobType.java | 3 +- .../syncope/core/logic/AbstractJobLogic.java| 74 +--- .../syncope/core/logic/NotificationLogic.java | 2 +- .../apache/syncope/core/logic/ReportLogic.java | 4 +- .../apache/syncope/core/logic/TaskLogic.java| 4 +- 11 files changed, 96 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/86aaa515/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java index 59659a2..b2dd098 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java @@ -162,10 +162,10 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware { liContainer = new WebMarkupContainer(getLIContainerId("topology")); body.add(liContainer); link = BookmarkablePageLinkBuilder.build("topology", Topology.class); -StringBuilder bld = new StringBuilder(); -bld.append(StandardEntitlement.CONNECTOR_LIST).append(","). -append(StandardEntitlement.RESOURCE_LIST).append(","); -MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.RENDER, bld.toString()); +MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.RENDER, +String.format("%s,%s", +StandardEntitlement.CONNECTOR_LIST, +StandardEntitlement.RESOURCE_LIST)); liContainer.add(link); liContainer = new WebMarkupContainer(getLIContainerId("reports")); @@ -201,12 +201,12 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware { liContainer = new WebMarkupContainer(getLIContainerId("securityquestions")); confULContainer.add(liContainer); -bld = new StringBuilder(); -bld.append(StandardEntitlement.SECURITY_QUESTION_CREATE).append(","). - append(StandardEntitlement.SECURITY_QUESTION_DELETE).append(","). -append(StandardEntitlement.SECURITY_QUESTION_UPDATE); link = BookmarkablePageLinkBuilder.build("securityquestions", SecurityQuestions.class); -MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.RENDER, bld.toString()); +MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.RENDER, +String.format("%s,%s,%s", +StandardEntitlement.SECURITY_QUESTION_CREATE, +StandardEntitlement.SECURITY_QUESTION_DELETE, +StandardEntitlement.SECURITY_QUESTION_UPDATE)); liContainer.add(link); liContainer = new WebMarkupContainer(getLIContainerId("types")); http://git-wip-us.apache.org/repos/asf/syncope/blob/86aaa515/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java index 1c2cc52..7a642dc 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java @@ -109,8 +109,9 @@ public class
[5/5] syncope git commit: Upgrading maven-jar-plugin
Upgrading maven-jar-plugin Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/32110237 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/32110237 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/32110237 Branch: refs/heads/master Commit: 3211023745b66a6571d529e0e353eac75ac2e839 Parents: e8e189a Author: Francesco ChicchiriccòAuthored: Tue Apr 10 16:16:16 2018 +0200 Committer: Francesco Chicchiriccò Committed: Tue Apr 10 16:16:30 2018 +0200 -- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/32110237/pom.xml -- diff --git a/pom.xml b/pom.xml index c451398..db2823f 100644 --- a/pom.xml +++ b/pom.xml @@ -460,7 +460,6 @@ under the License. 4.5.5 3.0.0 1.0-alpha-1 -3.0.0 1.1.0 RELEASE82 @@ -1755,7 +1754,7 @@ under the License. org.apache.maven.plugins maven-jar-plugin - 3.0.2 + 3.1.0
[2/5] syncope git commit: [SYNCOPE-1298] Now TaskService#listJobs also reports custom Quartz jobs
[SYNCOPE-1298] Now TaskService#listJobs also reports custom Quartz jobs Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e8e189aa Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e8e189aa Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e8e189aa Branch: refs/heads/master Commit: e8e189aaf32fd8526469d3528c6c38efe38d372f Parents: eabaeec Author: Francesco ChicchiriccòAuthored: Tue Apr 10 16:02:14 2018 +0200 Committer: Francesco Chicchiriccò Committed: Tue Apr 10 16:10:08 2018 +0200 -- .../syncope/client/console/pages/BasePage.java | 10 +-- .../console/panels/AnyObjectDirectoryPanel.java | 8 ++- .../console/panels/GroupDirectoryPanel.java | 18 +++-- .../console/panels/UserDirectoryPanel.java | 8 ++- .../html/form/ActionLinksTogglePanel.java | 4 +- .../client/console/widgets/JobWidget.java | 12 ++-- .../syncope/common/lib/types/JobType.java | 3 +- .../syncope/core/logic/AbstractJobLogic.java| 74 +--- .../syncope/core/logic/NotificationLogic.java | 2 +- .../apache/syncope/core/logic/ReportLogic.java | 4 +- .../apache/syncope/core/logic/TaskLogic.java| 4 +- 11 files changed, 90 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/e8e189aa/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java index 93f385d..17d6717 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java @@ -171,8 +171,9 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware { body.add(liContainer); link = BookmarkablePageLinkBuilder.build("topology", Topology.class); MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.RENDER, -StringUtils.join( -new String[] { StandardEntitlement.CONNECTOR_LIST, StandardEntitlement.CONNECTOR_LIST }, ",")); +String.format("%s,%s", +StandardEntitlement.CONNECTOR_LIST, +StandardEntitlement.RESOURCE_LIST)); liContainer.add(link); liContainer = new WebMarkupContainer(getLIContainerId("reports")); @@ -222,8 +223,9 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware { confULContainer.add(liContainer); link = BookmarkablePageLinkBuilder.build("security", Security.class); MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.RENDER, -StringUtils.join( -new String[] { StandardEntitlement.ROLE_LIST, StandardEntitlement.APPLICATION_LIST }, ",")); +String.format("%s,%s", +StandardEntitlement.ROLE_LIST, +StandardEntitlement.APPLICATION_LIST)); liContainer.add(link); liContainer = new WebMarkupContainer(getLIContainerId("policies")); http://git-wip-us.apache.org/repos/asf/syncope/blob/e8e189aa/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java index 3db9615..7a642dc 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java @@ -109,8 +109,8 @@ public class AnyObjectDirectoryPanel extends AnyDirectoryPanel (new AnyObjectRestClient().read(model.getObject().getKey())), target)); } -}, ActionType.EDIT, StringUtils.join( -new String[] { AnyEntitlement.READ.getFor(type), AnyEntitlement.UPDATE.getFor(type) }, ",")). +}, ActionType.EDIT, +String.format("%s,%s", AnyEntitlement.READ.getFor(type), AnyEntitlement.UPDATE.getFor(type))). setRealm(realm); panel.add(new ActionLink() { @@ -154,7 +154,9 @@ public class AnyObjectDirectoryPanel extends AnyDirectoryPanel
syncope git commit: Upgrading Tomcat
Repository: syncope Updated Branches: refs/heads/2_0_X 792aea9c8 -> cef777988 Upgrading Tomcat Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cef77798 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cef77798 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cef77798 Branch: refs/heads/2_0_X Commit: cef777988752f58be6c1cdaf06ba896601b0c5c3 Parents: 792aea9 Author: Francesco ChicchiriccòAuthored: Tue Apr 10 08:41:54 2018 +0200 Committer: Francesco Chicchiriccò Committed: Tue Apr 10 08:41:54 2018 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/cef77798/pom.xml -- diff --git a/pom.xml b/pom.xml index 8e554b1..c14b9da 100644 --- a/pom.xml +++ b/pom.xml @@ -490,7 +490,7 @@ under the License. ${log.directory}/cargo.log ${log.directory}/cargo-output.log -8.5.29 +8.5.30 1.2.0 2.1.1