Repository: tomee Updated Branches: refs/heads/tomee-7.0.0-M1 af2751f96 -> 40be966c1
cxf 3.1.3 upgrade Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/14109dee Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/14109dee Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/14109dee Branch: refs/heads/tomee-7.0.0-M1 Commit: 14109deebf13a73278a6568fb9721c4a87f3117a Parents: b95cba6 Author: Romain Manni-Bucau <[email protected]> Authored: Mon Sep 21 09:08:12 2015 -0700 Committer: Romain Manni-Bucau <[email protected]> Committed: Mon Sep 21 09:08:12 2015 -0700 ---------------------------------------------------------------------- pom.xml | 2 +- .../java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/14109dee/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ceeae62..e7612ec 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ <tomcat.version>8.0.26</tomcat.version> - <cxf.version>3.1.2</cxf.version> + <cxf.version>3.1.3</cxf.version> <ehcache.version>2.8.5</ehcache.version> <!-- used by cxf for security (replay attack) --> <jetty.version>7.5.3.v20111011</jetty.version> http://git-wip-us.apache.org/repos/asf/tomee/blob/14109dee/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java index 5ba7faf..3771f0a 100644 --- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java +++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java @@ -1098,7 +1098,7 @@ public class CxfRsHttpListener implements RsHttpListener { } @Override - protected void setProviders(final boolean custom, final Object... providers) { + protected void setProviders(final boolean custom, final boolean bus, final Object... providers) { throw new UnsupportedOperationException("not a real inheritance"); } }
