You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/12/03 11:58:37 UTC

[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 <ri...@zowalla.com>
Authored: Mon Dec 3 10:44:38 2018 +0100
Committer: rzo1 <ri...@zowalla.com>
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(-)
----------------------------------------------------------------------