Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/652420e4 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/652420e4 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/652420e4 Branch: refs/heads/master Commit: 652420e41429910b65b5d51fd42cbabba7f2350a Parents: e565f49 f11150f Author: Jonathan Gallimore <[email protected]> Authored: Mon Oct 8 15:35:33 2018 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Mon Oct 8 15:35:33 2018 +0100 ---------------------------------------------------------------------- .../tomee/catalina/TomcatWebAppBuilder.java | 9 +- .../embedded/ServletContextInjectionTest.java | 238 +++++++++++++++++++ 2 files changed, 245 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
