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/11/28 14:55:11 UTC
[1/2] syncope git commit: Upgrading Spring Security
Repository: syncope
Updated Branches:
refs/heads/master 131c94598 -> 63ea870ef
Upgrading Spring Security
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/60c4dc33
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/60c4dc33
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/60c4dc33
Branch: refs/heads/master
Commit: 60c4dc330971ea01a3b11ed3c0a8bea0bb9fac76
Parents: 131c945
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Nov 28 15:39:55 2017 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Nov 28 15:39:55 2017 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/60c4dc33/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 269bf8c..afca95f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -370,7 +370,7 @@ under the License.
<jackson.version>2.9.2</jackson.version>
<spring.version>5.0.2.RELEASE</spring.version>
- <spring-security.version>4.2.3.RELEASE</spring-security.version>
+ <spring-security.version>5.0.0.RELEASE</spring-security.version>
<openjpa.version>3.0.0-SNAPSHOT</openjpa.version>
<hikaricp.version>2.7.4</hikaricp.version>
[2/2] syncope git commit: Removing Camel deprecation
Posted by il...@apache.org.
Removing Camel deprecation
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/63ea870e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/63ea870e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/63ea870e
Branch: refs/heads/master
Commit: 63ea870ef87301bc75708ba2de5870e7549dfe9f
Parents: 60c4dc3
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Nov 28 15:55:01 2017 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Nov 28 15:55:01 2017 +0100
----------------------------------------------------------------------
.../provisioning/camel/AbstractCamelProvisioningManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/63ea870e/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AbstractCamelProvisioningManager.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AbstractCamelProvisioningManager.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AbstractCamelProvisioningManager.java
index 30ae2b3..61be149 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AbstractCamelProvisioningManager.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/AbstractCamelProvisioningManager.java
@@ -56,7 +56,7 @@ abstract class AbstractCamelProvisioningManager {
protected void sendMessage(final String uri, final Object obj) {
Exchange exchange = new DefaultExchange(contextFactory.getContext());
- DefaultMessage message = new DefaultMessage();
+ DefaultMessage message = new DefaultMessage(camelContext);
message.setBody(obj);
exchange.setIn(message);
@@ -72,7 +72,7 @@ abstract class AbstractCamelProvisioningManager {
LOG.debug("Added property {}", property.getKey());
}
- DefaultMessage message = new DefaultMessage();
+ DefaultMessage message = new DefaultMessage(camelContext);
message.setBody(body);
exchange.setIn(message);
ProducerTemplate template = contextFactory.getContext().createProducerTemplate();