Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/afe7539a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/afe7539a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/afe7539a Branch: refs/heads/master Commit: afe7539a92febafd37e4e40c7d1a835276458261 Parents: d210e73 2f07757 Author: Jean-Louis Monteiro <jeano...@gmail.com> Authored: Fri Dec 7 13:42:03 2018 +0100 Committer: Jean-Louis Monteiro <jeano...@gmail.com> Committed: Fri Dec 7 13:42:03 2018 +0100 ---------------------------------------------------------------------- .../openejb/arquillian/tests/cmp/sample/MoviesServlet.java | 2 +- examples/mp-metrics-counted/pom.xml | 2 +- examples/mp-metrics-timed/pom.xml | 4 +--- examples/mvc-cxf/pom.xml | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) ----------------------------------------------------------------------