From commits-return-44239-archive-asf-public=cust-asf.ponee.io@tomee.apache.org Mon Dec 3 12:58:37 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id B574E18067E for ; Mon, 3 Dec 2018 12:58:36 +0100 (CET) Received: (qmail 41177 invoked by uid 500); 3 Dec 2018 11:58:35 -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 41158 invoked by uid 99); 3 Dec 2018 11:58:35 -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, 03 Dec 2018 11:58:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4287EE1331; Mon, 3 Dec 2018 11:58:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jgallimore@apache.org To: commits@tomee.apache.org Date: Mon, 03 Dec 2018 11:58:37 -0000 Message-Id: <51a5c6b5a1364b26874032771695aa09@git.apache.org> In-Reply-To: <2c89487d892c40feb34a992a75221dbe@git.apache.org> References: <2c89487d892c40feb34a992a75221dbe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/5] tomee git commit: Merge remote-tracking branch 'origin/master' into tomee-8.x.x-TOMEE-2233 Merge remote-tracking branch 'origin/master' into tomee-8.x.x-TOMEE-2233 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/46873a59 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/46873a59 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/46873a59 Branch: refs/heads/master Commit: 46873a5982b4de0001f47e52a8644298503ff023 Parents: d5a1b06 6ba7fc5 Author: rzo1 Authored: Mon Dec 3 10:44:38 2018 +0100 Committer: rzo1 Committed: Mon Dec 3 10:44:38 2018 +0100 ---------------------------------------------------------------------- .../moviefun/DeployInWebAppsDirectoryTest.java | 2 +- examples/connector-ear/pom.xml | 15 ++ .../arquillian/SubjectServiceTomEETest.java | 5 +- .../moviefun/DeployInWebAppsDirectoryTest.java | 2 +- examples/simple-ear/pom.xml | 9 + itests/legacy-server/pom.xml | 2 +- .../openejb/itest/legacy/LegacyServerTest.java | 4 +- pom.xml | 10 +- server/openejb-cxf/pom.xml | 6 +- tck/microprofile-tck/config/pom.xml | 4 + tck/microprofile-tck/opentracing/pom.xml | 1 - .../main/resources/META-INF/microprofile/NOTICE | 163 +++++++++++++++++++ .../jul/handler/rotating/ArchivingTest.java | 6 - .../src/main/resources/META-INF/NOTICE | 79 +++++---- 14 files changed, 258 insertions(+), 50 deletions(-) ----------------------------------------------------------------------