You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/03/27 13:29:21 UTC
[1/3] syncope git commit: White noise: format
Repository: syncope
Updated Branches:
refs/heads/2_0_X 544766423 -> 364bf13a6
refs/heads/master a9e83e85b -> 4a7a5c4a6
White noise: format
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cde6c5bc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cde6c5bc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cde6c5bc
Branch: refs/heads/master
Commit: cde6c5bc6ee611b138996ee57cf7fb031a55560c
Parents: a9e83e8
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Mar 26 16:20:03 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Mar 26 16:20:03 2018 +0200
----------------------------------------------------------------------
.../core/provisioning/java/job/TaskJob.java | 43 ++++++++++----------
1 file changed, 21 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/cde6c5bc/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java
index d5fe4dc..962edc4 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java
@@ -73,30 +73,29 @@ public class TaskJob extends AbstractInterruptableJob {
@Override
public void execute(final JobExecutionContext context) throws JobExecutionException {
try {
- AuthContextUtils.execWithAuthContext(context.getMergedJobDataMap().getString(JobManager.DOMAIN_KEY),
- () -> {
- try {
- ImplementationDAO implementationDAO =
+ AuthContextUtils.execWithAuthContext(context.getMergedJobDataMap().getString(JobManager.DOMAIN_KEY), () -> {
+ try {
+ ImplementationDAO implementationDAO =
ApplicationContextProvider.getApplicationContext().getBean(ImplementationDAO.class);
- Implementation implementation = implementationDAO.find(
- context.getMergedJobDataMap().getString(DELEGATE_IMPLEMENTATION));
- if (implementation == null) {
- LOG.error("Could not find Implementation '{}', aborting",
- context.getMergedJobDataMap().getString(DELEGATE_IMPLEMENTATION));
- } else {
- delegate = ImplementationManager.<SchedTaskJobDelegate>build(implementation);
- delegate.execute(
- taskKey,
- context.getMergedJobDataMap().getBoolean(DRY_RUN_JOBDETAIL_KEY),
- context);
- }
- } catch (Exception e) {
- LOG.error("While executing task {}", taskKey, e);
- throw new RuntimeException(e);
- }
+ Implementation implementation = implementationDAO.find(
+ context.getMergedJobDataMap().getString(DELEGATE_IMPLEMENTATION));
+ if (implementation == null) {
+ LOG.error("Could not find Implementation '{}', aborting",
+ context.getMergedJobDataMap().getString(DELEGATE_IMPLEMENTATION));
+ } else {
+ delegate = ImplementationManager.<SchedTaskJobDelegate>build(implementation);
+ delegate.execute(
+ taskKey,
+ context.getMergedJobDataMap().getBoolean(DRY_RUN_JOBDETAIL_KEY),
+ context);
+ }
+ } catch (Exception e) {
+ LOG.error("While executing task {}", taskKey, e);
+ throw new RuntimeException(e);
+ }
- return null;
- });
+ return null;
+ });
} catch (RuntimeException e) {
LOG.error("While executing task {}", taskKey, e);
throw new JobExecutionException("While executing task " + taskKey, e);
[2/3] syncope git commit: Upgrading Jackson
Posted by il...@apache.org.
Upgrading Jackson
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/364bf13a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/364bf13a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/364bf13a
Branch: refs/heads/2_0_X
Commit: 364bf13a6df50ffc32772200a18d00020dc43497
Parents: 5447664
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Mar 27 15:29:03 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Mar 27 15:29:03 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/364bf13a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d4a7a97..931a0bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -368,7 +368,7 @@ under the License.
<cxf.version>3.1.15</cxf.version>
- <jackson.version>2.9.4</jackson.version>
+ <jackson.version>2.9.5</jackson.version>
<spring.version>4.3.14.RELEASE</spring.version>
<spring-security.version>4.2.4.RELEASE</spring-security.version>
[3/3] syncope git commit: Upgrading Jackson
Posted by il...@apache.org.
Upgrading Jackson
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4a7a5c4a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4a7a5c4a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4a7a5c4a
Branch: refs/heads/master
Commit: 4a7a5c4a675a7099a35b3b6e5df01c7d52d9a1f8
Parents: cde6c5b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Mar 27 15:29:03 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Mar 27 15:29:10 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4a7a5c4a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0310f9a..43b52b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -368,7 +368,7 @@ under the License.
<cxf.version>3.2.4</cxf.version>
- <jackson.version>2.9.4</jackson.version>
+ <jackson.version>2.9.5</jackson.version>
<spring.version>5.0.4.RELEASE</spring.version>
<spring-security.version>5.0.3.RELEASE</spring-security.version>