You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/09/01 19:57:35 UTC
[1/2] cxf git commit: Fix checkstyle issue
Repository: cxf
Updated Branches:
refs/heads/master 0e844a78e -> 171dc6c8c
Fix checkstyle issue
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/22f96485
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/22f96485
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/22f96485
Branch: refs/heads/master
Commit: 22f96485440b5944223c07e997cfd4d798e15338
Parents: 0e844a7
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Sep 1 15:15:37 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 1 15:15:37 2017 -0400
----------------------------------------------------------------------
.../websocket/atmosphere/AtmosphereWebSocketJettyDestination.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/22f96485/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
index d62f746..6f32514 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
@@ -51,7 +51,6 @@ import org.atmosphere.cpr.AtmosphereResponseImpl;
import org.atmosphere.handler.AbstractReflectorAtmosphereHandler;
import org.atmosphere.util.VoidServletConfig;
import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.util.DecoratedObjectFactory;
import org.springframework.util.ClassUtils;
[2/2] cxf git commit: Update to Jetty 9.4.x
Posted by dk...@apache.org.
Update to Jetty 9.4.x
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/171dc6c8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/171dc6c8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/171dc6c8
Branch: refs/heads/master
Commit: 171dc6c8c177887905465c16b1f6c3f572c08b56
Parents: 22f9648
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Sep 1 15:23:58 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 1 15:23:58 2017 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../http_jetty/continuations/JettyContinuationWrapper.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/171dc6c8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9762db7..fde9818 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -121,7 +121,7 @@
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.3.8</cxf.jettison.version>
- <cxf.jetty9.version>9.3.19.v20170502</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.6.v20170531</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.undertow.version>1.4.11.Final</cxf.undertow.version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/171dc6c8/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java
index fd0f95f..aeb90d0 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java
@@ -29,6 +29,7 @@ import org.apache.cxf.transport.http.AbstractHTTPDestination;
import org.eclipse.jetty.continuation.ContinuationListener;
import org.eclipse.jetty.continuation.ContinuationSupport;
+@SuppressWarnings("deprecation")
public class JettyContinuationWrapper implements Continuation, ContinuationListener {
volatile boolean isNew;
volatile boolean isResumed;