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 2015/12/02 13:45:22 UTC

[1/2] cxf git commit: Disabling some tests that continually fail on Jenkins

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d63cde6bc -> bcbf6534f


Disabling some tests that continually fail on Jenkins


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

Branch: refs/heads/3.0.x-fixes
Commit: c32a98ca3d96ac59d8d550bd5073df6b94aa9ea9
Parents: d63cde6
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Dec 2 12:44:05 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Dec 2 12:45:17 2015 +0000

----------------------------------------------------------------------
 .../test/java/org/apache/cxf/javascript/JsHttpRequestTest.java    | 3 ++-
 .../org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java    | 2 ++
 .../java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java    | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/c32a98ca/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
index c29f22d..b2055a0 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
@@ -43,8 +43,9 @@ import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.support.GenericApplicationContext;
 
 /**
- * 
+ * This test is ignored by default as it is continually failing on Jenkins.
  */
+@org.junit.Ignore
 public class JsHttpRequestTest extends AbstractCXFSpringTest {
 
     // shadow declaration from base class.

http://git-wip-us.apache.org/repos/asf/cxf/blob/c32a98ca/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
index 81448d5..ae45f51 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
@@ -58,7 +58,9 @@ import org.springframework.core.io.Resource;
 /**
  * This class tests starting up and shutting down the embedded server when there
  * is extra jetty configuration.
+ * This test is ignored by default as it is continually failing on Jenkins.
  */
+@org.junit.Ignore
 public class EngineLifecycleTest extends Assert {
     private static final String PORT1 = TestUtil.getPortNumber(EngineLifecycleTest.class, 1);
     private static final String PORT2 = TestUtil.getPortNumber(EngineLifecycleTest.class, 2);

http://git-wip-us.apache.org/repos/asf/cxf/blob/c32a98ca/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index 7afd9e8..27236f8 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -484,7 +484,9 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
         assertFalse(orginal.exists());
     }
 
+    // @Ignore'd due to continually failing on Jenkins
     @Test
+    @org.junit.Ignore
     public void testHelloWorldExternalBindingFile() throws Exception {
         ServerSocket sock = new ServerSocket(0);
         int port = sock.getLocalPort();


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

Branch: refs/heads/3.0.x-fixes
Commit: bcbf6534f95da67d8e4d1e5991171aa5c8f134e0
Parents: c32a98c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Dec 2 12:45:18 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Dec 2 12:45:18 2015 +0000

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/bcbf6534/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ff645de..277a22a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -622,6 +622,7 @@ M 431ade6fe85f4d13f56aa4bc530cb50353be0dd5
 M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f
 M 44bf65e6dd21fbbde4c24685b20dcbcb0f0ccc1d
 M 4640cf1ea20eee09ae650b706bce765a16affc8b
+M 4685f06871bf35cee184d020fed025ae9491cb02
 M 4715a0ddce4864bbf6e1c34a7a1cd9508a52d9cd
 M 4752e7af3855bb7e527e61dd06fcbd475098f7b1
 M 4772f956294ef139cb9993bd5aeaf7a4cb239dbb