syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [6/8] syncope git commit: Merge branch '1_2_X'
Date Thu, 15 Jan 2015 14:27:05 GMT
Merge branch '1_2_X'


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7570a5fc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7570a5fc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7570a5fc

Branch: refs/heads/master
Commit: 7570a5fc8c41bef10145c660f8b569176ebb3775
Parents: 5e1fe61 9ceb71a
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Thu Jan 15 15:26:17 2015 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Thu Jan 15 15:26:17 2015 +0100

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/7570a5fc/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 1ac38d3,86fff48..0ad592f
--- a/pom.xml
+++ b/pom.xml
@@@ -335,12 -336,11 +335,12 @@@ 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.9.RELEASE</spring.version>
      <spring-security.version>3.2.5.RELEASE</spring-security.version>
-     <jackson.version>2.4.4</jackson.version>
+     <jackson.version>2.4.5</jackson.version>
      <velocity.version>1.7</velocity.version>
      <velocitytools.version>2.0</velocitytools.version>
      <quartz.version>2.2.1</quartz.version>


Mime
View raw message