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/09/14 15:22:37 UTC
[07/12] tomee git commit: Merge remote-tracking branch
'apache/master' into jmx-hacking
Merge remote-tracking branch 'apache/master' into jmx-hacking
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a79159fc
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a79159fc
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a79159fc
Branch: refs/heads/master
Commit: a79159fca768f29d867af90c40ef0b57b4e05eff
Parents: c15931f 2d02748
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Wed Sep 5 17:37:31 2018 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Wed Sep 5 17:37:31 2018 +0100
----------------------------------------------------------------------
.../moviefun/DeployInWebAppsDirectoryTest.java | 2 +-
examples/connector-ear/pom.xml | 15 ++
.../moviefun/DeployInWebAppsDirectoryTest.java | 2 +-
examples/simple-ear/pom.xml | 9 +
pom.xml | 4 +-
tck/microprofile-tck/config/pom.xml | 4 +
.../main/resources/META-INF/microprofile/NOTICE | 163 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 79 +++++----
8 files changed, 246 insertions(+), 32 deletions(-)
----------------------------------------------------------------------