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/03/06 12:54:14 UTC
[2/2] syncope git commit: Upgrading Spring Security
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/a8827b52
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a8827b52
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a8827b52
Branch: refs/heads/master
Commit: a8827b52466a4f777349cf1fcb27e18bf3590bf0
Parents: b2b8ee1
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Mon Mar 6 13:48:32 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Mon Mar 6 13:49:07 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/syncope/common/lib/to/CamelRouteTO.java | 4 +++-
pom.xml | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8827b52/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java
----------------------------------------------------------------------
diff --git a/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java b/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java
index 7c82c94..2425450 100644
--- a/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java
+++ b/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java
@@ -26,7 +26,7 @@ import org.apache.syncope.common.lib.types.AnyTypeKind;
@XmlRootElement(name = "camelRoute")
@XmlType
-public class CamelRouteTO extends AbstractBaseBean {
+public class CamelRouteTO extends AbstractBaseBean implements EntityTO {
private static final long serialVersionUID = 6431992877435181674L;
@@ -36,11 +36,13 @@ public class CamelRouteTO extends AbstractBaseBean {
private String content;
+ @Override
public String getKey() {
return key;
}
@PathParam("key")
+ @Override
public void setKey(final String key) {
this.key = key;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8827b52/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6743c70..165674d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,12 +359,10 @@ under the License.
<cxf.version>3.2.0-SNAPSHOT</cxf.version>
- <camel.version>2.18.2</camel.version>
-
<jackson.version>2.8.7</jackson.version>
<spring.version>4.3.7.RELEASE</spring.version>
- <spring-security.version>4.2.1.RELEASE</spring-security.version>
+ <spring-security.version>4.2.2.RELEASE</spring-security.version>
<openjpa.version>3.0.0-SNAPSHOT</openjpa.version>
<commons-dbcp.version>2.1.1</commons-dbcp.version>
@@ -380,6 +378,8 @@ under the License.
<activiti.version>5.22.0</activiti.version>
+ <camel.version>2.18.2</camel.version>
+
<slf4j.version>1.7.24</slf4j.version>
<log4j.version>2.8.1</log4j.version>
<disruptor.version>3.3.6</disruptor.version>