You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/07/08 18:02:34 UTC

[1/3] git commit: Recording .gitmergeinfo Changes

Repository: cxf
Updated Branches:
  refs/heads/2.6.x-fixes c97b70d3b -> f5ac8ade5


Recording .gitmergeinfo Changes


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

Branch: refs/heads/2.6.x-fixes
Commit: 03d4e4fa81097e07607b60c439bb2f0b8f0833b8
Parents: c97b70d
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jul 8 12:31:21 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jul 8 12:31:21 2014 +0100

----------------------------------------------------------------------
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/03d4e4fa/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7119294..d84f983 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1096,6 +1096,7 @@ B edb511d80d8d2da5dbc7cbac11b163220af7159e
 B edf7fa420cc93a4eb076f5e88fdaffbf54a71032
 B ee2b03d12f4ff1f8561c8f5c6f0b32b5ffa89367
 B ee43b2eafd017f46ce5d6a9321ef542db9f7f5a1
+B ee8f8ad0a794d0cde8de016ebccd43a2c79f404c
 B ee945ff2ea8baa33a24e498b93e46f46b6bb163a
 B eea391ab15742c2eb26cace2034554a77508287e
 B eed07c1cfc85ab8d2ab42f0fd815ac09358e60f0


[2/3] git commit: Recording .gitmergeinfo Changes

Posted by co...@apache.org.
Recording .gitmergeinfo Changes


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

Branch: refs/heads/2.6.x-fixes
Commit: b06edc91415767b4377401bddacf7889bdeb52a3
Parents: 03d4e4f
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jul 8 17:00:14 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jul 8 17:00:14 2014 +0100

----------------------------------------------------------------------
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/b06edc91/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d84f983..ca3b398 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -830,6 +830,7 @@ B b155272e2089c4a6ff1c034d3d922a00287d1219
 B b1614d5586362221396699545b84fc7f2caf4e74
 B b1c1b78ba892c058073f32a2f151bac7367395fd
 B b1d4e4f95155b2ab83c0b3932812e1a612e7c73f
+B b2577c8136dc61e557aa8bcb10631e0490453c87
 B b324dc013769819e2ffc9d866127debd1e419de3
 B b36e8a985e4cd3a781b38c7d581371de31de7800
 B b39ec4a376ffa11c097177a3cc107e826d2d8962


[3/3] git commit: Updating WSS4J + Santuario

Posted by co...@apache.org.
Updating WSS4J + Santuario


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

Branch: refs/heads/2.6.x-fixes
Commit: f5ac8ade53d25b0a1d45972281a9ab03ed757d5c
Parents: b06edc9
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jul 8 17:02:22 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jul 8 17:02:22 2014 +0100

----------------------------------------------------------------------
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f5ac8ade/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e0ed56b..3c7ac04 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -149,7 +149,7 @@
         <cxf.woodstox.core.version>4.4.0</cxf.woodstox.core.version>
         <cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
         <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
-        <cxf.wss4j.version>1.6.15</cxf.wss4j.version>
+        <cxf.wss4j.version>1.6.16</cxf.wss4j.version>
         <cxf.xerces.version>2.9.1</cxf.xerces.version>
         <cxf.xmlbeans.version>2.5.0</cxf.xmlbeans.version>
         <cxf.xmlschema.version>2.0.3</cxf.xmlschema.version>
@@ -170,7 +170,7 @@
         <cxf.jaxb.bundle.version>2.2.1.1_2</cxf.jaxb.bundle.version>
         <cxf.saaj-impl.bundle.version>1.3.23_1</cxf.saaj-impl.bundle.version>
         <cxf.wsdl4j.bundle.version>1.6.3_1</cxf.wsdl4j.bundle.version>
-        <cxf.xmlsec.bundle.version>1.5.6</cxf.xmlsec.bundle.version>
+        <cxf.xmlsec.bundle.version>1.5.7</cxf.xmlsec.bundle.version>
         <cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
         <cxf.xmlresolver.bundle.version>1.2_5</cxf.xmlresolver.bundle.version>
         <cxf.xerces.bundle.version>2.9.1_5</cxf.xerces.bundle.version>