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/02/16 14:48:07 UTC

[1/6] syncope git commit: Upgrading CXF

Repository: syncope
Updated Branches:
  refs/heads/1_1_X 6f0fbc179 -> b88be93e1
  refs/heads/1_2_X fc0c8a6ca -> 95b6ea59d
  refs/heads/master 3d3d7a13d -> 21149fdc1


Upgrading CXF


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

Branch: refs/heads/1_1_X
Commit: b88be93e188f9754b44a2126c14bb755df314779
Parents: 6f0fbc1
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 16 14:46:56 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 16 14:46:56 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/syncope/blob/b88be93e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b02c2f3..8b70487 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,7 +320,7 @@ under the License.
 
     <activiti.version>5.15.1</activiti.version>
 
-    <cxf.version>2.7.14</cxf.version>	
+    <cxf.version>2.7.15</cxf.version>	
     <spring.version>3.2.13.RELEASE</spring.version>
     <spring-security.version>3.1.7.RELEASE</spring-security.version>
     <aspectj.version>1.7.4</aspectj.version>


[4/6] syncope git commit: Merge branch '1_1_X' into 1_2_X

Posted by il...@apache.org.
Merge branch '1_1_X' into 1_2_X

Conflicts:
	pom.xml


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

Branch: refs/heads/master
Commit: 95b6ea59d15045e9cec9e91bfdc8d994873b091d
Parents: fc0c8a6 b88be93
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 16 14:47:39 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 16 14:47:39 2015 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------



[2/6] syncope git commit: Upgrading CXF

Posted by il...@apache.org.
Upgrading CXF


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

Branch: refs/heads/1_2_X
Commit: b88be93e188f9754b44a2126c14bb755df314779
Parents: 6f0fbc1
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 16 14:46:56 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 16 14:46:56 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/syncope/blob/b88be93e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b02c2f3..8b70487 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,7 +320,7 @@ under the License.
 
     <activiti.version>5.15.1</activiti.version>
 
-    <cxf.version>2.7.14</cxf.version>	
+    <cxf.version>2.7.15</cxf.version>	
     <spring.version>3.2.13.RELEASE</spring.version>
     <spring-security.version>3.1.7.RELEASE</spring-security.version>
     <aspectj.version>1.7.4</aspectj.version>


[6/6] syncope git commit: Merge branch '1_2_X'

Posted by il...@apache.org.
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/21149fdc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/21149fdc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/21149fdc

Branch: refs/heads/master
Commit: 21149fdc16838b2a2776c5355b10d43e3b9e2083
Parents: 3d3d7a1 95b6ea5
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 16 14:47:58 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 16 14:47:58 2015 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------



[3/6] syncope git commit: Upgrading CXF

Posted by il...@apache.org.
Upgrading CXF


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

Branch: refs/heads/master
Commit: b88be93e188f9754b44a2126c14bb755df314779
Parents: 6f0fbc1
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 16 14:46:56 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 16 14:46:56 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/syncope/blob/b88be93e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b02c2f3..8b70487 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,7 +320,7 @@ under the License.
 
     <activiti.version>5.15.1</activiti.version>
 
-    <cxf.version>2.7.14</cxf.version>	
+    <cxf.version>2.7.15</cxf.version>	
     <spring.version>3.2.13.RELEASE</spring.version>
     <spring-security.version>3.1.7.RELEASE</spring-security.version>
     <aspectj.version>1.7.4</aspectj.version>


[5/6] syncope git commit: Merge branch '1_1_X' into 1_2_X

Posted by il...@apache.org.
Merge branch '1_1_X' into 1_2_X

Conflicts:
	pom.xml


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

Branch: refs/heads/1_2_X
Commit: 95b6ea59d15045e9cec9e91bfdc8d994873b091d
Parents: fc0c8a6 b88be93
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 16 14:47:39 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 16 14:47:39 2015 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------