Return-Path: X-Original-To: apmail-tomee-commits-archive@www.apache.org Delivered-To: apmail-tomee-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DC86417A94 for ; Mon, 21 Sep 2015 20:49:54 +0000 (UTC) Received: (qmail 69846 invoked by uid 500); 21 Sep 2015 20:49:48 -0000 Delivered-To: apmail-tomee-commits-archive@tomee.apache.org Received: (qmail 69807 invoked by uid 500); 21 Sep 2015 20:49:48 -0000 Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tomee.apache.org Delivered-To: mailing list commits@tomee.apache.org Received: (qmail 69797 invoked by uid 99); 21 Sep 2015 20:49:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Sep 2015 20:49:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6BE33E0440; Mon, 21 Sep 2015 20:49:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andygumbrecht@apache.org To: commits@tomee.apache.org Date: Mon, 21 Sep 2015 20:49:48 -0000 Message-Id: <2ed6eca89d17421d8041618820418317@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/28] tomee git commit: cxf 3.1.3 upgrade 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 Authored: Mon Sep 21 09:08:12 2015 -0700 Committer: Romain Manni-Bucau 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 @@ 8.0.26 - 3.1.2 + 3.1.3 2.8.5 7.5.3.v20111011 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"); } }