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 2017/09/18 10:44:15 UTC
[1/4] syncope git commit: Upgrading Spring, Elasticsearch,
maven-dependency-plugin, maven-surefire-plugin and maven-failsafe-plugin
Repository: syncope
Updated Branches:
refs/heads/2_0_X 4866d9219 -> 98e710cb1
refs/heads/master 2cb546fe0 -> 220a94642
Upgrading Spring, Elasticsearch, maven-dependency-plugin, maven-surefire-plugin and maven-failsafe-plugin
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7ce00934
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7ce00934
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7ce00934
Branch: refs/heads/2_0_X
Commit: 7ce00934dfeeafb4a58b309afb66ac063e3b2f38
Parents: 4866d92
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Sep 18 09:59:23 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Sep 18 09:59:23 2017 +0200
----------------------------------------------------------------------
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/7ce00934/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 771a1c0..15768aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -368,7 +368,7 @@ under the License.
<jackson.version>2.9.1</jackson.version>
- <spring.version>4.3.10.RELEASE</spring.version>
+ <spring.version>4.3.11.RELEASE</spring.version>
<spring-security.version>4.2.3.RELEASE</spring-security.version>
<openjpa.version>2.4.2</openjpa.version>
@@ -391,7 +391,7 @@ under the License.
<slf4j.version>1.7.25</slf4j.version>
<opensaml.version>3.3.0</opensaml.version>
- <elasticsearch.version>5.5.2</elasticsearch.version>
+ <elasticsearch.version>5.6.0</elasticsearch.version>
<log4j.version>2.9.0</log4j.version>
<disruptor.version>3.3.6</disruptor.version>
@@ -1766,7 +1766,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2</version>
<configuration>
<outputDirectory>${bundles.directory}</outputDirectory>
<useBaseVersion>true</useBaseVersion>
@@ -1875,7 +1875,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
+ <version>2.20.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
@@ -1886,7 +1886,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20</version>
+ <version>2.20.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
@@ -2266,7 +2266,7 @@ under the License.
<link>http://www.flowable.org/docs/javadocs/</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-saml-api/3.3.0/opensaml-saml-api-3.3.0-javadoc.jar/!/index.html</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-core/3.3.0/opensaml-core-3.3.0-javadoc.jar/!/index.html</link>
- <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/5.5.1</link>
+ <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/5.6.0</link>
</links>
</configuration>
<reportSets>
[4/4] syncope git commit: [SYNCOPE-1207] Refresh user object before
working on it (as it could have been stored as workflow property)
Posted by il...@apache.org.
[SYNCOPE-1207] Refresh user object before working on it (as it could have been stored as workflow property)
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/98e710cb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/98e710cb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/98e710cb
Branch: refs/heads/2_0_X
Commit: 98e710cb108b51f75fea6b950531f520928ccbb6
Parents: 7ce0093
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Sep 18 12:42:41 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Sep 18 12:44:09 2017 +0200
----------------------------------------------------------------------
.../org/apache/syncope/core/workflow/activiti/task/Update.java | 5 +++++
.../org/apache/syncope/core/workflow/flowable/task/Update.java | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/98e710cb/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/task/Update.java
----------------------------------------------------------------------
diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/task/Update.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/task/Update.java
index b73179b..ab1edba 100644
--- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/task/Update.java
+++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/task/Update.java
@@ -24,6 +24,7 @@ import org.apache.syncope.common.lib.patch.PasswordPatch;
import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.UserTO;
+import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.provisioning.api.data.UserDataBinder;
@@ -37,6 +38,9 @@ public class Update extends AbstractActivitiServiceTask {
@Autowired
private UserDataBinder dataBinder;
+ @Autowired
+ private UserDAO userDAO;
+
@Override
protected void doExecute(final String executionId) {
User user = engine.getRuntimeService().
@@ -44,6 +48,7 @@ public class Update extends AbstractActivitiServiceTask {
UserPatch userPatch = engine.getRuntimeService().
getVariable(executionId, ActivitiUserWorkflowAdapter.USER_PATCH, UserPatch.class);
+ user = userDAO.save(user);
UserTO original = dataBinder.getUserTO(user, true);
PropagationByResource propByRes = dataBinder.update(user, userPatch);
http://git-wip-us.apache.org/repos/asf/syncope/blob/98e710cb/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/task/Update.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/task/Update.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/task/Update.java
index 7f1c114..e9ed279 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/task/Update.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/task/Update.java
@@ -24,6 +24,7 @@ import org.apache.syncope.common.lib.patch.PasswordPatch;
import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.UserTO;
+import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.provisioning.api.data.UserDataBinder;
@@ -37,6 +38,9 @@ public class Update extends AbstractFlowableServiceTask {
@Autowired
private UserDataBinder dataBinder;
+ @Autowired
+ private UserDAO userDAO;
+
@Override
protected void doExecute(final String executionId) {
User user = engine.getRuntimeService().
@@ -44,6 +48,7 @@ public class Update extends AbstractFlowableServiceTask {
UserPatch userPatch = engine.getRuntimeService().
getVariable(executionId, FlowableUserWorkflowAdapter.USER_PATCH, UserPatch.class);
+ user = userDAO.save(user);
UserTO original = dataBinder.getUserTO(user, true);
PropagationByResource propByRes = dataBinder.update(user, userPatch);
[3/4] syncope git commit: [SYNCOPE-1207] Refresh user object before
working on it (as it could have been stored as workflow property)
Posted by il...@apache.org.
[SYNCOPE-1207] Refresh user object before working on it (as it could have been stored as workflow property)
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/220a9464
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/220a9464
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/220a9464
Branch: refs/heads/master
Commit: 220a9464233cd9872ba6763fdf6f4fdf867d2581
Parents: 322bee2
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Sep 18 12:42:41 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Sep 18 12:42:41 2017 +0200
----------------------------------------------------------------------
.../org/apache/syncope/core/workflow/flowable/task/Update.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/220a9464/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/task/Update.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/task/Update.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/task/Update.java
index 7f1c114..e9ed279 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/task/Update.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/task/Update.java
@@ -24,6 +24,7 @@ import org.apache.syncope.common.lib.patch.PasswordPatch;
import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.UserTO;
+import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.provisioning.api.data.UserDataBinder;
@@ -37,6 +38,9 @@ public class Update extends AbstractFlowableServiceTask {
@Autowired
private UserDataBinder dataBinder;
+ @Autowired
+ private UserDAO userDAO;
+
@Override
protected void doExecute(final String executionId) {
User user = engine.getRuntimeService().
@@ -44,6 +48,7 @@ public class Update extends AbstractFlowableServiceTask {
UserPatch userPatch = engine.getRuntimeService().
getVariable(executionId, FlowableUserWorkflowAdapter.USER_PATCH, UserPatch.class);
+ user = userDAO.save(user);
UserTO original = dataBinder.getUserTO(user, true);
PropagationByResource propByRes = dataBinder.update(user, userPatch);
[2/4] syncope git commit: Upgrading Spring, Elasticsearch,
maven-dependency-plugin, maven-surefire-plugin and maven-failsafe-plugin,
Camel
Posted by il...@apache.org.
Upgrading Spring, Elasticsearch, maven-dependency-plugin, maven-surefire-plugin and maven-failsafe-plugin, Camel
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/322bee21
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/322bee21
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/322bee21
Branch: refs/heads/master
Commit: 322bee21a3dd7cdb77303a6ac961b8fccd527533
Parents: 2cb546f
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Sep 18 09:59:23 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Sep 18 11:10:11 2017 +0200
----------------------------------------------------------------------
pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/322bee21/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2fa3f73..fef46f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -368,7 +368,7 @@ under the License.
<jackson.version>2.9.1</jackson.version>
- <spring.version>4.3.10.RELEASE</spring.version>
+ <spring.version>4.3.11.RELEASE</spring.version>
<spring-security.version>4.2.3.RELEASE</spring-security.version>
<openjpa.version>3.0.0-SNAPSHOT</openjpa.version>
@@ -385,12 +385,12 @@ under the License.
<flowable.version>6.1.2</flowable.version>
- <camel.version>2.19.2</camel.version>
+ <camel.version>2.19.3</camel.version>
<slf4j.version>1.7.25</slf4j.version>
<opensaml.version>3.3.0</opensaml.version>
- <elasticsearch.version>5.5.2</elasticsearch.version>
+ <elasticsearch.version>5.6.0</elasticsearch.version>
<log4j.version>2.9.0</log4j.version>
<disruptor.version>3.3.6</disruptor.version>
@@ -1679,7 +1679,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2</version>
<configuration>
<outputDirectory>${bundles.directory}</outputDirectory>
<useBaseVersion>true</useBaseVersion>
@@ -1788,7 +1788,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
+ <version>2.20.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
@@ -1799,7 +1799,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20</version>
+ <version>2.20.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
@@ -2177,7 +2177,7 @@ under the License.
<link>http://www.flowable.org/docs/javadocs/</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-saml-api/3.3.0/opensaml-saml-api-3.3.0-javadoc.jar/!/index.html</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-core/3.3.0/opensaml-core-3.3.0-javadoc.jar/!/index.html</link>
- <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/5.5.1</link>
+ <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/5.6.0</link>
</links>
</configuration>
<reportSets>