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 2016/01/11 15:02:45 UTC

[1/2] cxf git commit: Recording .gitmergeinfo Changes

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes f79eaf42d -> 2caad0c68


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/2caad0c6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2caad0c6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2caad0c6

Branch: refs/heads/3.1.x-fixes
Commit: 2caad0c68309fc3f2ccd8aa4795e489c674eab7f
Parents: ac120f4
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jan 11 13:58:11 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jan 11 13:58:11 2016 +0000

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/2caad0c6/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 436297c..a6177bd 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -17,3 +17,4 @@ B f94e1dd9b2a8d27ec5a27bfb7c026e3ae2350e39
 B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
 M 0222768baf6b60742c4a8332308edf2be0f4a2e4
 M 8583a24ac541dc373503d7a6c59cd90890acdae3
+M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d

[2/2] cxf git commit: Enabling some tests following WSS4J fix

Posted by co...@apache.org.
Enabling some tests following WSS4J fix


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

Branch: refs/heads/3.1.x-fixes
Commit: ac120f4fcea28162721fbdf4bd8a6a9e071cd540
Parents: f79eaf4
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jan 11 12:12:55 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jan 11 13:58:11 2016 +0000

----------------------------------------------------------------------
 .../apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ac120f4f/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
index 68eaec5..42aa986 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
@@ -182,7 +182,7 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase {
     @org.junit.Ignore
     public void testUsernameTokenSAML2KeyValue() throws Exception {
         // TODO
-        if (test.isStreaming() || STAX_PORT.equals(test.getPort())) {
+        if (STAX_PORT.equals(test.getPort())) {
             return;
         }