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/36d78b8e Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/36d78b8e Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/36d78b8e Branch: refs/heads/master Commit: 36d78b8e98dbaa2ee8487786a84b0d1e8f7e3799 Parents: 7aa3e84 6c1a810 Author: Jean-Louis Monteiro <[email protected]> Authored: Mon Dec 10 15:46:47 2018 +0100 Committer: Jean-Louis Monteiro <[email protected]> Committed: Mon Dec 10 15:46:47 2018 +0100 ---------------------------------------------------------------------- .../arquillian/tests/cmp/CmpMappingTest.java | 58 +++++ .../arquillian/tests/cmp/CmpServlet.java | 2 +- .../apache/openejb/config/CmpJpaConversion.java | 4 +- .../org/apache/openejb/junit/OpenEjbRunner.java | 1 - examples/arquillian-jpa/pom.xml | 227 ++++++++++--------- .../test/persistence/PersistenceTest.java | 40 +++- examples/mvc-cxf/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 220 insertions(+), 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/36d78b8e/pom.xml ----------------------------------------------------------------------
