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 2015/01/05 14:34:52 UTC
[47/53] [abbrv] syncope git commit: Merge upstream/master
Merge upstream/master
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d388f246
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d388f246
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d388f246
Branch: refs/heads/2_0_X
Commit: d388f2464d145bd780bb8b2de76b63c52e459c62
Parents: ec34515 1d58c50
Author: giacomolm <gi...@hotmail.it>
Authored: Mon Jan 5 11:58:26 2015 +0100
Committer: giacomolm <gi...@hotmail.it>
Committed: Mon Jan 5 11:58:26 2015 +0100
----------------------------------------------------------------------
.../syncope/installer/utilities/FileSystemUtils.java | 10 +---------
pom.xml | 15 +++++++++++++--
src/site/site.xml | 3 ---
3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d388f246/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 641e123,9891ca9..1fe0129
--- a/pom.xml
+++ b/pom.xml
@@@ -323,10 -335,9 +334,10 @@@ under the License
<activiti.version>5.16.4</activiti.version>
<aspectj.version>1.8.4</aspectj.version>
--
- <cxf.version>3.0.3</cxf.version>
++
+ <cxf.version>3.0.3</cxf.version>
+ <camel.version>2.14.1</camel.version>
- <spring.version>4.0.8.RELEASE</spring.version>
+ <spring.version>4.0.9.RELEASE</spring.version>
<spring-security.version>3.2.5.RELEASE</spring-security.version>
<jackson.version>2.4.4</jackson.version>
<velocity.version>1.7</velocity.version>