[syncope] branch master updated: Upgrading Camel
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/master by this push: new fe090c9 Upgrading Camel fe090c9 is described below commit fe090c99c707502a29616f4b00e3246de762a06c Author: Francesco Chicchiriccò AuthorDate: Thu Nov 29 17:06:49 2018 +0100 Upgrading Camel --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 26f73fa..ea753c9 100644 --- a/pom.xml +++ b/pom.xml @@ -410,7 +410,7 @@ under the License. 6.4.0 -2.22.2 +2.23.0 1.7.25 3.3.0 @@ -2316,8 +2316,8 @@ under the License. http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/ http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.9.pr1/ http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.9/ - http://www.javadoc.io/doc/org.apache.camel/camel-core/2.22.2/ - http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.22.2/ + http://www.javadoc.io/doc/org.apache.camel/camel-core/2.23.0/ + http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.23.0/ https://ci.apache.org/projects/wicket/apidocs/8.x/ https://commons.apache.org/proper/commons-lang/javadocs/api-release/ https://commons.apache.org/proper/commons-io/javadocs/api-2.6/
[syncope] branch 2_1_X updated: Upgrading Camel
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 db7550a Upgrading Camel db7550a is described below commit db7550ae9001e61d50204354c3a0456d1e93713d Author: Francesco Chicchiriccò AuthorDate: Thu Nov 29 17:06:49 2018 +0100 Upgrading Camel --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 150d3ec..e9b6aff 100644 --- a/pom.xml +++ b/pom.xml @@ -410,7 +410,7 @@ under the License. 6.4.0 -2.22.2 +2.23.0 1.7.25 3.3.0 @@ -2316,8 +2316,8 @@ under the License. http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/ http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.9.pr1/ http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.9/ - http://www.javadoc.io/doc/org.apache.camel/camel-core/2.22.2/ - http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.22.2/ + http://www.javadoc.io/doc/org.apache.camel/camel-core/2.23.0/ + http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.23.0/ https://ci.apache.org/projects/wicket/apidocs/8.x/ https://commons.apache.org/proper/commons-lang/javadocs/api-release/ https://commons.apache.org/proper/commons-io/javadocs/api-2.6/
[syncope] branch 2_0_X updated: [SYNCOPE-1394] Fix old sorted query
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new d0f48df [SYNCOPE-1394] Fix old sorted query
d0f48df is described below
commit d0f48df73e2bfbcf32a65c0dd21a3ed288b1e584
Author: skylark17
AuthorDate: Thu Nov 29 17:24:21 2018 +0100
[SYNCOPE-1394] Fix old sorted query
---
.../syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java | 4 ++--
.../syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
index f85fdf6..0953276 100644
---
a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
+++
b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
@@ -674,8 +674,8 @@ public class ActivitiUserWorkflowAdapter extends
AbstractUserWorkflowAdapter {
sortedQuery = sortedQuery.orderByTaskDueDate();
break;
-case "owner":
-sortedQuery = sortedQuery.orderByTaskOwner();
+case "assignee":
+sortedQuery = sortedQuery.orderByTaskAssignee();
break;
default:
diff --git
a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
index d8d2221..872c816 100644
---
a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
+++
b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
@@ -673,8 +673,8 @@ public class FlowableUserWorkflowAdapter extends
AbstractUserWorkflowAdapter {
sortedQuery = sortedQuery.orderByTaskDueDate();
break;
-case "owner":
-sortedQuery = sortedQuery.orderByTaskOwner();
+case "assignee":
+sortedQuery = sortedQuery.orderByTaskAssignee();
break;
default:
Syncope-2_1_X-deploy - Build # 236 - Failure
The Apache Jenkins build system has built Syncope-2_1_X-deploy (build #236) Status: Failure Check console output at https://builds.apache.org/job/Syncope-2_1_X-deploy/236/ to view the results.
