Repository: syncope Updated Branches: refs/heads/2_0_X 247868da3 -> fbeeecd3e refs/heads/master b2b8ee199 -> a8827b524
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/fbeeecd3 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fbeeecd3 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fbeeecd3 Branch: refs/heads/2_0_X Commit: fbeeecd3ed87d7bce3cc702b3b111b2c9a7bbf0e Parents: 247868d Author: Francesco Chicchiriccò <[email protected]> Authored: Mon Mar 6 13:48:32 2017 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Mon Mar 6 13:48:32 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/fbeeecd3/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/fbeeecd3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 399bf3e..7092a33 100644 --- a/pom.xml +++ b/pom.xml @@ -359,12 +359,10 @@ under the License. <cxf.version>3.1.10</cxf.version> - <camel.version>2.17.5</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>2.4.2</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.17.5</camel.version> + <slf4j.version>1.7.24</slf4j.version> <log4j.version>2.8.1</log4j.version> <disruptor.version>3.3.6</disruptor.version>
